Update & refactor

Author: PetteriM1

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>worldgeneratorextension</groupId>
     <artifactId>WorldGeneratorExtension</artifactId>
-    <version>1.5.1</version>
+    <version>1.6.0</version>
     <build>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
         <plugins>

src/main/java/worldgeneratorextension/Loader.java

@@ -20,15 +20,17 @@
 import worldgeneratorextension.nbpop.populator.PopulatorNetherFortress;
 import worldgeneratorextension.nbpop.structure.NetherBridgePieces;
 import worldgeneratorextension.ompop.populator.PopulatorOceanMonument;
+import worldgeneratorextension.pm1e.populator.PopulatorRuinedPortal;
+import worldgeneratorextension.pm1e.populator.PopulatorTreasureChest;
 import worldgeneratorextension.quasistructure.populator.PopulatorDesertWell;
 import worldgeneratorextension.quasistructure.populator.PopulatorDungeon;
 import worldgeneratorextension.scatteredbuilding.populator.PopulatorDesertPyramid;
 import worldgeneratorextension.scatteredbuilding.populator.PopulatorJungleTemple;
 import worldgeneratorextension.scatteredbuilding.populator.PopulatorSwampHut;
 import worldgeneratorextension.shpop.populator.PopulatorStronghold;
-import worldgeneratorextension.singletspop.populator.PopulatorCoralCrust;
+import worldgeneratorextension.pm1e.populator.PopulatorCoralCrust;
 import worldgeneratorextension.singletspop.populator.PopulatorFossil;
-import worldgeneratorextension.singletspop.populator.PopulatorNetherFossil;
+import worldgeneratorextension.pm1e.populator.PopulatorNetherFossil;
 import worldgeneratorextension.singletspop.populator.PopulatorShipwreck;
 import worldgeneratorextension.global.task.ChunkPopulateTask;
 import worldgeneratorextension.theend.noise.SimplexNoise;
@@ -72,8 +74,10 @@ public void onEnable() {
         PopulatorStronghold.init();
         PopulatorOceanMonument.init();
         PopulatorMineshaft.init();
+        PopulatorCoralCrust.init();
         NetherBridgePieces.init();
         PopulatorNetherFossil.init();
+
         populatorsOverworld.add(new PopulatorFossil());
         populatorsOverworld.add(new PopulatorShipwreck());
         populatorsOverworld.add(new PopulatorSwampHut());
@@ -90,6 +94,7 @@ public void onEnable() {
         populatorsOverworld.add(new PopulatorDesertWell());
         populatorsOverworld.add(new PopulatorDungeon());
         populatorsOverworld.add(new PopulatorCoralCrust());
+        populatorsOverworld.add(new PopulatorTreasureChest());
         populatorsNether.add(new PopulatorNetherFortress());
         populatorsNether.add(new PopulatorNetherFossil());
 

src/main/java/worldgeneratorextension/global/block/state/BlockState.java

@@ -61,9 +61,4 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return this.id << 6 | this.meta;
     }
-
-    @Override
-    public String toString() {
-        return String.format("BlockState(id=%s, meta=%s)", this.id, this.meta);
-    }
 }

src/main/java/worldgeneratorextension/global/math/BoundingBox.java

@@ -3,7 +3,6 @@
 import cn.nukkit.math.BlockFace;
 import cn.nukkit.math.BlockVector3;
 import cn.nukkit.nbt.tag.IntArrayTag;
-import com.google.common.base.MoreObjects;
 
 public class BoundingBox {
 
@@ -136,16 +135,4 @@ public int getZSpan() {
     public IntArrayTag createTag() {
         return new IntArrayTag("", new int[]{this.x0, this.y0, this.z0, this.x1, this.y1, this.z1});
     }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("x0", this.x0)
-                .add("y0", this.y0)
-                .add("z0", this.z0)
-                .add("x1", this.x1)
-                .add("y1", this.y1)
-                .add("z1", this.z1)
-                .toString();
-    }
 }

src/main/java/worldgeneratorextension/mspop/structure/StructurePiece.java src/main/java/worldgeneratorextension/global/structure/StructurePiece.java

@@ -1,4 +1,4 @@
-package worldgeneratorextension.mspop.structure;
+package worldgeneratorextension.global.structure;
 
 import cn.nukkit.block.Block;
 import cn.nukkit.level.ChunkManager;
