Fixes Issue #37

Paul19988 · Paul19988 · commit e24ac3fe9112 · 2021-05-20T17:02:52.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.grinderwolf</groupId>
     <artifactId>slimeworldmanager</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.1-SNAPSHOT</version>
+    <version>2.6.2-SNAPSHOT</version>
     <modules>
         <module>slimeworldmanager-api</module>
         <module>slimeworldmanager-nms-common</module>
diff --git a/slimeworldmanager-api/pom.xml b/slimeworldmanager-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>slimeworldmanager</artifactId>
         <groupId>com.grinderwolf</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/slimeworldmanager-api/src/main/java/com/grinderwolf/swm/api/world/SlimeChunkSection.java b/slimeworldmanager-api/src/main/java/com/grinderwolf/swm/api/world/SlimeChunkSection.java
@@ -41,14 +41,6 @@ public interface SlimeChunkSection {
      */
     long[] getBlockStates();
 
-    /**
-     * Returns all the states of the entities of the chunk section, or
-     * <code>null</code> in case it's a pre 1.13 world.
-     *
-     * @return A <code>long[]</code> with every block state.
-     */
-    long[] getEntityStates();
-
     /**
      * Returns the block light data.
      *
diff --git a/slimeworldmanager-classmodifier/pom.xml b/slimeworldmanager-classmodifier/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>slimeworldmanager</artifactId>
         <groupId>com.grinderwolf</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/slimeworldmanager-importer/pom.xml b/slimeworldmanager-importer/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>slimeworldmanager</artifactId>
         <groupId>com.grinderwolf</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>slimeworldmanager-importer</artifactId>
diff --git a/slimeworldmanager-importer/src/main/java/com/grinderwolf/swm/importer/SWMImporter.java b/slimeworldmanager-importer/src/main/java/com/grinderwolf/swm/importer/SWMImporter.java
@@ -377,7 +377,7 @@ private static SlimeChunk readChunk(CompoundTag compound, byte worldVersion) {
             NibbleArray blockLightArray = sectionTag.getValue().containsKey("BlockLight") ? new NibbleArray(sectionTag.getByteArrayValue("BlockLight").get()) : null;
             NibbleArray skyLightArray = sectionTag.getValue().containsKey("SkyLight") ? new NibbleArray(sectionTag.getByteArrayValue("SkyLight").get()) : null;
 
-            sectionArray[index] = new CraftSlimeChunkSection(blocks, dataArray, paletteTag, blockStatesArray, null, blockLightArray, skyLightArray);
+            sectionArray[index] = new CraftSlimeChunkSection(blocks, dataArray, paletteTag, blockStatesArray, blockLightArray, skyLightArray);
         }
 
         for (SlimeChunkSection section : sectionArray) {
diff --git a/slimeworldmanager-nms-common/pom.xml b/slimeworldmanager-nms-common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>slimeworldmanager</artifactId>
         <groupId>com.grinderwolf</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
diff --git a/slimeworldmanager-nms-common/src/main/java/com/grinderwolf/swm/nms/CraftSlimeChunkSection.java b/slimeworldmanager-nms-common/src/main/java/com/grinderwolf/swm/nms/CraftSlimeChunkSection.java
@@ -18,7 +18,6 @@ public class CraftSlimeChunkSection implements SlimeChunkSection {
     // Post 1.13 block data
     private final ListTag<CompoundTag> palette;
     private final long[] blockStates;
-    private final long[] entityStates;
 
     private final NibbleArray blockLight;
     private final NibbleArray skyLight;
diff --git a/slimeworldmanager-nms-common/src/main/java/com/grinderwolf/swm/nms/CraftSlimeWorld.java b/slimeworldmanager-nms-common/src/main/java/com/grinderwolf/swm/nms/CraftSlimeWorld.java
@@ -184,7 +184,7 @@ public byte[] serialize() {
             // Tile Entities
             List<CompoundTag> tileEntitiesList = sortedChunks.stream().flatMap(chunk -> chunk.getTileEntities().stream()).collect(Collectors.toList());
             ListTag<CompoundTag> tileEntitiesNbtList = new ListTag<>("tiles", TagType.TAG_COMPOUND, tileEntitiesList);
-            CompoundTag tileEntitiesCompound = new CompoundTag(tileEntitiesNbtList.getName(), new CompoundMap(Collections.singletonList(tileEntitiesNbtList)));
+            CompoundTag tileEntitiesCompound = new CompoundTag("", new CompoundMap(Collections.singletonList(tileEntitiesNbtList)));
             byte[] tileEntitiesData = serializeCompoundTag(tileEntitiesCompound);
             byte[] compressedTileEntitiesData = Zstd.compress(tileEntitiesData);
 
@@ -199,7 +199,7 @@ public byte[] serialize() {
 
             if (!entitiesList.isEmpty()) {
                 ListTag<CompoundTag> entitiesNbtList = new ListTag<>("entities", TagType.TAG_COMPOUND, entitiesList);
-                CompoundTag entitiesCompound = new CompoundTag(entitiesNbtList.getName(), new CompoundMap(Collections.singletonList(entitiesNbtList)));
+                CompoundTag entitiesCompound = new CompoundTag("", new CompoundMap(Collections.singletonList(entitiesNbtList)));
                 byte[] entitiesData = serializeCompoundTag(entitiesCompound);
                 byte[] compressedEntitiesData = Zstd.compress(entitiesData);
 
diff --git a/slimeworldmanager-nms-v1_16_R1/pom.xml b/slimeworldmanager-nms-v1_16_R1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>slimeworldmanager</artifactId>
         <groupId>com.grinderwolf</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
diff --git a/slimeworldmanager-nms-v1_16_R1/src/main/java/com/grinderwolf/swm/nms/v1_16_R1/NMSSlimeChunk.java b/slimeworldmanager-nms-v1_16_R1/src/main/java/com/grinderwolf/swm/nms/v1_16_R1/NMSSlimeChunk.java
@@ -73,7 +73,7 @@ public SlimeChunkSection[] getSections() {
                     ListTag<CompoundTag> palette = (ListTag<CompoundTag>) Converter.convertTag("", paletteList);
                     long[] blockStates = blocksCompound.getLongArray("BlockStates");
 
-                    sections[sectionId] = new CraftSlimeChunkSection(null, null, palette, blockStates, null, blockLightArray, skyLightArray);
+                    sections[sectionId] = new CraftSlimeChunkSection(null, null, palette, blockStates, blockLightArray, skyLightArray);
                 }
             }
         }
diff --git a/slimeworldmanager-nms-v1_16_R2/pom.xml b/slimeworldmanager-nms-v1_16_R2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>slimeworldmanager</artifactId>
         <groupId>com.grinderwolf</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
diff --git a/slimeworldmanager-nms-v1_16_R2/src/main/java/com/grinderwolf/swm/nms/v1_16_R2/NMSSlimeChunk.java b/slimeworldmanager-nms-v1_16_R2/src/main/java/com/grinderwolf/swm/nms/v1_16_R2/NMSSlimeChunk.java
@@ -73,7 +73,7 @@ public SlimeChunkSection[] getSections() {
                     ListTag<CompoundTag> palette = (ListTag<CompoundTag>) Converter.convertTag("", paletteList);
                     long[] blockStates = blocksCompound.getLongArray("BlockStates");
 
-                    sections[sectionId] = new CraftSlimeChunkSection(null, null, palette, blockStates, null, blockLightArray, skyLightArray);
+                    sections[sectionId] = new CraftSlimeChunkSection(null, null, palette, blockStates, blockLightArray, skyLightArray);
                 }
             }
         }
diff --git a/slimeworldmanager-nms-v1_16_R3/pom.xml b/slimeworldmanager-nms-v1_16_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>slimeworldmanager</artifactId>
         <groupId>com.grinderwolf</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
diff --git a/slimeworldmanager-nms-v1_16_R3/src/main/java/com/grinderwolf/swm/nms/v1_16_R3/CustomWorldServer.java b/slimeworldmanager-nms-v1_16_R3/src/main/java/com/grinderwolf/swm/nms/v1_16_R3/CustomWorldServer.java
@@ -83,8 +83,8 @@ public void save(IProgressUpdate progressUpdate, boolean forceSave, boolean flag
 
             // Update level data
             NBTTagCompound compound = new NBTTagCompound();
-            worldDataServer.a(MinecraftServer.getServer().getCustomRegistry(), compound);
-            slimeWorld.getExtraData().getValue().put(Converter.convertTag("LevelData", compound));
+            NBTTagCompound nbtTagCompound = worldDataServer.a(MinecraftServer.getServer().getCustomRegistry(), compound);
+            slimeWorld.getExtraData().getValue().put(Converter.convertTag("LevelData", nbtTagCompound));
 
             if (MinecraftServer.getServer().isStopped()) { // Make sure the world gets saved before stopping the server by running it from the main thread
                 save();
@@ -214,6 +214,8 @@ private Chunk createChunk(SlimeChunk chunk) {
                 for (CompoundTag tag : tileEntities) {
                     Optional<String> type = tag.getStringValue("id");
 
+                    Bukkit.broadcastMessage("TILE: " + type.get() + ".\n" + tag);
+
                     // Sometimes null tile entities are saved
                     if (type.isPresent()) {
                         BlockPosition blockPosition = new BlockPosition(tag.getIntValue("x").get(), tag.getIntValue("y").get(), tag.getIntValue("z").get());
diff --git a/slimeworldmanager-nms-v1_16_R3/src/main/java/com/grinderwolf/swm/nms/v1_16_R3/NMSSlimeChunk.java b/slimeworldmanager-nms-v1_16_R3/src/main/java/com/grinderwolf/swm/nms/v1_16_R3/NMSSlimeChunk.java
@@ -76,7 +76,7 @@ public SlimeChunkSection[] getSections() {
                     ListTag<CompoundTag> palette = (ListTag<CompoundTag>) Converter.convertTag("", paletteList);
                     long[] blockStates = blocksCompound.getLongArray("BlockStates");
 
-                    sections[sectionId] = new CraftSlimeChunkSection(null, null, palette, blockStates, null, blockLightArray, skyLightArray);
+                    sections[sectionId] = new CraftSlimeChunkSection(null, null, palette, blockStates, blockLightArray, skyLightArray);
                 }
             }
         }
@@ -109,7 +109,8 @@ public List<CompoundTag> getTileEntities() {
         List<CompoundTag> tileEntities = new ArrayList<>();
 
         for (TileEntity entity : chunk.getTileEntities().values()) {
-            NBTTagCompound entityNbt = entity.b();
+            NBTTagCompound entityNbt = new NBTTagCompound();
+            entity.save(entityNbt);
             tileEntities.add((CompoundTag) Converter.convertTag(entityNbt.getString("name"), entityNbt));
         }
 
diff --git a/slimeworldmanager-plugin/pom.xml b/slimeworldmanager-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>slimeworldmanager</artifactId>
         <groupId>com.grinderwolf</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>slimeworldmanager-plugin</artifactId>
diff --git a/slimeworldmanager-plugin/src/main/java/com/grinderwolf/swm/plugin/loaders/LoaderUtils.java b/slimeworldmanager-plugin/src/main/java/com/grinderwolf/swm/plugin/loaders/LoaderUtils.java
@@ -437,7 +437,7 @@ private static SlimeChunkSection[] readChunkSections(DataInputStream dataStream,
                         paletteList.add(readCompoundTag(serializedTag));
                     }
 
-                    paletteTag = new ListTag<>("", TagType.TAG_LIST, paletteList);
+                    paletteTag = new ListTag<>("", TagType.TAG_COMPOUND, paletteList);
 
                     // Block states
                     int blockStatesArrayLength = dataStream.readInt();
@@ -479,7 +479,7 @@ private static SlimeChunkSection[] readChunkSections(DataInputStream dataStream,
                     dataStream.skip(hypixelBlocksLength);
                 }
 
-                chunkSectionArray[i] = new CraftSlimeChunkSection(blockArray, dataArray, paletteTag, blockStatesArray,null, blockLightArray, skyLightArray);
+                chunkSectionArray[i] = new CraftSlimeChunkSection(blockArray, dataArray, paletteTag, blockStatesArray, blockLightArray, skyLightArray);
             }
         }
 
@@ -493,10 +493,6 @@ private static CompoundTag readCompoundTag(byte[] serializedCompound) throws IOE
 
         NBTInputStream stream = new NBTInputStream(new ByteArrayInputStream(serializedCompound), NBTInputStream.NO_COMPRESSION, ByteOrder.BIG_ENDIAN);
 
-        CompoundTag compoundTag = (CompoundTag) stream.readTag();
-
-//        System.out.println("READING TAG: " + compoundTag);
-
-        return compoundTag;
+        return (CompoundTag) stream.readTag();
     }
 }
diff --git a/slimeworldmanager-plugin/src/main/java/com/grinderwolf/swm/plugin/upgrade/v1_16/v1_16WorldUpgrade.java b/slimeworldmanager-plugin/src/main/java/com/grinderwolf/swm/plugin/upgrade/v1_16/v1_16WorldUpgrade.java
@@ -40,7 +40,7 @@ public void upgrade(CraftSlimeWorld world) {
 
                     if (!isPowerOfTwo(bitsPerBlock)) {
                         section = new CraftSlimeChunkSection(null, null, section.getPalette(),
-                                addPadding(4096, bitsPerBlock, section.getBlockStates()), section.getEntityStates(),
+                                addPadding(4096, bitsPerBlock, section.getBlockStates()),
                                 section.getBlockLight(), section.getSkyLight());
                         chunk.getSections()[sectionIndex] = section;
                     }
diff --git a/slimeworldmanager-plugin/src/main/java/com/grinderwolf/swm/plugin/world/importer/WorldImporter.java b/slimeworldmanager-plugin/src/main/java/com/grinderwolf/swm/plugin/world/importer/WorldImporter.java
@@ -274,7 +274,7 @@ private static SlimeChunk readChunk(CompoundTag compound, byte worldVersion) {
             NibbleArray blockLightArray = sectionTag.getValue().containsKey("BlockLight") ? new NibbleArray(sectionTag.getByteArrayValue("BlockLight").get()) : null;
             NibbleArray skyLightArray = sectionTag.getValue().containsKey("SkyLight") ? new NibbleArray(sectionTag.getByteArrayValue("SkyLight").get()) : null;
 
-            sectionArray[index] = new CraftSlimeChunkSection(blocks, dataArray, paletteTag, blockStatesArray, null, blockLightArray, skyLightArray);
+            sectionArray[index] = new CraftSlimeChunkSection(blocks, dataArray, paletteTag, blockStatesArray, blockLightArray, skyLightArray);
         }
 
         for (SlimeChunkSection section : sectionArray) {

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ private static SlimeChunk readChunk(CompoundTag compound, byte worldVersion) {`
`377`	`377`	`NibbleArray blockLightArray = sectionTag.getValue().containsKey("BlockLight") ? new NibbleArray(sectionTag.getByteArrayValue("BlockLight").get()) : null;`
`378`	`378`	`NibbleArray skyLightArray = sectionTag.getValue().containsKey("SkyLight") ? new NibbleArray(sectionTag.getByteArrayValue("SkyLight").get()) : null;`
`379`	`379`
`380`		`- sectionArray[index] = new CraftSlimeChunkSection(blocks, dataArray, paletteTag, blockStatesArray, null, blockLightArray, skyLightArray);`
	`380`	`+ sectionArray[index] = new CraftSlimeChunkSection(blocks, dataArray, paletteTag, blockStatesArray, blockLightArray, skyLightArray);`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`for (SlimeChunkSection section : sectionArray) {`