From cb40847323e6c10dd5404033cd2f193aaa56ea0b Mon Sep 17 00:00:00 2001
From: aromaa <me@joniaromaa.fi>
Date: Mon, 27 May 2024 22:58:56 +0300
Subject: [PATCH] fix: Zero is valid id

---
 .../common/world/schematic/PaletteWrapper.java              | 6 +++---
 .../minecraft/world/level/chunk/ChunkAccessMixin_API.java   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/spongepowered/common/world/schematic/PaletteWrapper.java b/src/main/java/org/spongepowered/common/world/schematic/PaletteWrapper.java
index b643c418bc1..e8a5616f352 100644
--- a/src/main/java/org/spongepowered/common/world/schematic/PaletteWrapper.java
+++ b/src/main/java/org/spongepowered/common/world/schematic/PaletteWrapper.java
@@ -79,10 +79,10 @@ public Optional<PaletteReference<T, R>> get(int id) {
     @Override
     public OptionalInt get(T type) {
         final var id = this.proxy.getId((NT) type);
-        if (id <= 0) {
-            return OptionalInt.empty();
+        if (id >= 0) {
+            return OptionalInt.of(id);
         }
-        return OptionalInt.of(id);
+        return OptionalInt.empty();
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/chunk/ChunkAccessMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/chunk/ChunkAccessMixin_API.java
index 2821db02344..0fe361e5e9a 100644
--- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/chunk/ChunkAccessMixin_API.java
+++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/chunk/ChunkAccessMixin_API.java
@@ -29,8 +29,8 @@
 import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunkSection;
+import net.minecraft.world.level.chunk.status.ChunkStatus;
 import net.minecraft.world.level.levelgen.Heightmap;
 import org.spongepowered.api.block.BlockState;
 import org.spongepowered.api.block.BlockType;