upstream/Postea
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Postea.git synced 2026-11-12 00:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor for meta expansion by NEID

Browse Source
This commit is contained in:
GTNH-Colen committed 2023-12-20 01:11:18 +00:00
1 parent 7352e2dc56
commit 74d4151d00
3 files changed
+14 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/colen/postea/API/BlockReplacementManager.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class BlockReplacementManager {
public static BlockConversionInfo getBlockReplacement(BlockConversionInfo blockConversionInfo) {
Function<BlockConversionInfo, BlockConversionInfo> transformer = blockReplacementMap
.getOrDefault(blockConversionInfo.blocKName, null);
.getOrDefault(blockConversionInfo.blockName, null);
if (transformer == null) {
return null;
src/main/java/com/colen/postea/Utility/BlockConversionInfo.java
+1 -1
View File
@@ -15,5 +15,5 @@ public final class BlockConversionInfo {
public World world;
public NBTTagCompound tileEntityNBT;
public String blocKName;
public String blockName;
}
src/main/java/com/colen/postea/Utility/ChunkFixerUtility.java
+12 -18
View File
@@ -27,36 +27,34 @@ public class ChunkFixerUtility {
NBTTagCompound level = compound.getCompoundTag("Level");
NBTTagList sections = level.getTagList("Sections", 10);
int chunkXPos = level.getInteger("xPos") * 16; // Assuming each chunk is 16 blocks along x-axis
int chunkZPos = level.getInteger("zPos") * 16; // Assuming each chunk is 16 blocks along z-axis
int chunkXPos = level.getInteger("xPos") * 16;
int chunkZPos = level.getInteger("zPos") * 16;
for (int i = 0; i < sections.tagCount(); i++) {
NBTTagCompound section = sections.getCompoundTagAt(i);
byte[] blockArray = section.getByteArray("Blocks16");
byte[] metadataArray = section.getByteArray("Data");
byte[] metadataArray = section.getByteArray("Data16"); // Updated to Data16
byte sectionY = section.getByte("Y");
for (int index = 0; index < blockArray.length / 2; index++) {
int blockId = ((blockArray[index * 2] & 0xFF) << 8) | (blockArray[index * 2 + 1] & 0xFF);
byte metadata = (byte) ((index & 1) == 0 ? (metadataArray[index / 2] & 0x0F)
: ((metadataArray[index / 2] & 0xF0) >> 4));
int metadata = ((metadataArray[index * 2] & 0xFF) << 8) | (metadataArray[index * 2 + 1] & 0xFF); // Updated for Data16
Block block = Block.getBlockById(blockId);
String blockName = GameRegistry.findUniqueIdentifierFor(block)
.toString();
String blockName = GameRegistry.findUniqueIdentifierFor(block).toString();
BlockConversionInfo blockConversionInfo = new BlockConversionInfo();
blockConversionInfo.blocKName = blockName;
blockConversionInfo.blockName = blockName;
blockConversionInfo.blockID = blockId;
blockConversionInfo.metadata = metadata;
blockConversionInfo.metadata = (byte) metadata; // Updated
blockConversionInfo.world = world;
int x = index % 16;
int y = (index / 256) + (sectionY * 16); // Add the offset of the current section in Y direction
int y = (index / 256) + (sectionY * 16);
int z = (index / 16) % 16;
blockConversionInfo.x = x + chunkXPos + 1;
blockConversionInfo.y = y; // Y remains unchanged as it's already global
blockConversionInfo.y = y;
blockConversionInfo.z = z + chunkZPos + 1;
BlockConversionInfo output = BlockReplacementManager.getBlockReplacement(blockConversionInfo);
@@ -67,18 +65,14 @@ public class ChunkFixerUtility {
blockArray[index * 2] = (byte) ((newBlockId >> 8) & 0xFF);
blockArray[index * 2 + 1] = (byte) (newBlockId & 0xFF);
if ((index & 1) == 0) { // Even
metadataArray[index / 2] &= 0xF0;
metadataArray[index / 2] |= (newMetadata & 0x0F);
} else { // Odd
metadataArray[index / 2] &= 0x0F;
metadataArray[index / 2] |= ((newMetadata << 4) & 0xF0);
}
metadataArray[index * 2] = (byte) ((newMetadata >> 8) & 0xFF);
metadataArray[index * 2 + 1] = (byte) (newMetadata & 0xFF);
}
}
}
}
public static void transformTileEntities(NBTTagCompound chunkNBT, World world) {
NBTTagCompound level = chunkNBT.getCompoundTag("Level");