@@ -22,8 +22,8 @@ public abstract class StructurePiece {
     protected ChunkManager level;
     protected BoundingBox boundingBox;
 
-    private BlockFace orientation;
-    private Rotation rotation = Rotation.NONE;
+    protected BlockFace orientation;
+    protected Rotation rotation = Rotation.NONE;
     protected int genDepth;
 
     protected StructurePiece(int genDepth) {

src/main/java/worldgeneratorextension/nbpop/structure/StructureStart.java src/main/java/worldgeneratorextension/global/structure/StructureStart.java

@@ -1,4 +1,4 @@
-package worldgeneratorextension.nbpop.structure;
+package worldgeneratorextension.global.structure;
 
 import cn.nukkit.level.ChunkManager;
 import cn.nukkit.math.NukkitRandom;

src/main/java/worldgeneratorextension/global/task/ChunkPopulateTask.java

@@ -24,7 +24,7 @@ public ChunkPopulateTask(ChunkManager level, FullChunk chunk, Collection<Populat
     public void onRun() {
         int chunkX = this.chunk.getX();
         int chunkZ = this.chunk.getZ();
-        NukkitRandom random = new NukkitRandom(0xdeadbeef ^ (chunkX << 8) ^ chunkZ ^ this.level.getSeed());
-        this.populators.forEach(populator -> populator.populate(this.level, chunkX, chunkZ, random, this.chunk));
+        long seed = this.level.getSeed();
+        this.populators.forEach(populator -> populator.populate(this.level, chunkX, chunkZ, new NukkitRandom(0xdeadbeef ^ (chunkX << 8) ^ chunkZ ^ seed), this.chunk));
     }
 }

src/main/java/worldgeneratorextension/multitspop/template/AbstractLegacyStructureTemplate.java src/main/java/worldgeneratorextension/global/template/AbstractLegacyStructureTemplate.java

@@ -1,4 +1,4 @@
-package worldgeneratorextension.multitspop.template;
+package worldgeneratorextension.global.template;
 
 import cn.nukkit.math.BlockVector3;
 import cn.nukkit.math.Vector3;
@@ -30,7 +30,7 @@ protected static class SimplePalette implements Iterable<BlockEntry> {
 
         private final IdMapper<BlockEntry> ids;
 
-        protected SimplePalette() {
+        public SimplePalette() {
             this.ids = new IdMapper<>();
         }
 
@@ -60,11 +60,6 @@ public StructureBlockInfo(BlockVector3 pos, BlockEntry state, CompoundTag nbt) {
             this.state = state;
             this.nbt = nbt;
         }
-
-        @Override
-        public String toString() {
-            return String.format("StructureBlockInfo(pos=%s, state=%s, nbt=%s)", this.pos, this.state, this.nbt);
-        }
     }
 
     public static class StructureEntityInfo {
@@ -78,10 +73,5 @@ public StructureEntityInfo(Vector3 pos, BlockVector3 blockPos, CompoundTag nbt)
             this.blockPos = blockPos;
             this.nbt = nbt;
         }
-
-        @Override
-        public String toString() {
-            return String.format("StructureEntityInfo(pos=%s, blockPos=%s, nbt=%s)", this.pos, this.blockPos, this.nbt);
-        }
     }
 }

src/main/java/worldgeneratorextension/multitspop/template/AbstractStructureTemplate.java src/main/java/worldgeneratorextension/global/template/AbstractStructureTemplate.java

@@ -1,4 +1,4 @@
-package worldgeneratorextension.multitspop.template;
+package worldgeneratorextension.global.template;
 
 import cn.nukkit.math.BlockVector3;
 

src/main/java/worldgeneratorextension/multitspop/template/BlockEntry.java src/main/java/worldgeneratorextension/global/template/BlockEntry.java

@@ -1,4 +1,4 @@
-package worldgeneratorextension.multitspop.template;
+package worldgeneratorextension.global.template;
 
 public class BlockEntry {
 
@@ -38,9 +38,4 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return this.id << 6 | this.meta;
     }
-
-    @Override
-    public String toString() {
-        return String.format("BlockEntry(id=%s, meta=%s)", this.id, this.meta);
-    }
 }

src/main/java/worldgeneratorextension/multitspop/template/IdMapper.java src/main/java/worldgeneratorextension/global/template/IdMapper.java

@@ -1,4 +1,4 @@
-package worldgeneratorextension.multitspop.template;
+package worldgeneratorextension.global.template;
 
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;

src/main/java/worldgeneratorextension/multitspop/template/StructureTemplate.java src/main/java/worldgeneratorextension/global/template/StructureTemplate.java

@@ -1,4 +1,4 @@
-package worldgeneratorextension.multitspop.template;
+package worldgeneratorextension.global.template;
 
 import cn.nukkit.math.BlockVector3;
 

src/main/java/worldgeneratorextension/ompop/util/NukkitCollections.java src/main/java/worldgeneratorextension/global/util/NukkitCollections.java

@@ -1,4 +1,4 @@
-package worldgeneratorextension.ompop.util;
+package worldgeneratorextension.global.util;
 
 import cn.nukkit.math.NukkitRandom;
 
