update to chunkapi 0.6

GTMEGA · Dec 9, 2024 · 55dbe6f · 55dbe6f
1 parent 1ea745c
commit 55dbe6f
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -63,9 +63,9 @@ repositories {
 
 dependencies {
     ////////////////Our dependencies////////////////
-    implementationSplit("com.falsepattern:falsepatternlib-mc1.7.10:1.4.1")
+    implementationSplit("com.falsepattern:falsepatternlib-mc1.7.10:1.5.4")
     implementation("it.unimi.dsi:fastutil:8.5.13")
-    implementationSplit("com.falsepattern:chunkapi-mc1.7.10:0.5.1")
+    implementationSplit("com.falsepattern:chunkapi-mc1.7.10:0.6.0")
 
     ////////////////Patched mods////////////////
 

diff --git a/src/main/java/com/falsepattern/endlessids/EndlessIDs.java b/src/main/java/com/falsepattern/endlessids/EndlessIDs.java
@@ -43,8 +43,8 @@
      version = Tags.VERSION,
      name = Tags.MODNAME,
      acceptedMinecraftVersions = "[1.7.10]",
-     dependencies = "required-after:chunkapi@[0.5.0,0.6.0);" +
-                    "required-after:falsepatternlib@[1.4.1,);" +
+     dependencies = "required-after:chunkapi@[0.6.0,);" +
+                    "required-after:falsepatternlib@[1.5.4,);" +
                     "after:antiidconflict")
 public class EndlessIDs {
     public static final byte[] ZERO_LENGTH_BIOME_ARRAY_PLACEHOLDER = new byte[0];

diff --git a/src/main/java/com/falsepattern/endlessids/managers/BlockIDManager.java b/src/main/java/com/falsepattern/endlessids/managers/BlockIDManager.java
@@ -32,7 +32,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.server.S23PacketBlockChange;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.NibbleArray;
 import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
@@ -43,7 +46,7 @@
 import static com.falsepattern.endlessids.util.DataUtil.*;
 
 //NOTE: Also change the save logic in MapWriter mod if changing this
-public class BlockIDManager implements DataManager.PacketDataManager, DataManager.SubChunkDataManager {
+public class BlockIDManager implements DataManager.PacketDataManager, DataManager.SubChunkDataManager, DataManager.BlockPacketDataManager {
 
     @Override
     public String domain() {
@@ -237,4 +240,24 @@ public void cloneSubChunk(Chunk fromChunk, ExtendedBlockStorage fromVanilla, Ext
     public @Nullable String versionChangeMessage(String priorVersion) {
         return null;
     }
+
+    @Override
+    public void writeBlockToPacket(Chunk chunk, int x, int y, int z, S23PacketBlockChange packet) {
+
+    }
+
+    @Override
+    public void readBlockFromPacket(Chunk chunk, int x, int y, int z, S23PacketBlockChange packet) {
+
+    }
+
+    @Override
+    public void writeBlockPacketToBuffer(S23PacketBlockChange packet, PacketBuffer buffer) {
+        buffer.writeInt(Block.getIdFromBlock(packet.field_148883_d));
+    }
+
+    @Override
+    public void readBlockPacketFromBuffer(S23PacketBlockChange packet, PacketBuffer buffer) {
+        packet.field_148883_d = Block.getBlockById(buffer.readInt());
+    }
 }
diff --git a/src/main/java/com/falsepattern/endlessids/managers/BlockMetaManager.java b/src/main/java/com/falsepattern/endlessids/managers/BlockMetaManager.java
@@ -34,6 +34,8 @@
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.server.S23PacketBlockChange;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.NibbleArray;
 import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
@@ -43,7 +45,7 @@
 import static com.falsepattern.endlessids.constants.ExtendedConstants.blocksPerSubChunk;
 
 //NOTE: Also change the save logic in MapWriter mod if changing this
-public class BlockMetaManager implements DataManager.PacketDataManager, DataManager.SubChunkDataManager {
+public class BlockMetaManager implements DataManager.PacketDataManager, DataManager.SubChunkDataManager, DataManager.BlockPacketDataManager {
 
     @Override
     public String domain() {
@@ -212,4 +214,24 @@ public void cloneSubChunk(Chunk fromChunk, ExtendedBlockStorage fromVanilla, Ext
     public @Nullable String versionChangeMessage(String priorVersion) {
         return null;
     }
+
+    @Override
+    public void writeBlockToPacket(Chunk chunk, int x, int y, int z, S23PacketBlockChange packet) {
+
+    }
+
+    @Override
+    public void readBlockFromPacket(Chunk chunk, int x, int y, int z, S23PacketBlockChange packet) {
+
+    }
+
+    @Override
+    public void writeBlockPacketToBuffer(S23PacketBlockChange packet, PacketBuffer buffer) {
+        buffer.writeShort(packet.field_148884_e & 0xFFFF);
+    }
+
+    @Override
+    public void readBlockPacketFromBuffer(S23PacketBlockChange packet, PacketBuffer buffer) {
+        packet.field_148884_e = buffer.readUnsignedShort();
+    }
 }