From 55dbe6f4b9ef11d9f7a32b105951a7c47ac75908 Mon Sep 17 00:00:00 2001 From: FalsePattern Date: Mon, 9 Dec 2024 19:12:56 +0100 Subject: [PATCH] update to chunkapi 0.6 --- build.gradle.kts | 4 +-- .../falsepattern/endlessids/EndlessIDs.java | 4 +-- .../endlessids/managers/BlockIDManager.java | 25 ++++++++++++++++++- .../endlessids/managers/BlockMetaManager.java | 24 +++++++++++++++++- 4 files changed, 51 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 73e1fcf..141b8da 100644 --- 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 index 68945df..e75ddcc 100644 --- a/src/main/java/com/falsepattern/endlessids/EndlessIDs.java +++ b/src/main/java/com/falsepattern/endlessids/EndlessIDs.java @@ -43,8 +43,8 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; 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 index 5db5c5e..be493ac 100644 --- 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 lombok.var; 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.constants.ExtendedConstants.blocksPerS 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 class BlockIDManager implements DataManager.PacketDataManager, DataManage 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 index 6893da7..39f6f42 100644 --- 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.NotNull; 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 java.nio.ByteBuffer; 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 class BlockMetaManager implements DataManager.PacketDataManager, DataMana 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(); + } }