@@ -67,8 +67,4 @@ private static void swap(Object[] arr, int i, int j) {
         arr[i] = arr[j];
         arr[j] = tmp;
     }
-
-    private NukkitCollections() {
-
-    }
 }

src/main/java/worldgeneratorextension/global/RandomizableContainer.java src/main/java/worldgeneratorextension/global/util/RandomizableContainer.java

@@ -1,4 +1,4 @@
-package worldgeneratorextension.global;
+package worldgeneratorextension.global.util;
 
 import cn.nukkit.item.Item;
 import cn.nukkit.item.enchantment.Enchantment;

src/main/java/worldgeneratorextension/mspop/loot/MineshaftChest.java

@@ -2,7 +2,7 @@
 
 import cn.nukkit.inventory.InventoryType;
 import cn.nukkit.item.Item;
-import worldgeneratorextension.global.RandomizableContainer;
+import worldgeneratorextension.global.util.RandomizableContainer;
 import com.google.common.collect.Maps;
 
 //\\ ./data/behavior_packs/vanilla/loot_tables/chests/abandoned_mineshaft.json

src/main/java/worldgeneratorextension/mspop/populator/PopulatorMineshaft.java

@@ -10,8 +10,8 @@
 import worldgeneratorextension.global.math.BoundingBox;
 import worldgeneratorextension.global.task.CallbackableChunkGenerationTask;
 import worldgeneratorextension.mspop.structure.MineshaftPieces;
-import worldgeneratorextension.mspop.structure.StructurePiece;
-import worldgeneratorextension.mspop.structure.StructureStart;
+import worldgeneratorextension.global.structure.StructurePiece;
+import worldgeneratorextension.global.structure.StructureStart;
 
 public class PopulatorMineshaft extends Populator {
 

src/main/java/worldgeneratorextension/mspop/structure/MineshaftPieces.java

@@ -19,6 +19,7 @@
 import worldgeneratorextension.global.block.state.RailDirection;
 import worldgeneratorextension.global.block.state.TorchFacingDirection;
 import worldgeneratorextension.global.math.BoundingBox;
+import worldgeneratorextension.global.structure.StructurePiece;
 import worldgeneratorextension.mspop.loot.MineshaftChest;
 import worldgeneratorextension.mspop.populator.PopulatorMineshaft;
 import worldgeneratorextension.global.task.ActorSpawnTask;

src/main/java/worldgeneratorextension/mspop/structure/StructureStart.java

@@ -2,7 +2,7 @@
 
 import cn.nukkit.inventory.InventoryType;
 import cn.nukkit.item.Item;
-import worldgeneratorextension.global.RandomizableContainer;
+import worldgeneratorextension.global.util.RandomizableContainer;
 import com.google.common.collect.Maps;
 
 public class IglooChest extends RandomizableContainer {

src/main/java/worldgeneratorextension/multitspop/loot/IglooChest.java

@@ -2,7 +2,7 @@
 
 import cn.nukkit.inventory.InventoryType;
 import cn.nukkit.item.Item;
-import worldgeneratorextension.global.RandomizableContainer;
+import worldgeneratorextension.global.util.RandomizableContainer;
 import com.google.common.collect.Maps;
 
 public class PillagerOutpostChest extends RandomizableContainer {

src/main/java/worldgeneratorextension/multitspop/loot/PillagerOutpostChest.java

@@ -2,7 +2,7 @@
 
 import cn.nukkit.inventory.InventoryType;
 import cn.nukkit.item.Item;
-import worldgeneratorextension.global.RandomizableContainer;
+import worldgeneratorextension.global.util.RandomizableContainer;
 import com.google.common.collect.Maps;
 
 public class RuinBigChest extends RandomizableContainer {

src/main/java/worldgeneratorextension/multitspop/loot/RuinBigChest.java

@@ -2,7 +2,7 @@
 
 import cn.nukkit.inventory.InventoryType;
 import cn.nukkit.item.Item;
-import worldgeneratorextension.global.RandomizableContainer;
+import worldgeneratorextension.global.util.RandomizableContainer;
 import com.google.common.collect.Maps;
 
 public class RuinSmallChest extends RandomizableContainer {

src/main/java/worldgeneratorextension/multitspop/loot/RuinSmallChest.java

@@ -15,6 +15,8 @@
 import cn.nukkit.nbt.tag.ListTag;
 import worldgeneratorextension.global.task.ActorSpawnTask;
 import worldgeneratorextension.global.task.BlockActorSpawnTask;
+import worldgeneratorextension.global.template.AbstractLegacyStructureTemplate;
+import worldgeneratorextension.global.template.BlockEntry;
 
 import java.util.Comparator;
 import java.util.function.Consumer;