diff --git a/src/main/java/com/volmit/iris/manager/IrisDataManager.java b/src/main/java/com/volmit/iris/manager/IrisDataManager.java index 1ce64aa6e..b0c2b37c5 100644 --- a/src/main/java/com/volmit/iris/manager/IrisDataManager.java +++ b/src/main/java/com/volmit/iris/manager/IrisDataManager.java @@ -19,8 +19,8 @@ public class IrisDataManager private ResourceLoader dimensionLoader; private ResourceLoader generatorLoader; private ResourceLoader structureLoader; - private ResourceLoader structurePieceLoader; - private ResourceLoader structurePoolLoader; + private ResourceLoader structurePieceLoader; + private ResourceLoader structurePoolLoader; private ResourceLoader entityLoader; private ResourceLoader blockLoader; private ObjectResourceLoader objectLoader; @@ -82,8 +82,8 @@ public class IrisDataManager this.biomeLoader = new ResourceLoader<>(packs, this, "biomes", "Biome", IrisBiome.class); this.dimensionLoader = new ResourceLoader<>(packs, this, "dimensions", "Dimension", IrisDimension.class); this.structureLoader = new ResourceLoader<>(packs, this, "structures", "Structure", IrisStructure.class); - this.structurePoolLoader = new ResourceLoader<>(packs, this, "jigsaw-pools", "Jigsaw Pool", IrisStructurePool.class); - this.structurePieceLoader = new ResourceLoader<>(packs, this, "jigsaw-pieces", "Jigsaw Piece", IrisStructurePiece.class); + this.structurePoolLoader = new ResourceLoader<>(packs, this, "jigsaw-pools", "Jigsaw Pool", IrisJigsawPool.class); + this.structurePieceLoader = new ResourceLoader<>(packs, this, "jigsaw-pieces", "Jigsaw Piece", IrisJigsawPiece.class); this.generatorLoader = new ResourceLoader<>(packs, this, "generators", "Generator", IrisGenerator.class); this.blockLoader = new ResourceLoader<>(packs,this, "blocks", "Block", IrisBlockData.class); this.objectLoader = new ObjectResourceLoader(packs, this, "objects", "Object"); @@ -143,12 +143,12 @@ public class IrisDataManager return loadAny(key, (dm) -> dm.getStructureLoader().load(key, false)); } - public static IrisStructurePiece loadAnyStructurePiece(String key) + public static IrisJigsawPiece loadAnyStructurePiece(String key) { return loadAny(key, (dm) -> dm.getStructurePieceLoader().load(key, false)); } - public static IrisStructurePool loadAnyStructurePool(String key) + public static IrisJigsawPool loadAnyStructurePool(String key) { return loadAny(key, (dm) -> dm.getStructurePoolLoader().load(key, false)); } diff --git a/src/main/java/com/volmit/iris/manager/IrisProject.java b/src/main/java/com/volmit/iris/manager/IrisProject.java index 9d965ddb5..1368c1846 100644 --- a/src/main/java/com/volmit/iris/manager/IrisProject.java +++ b/src/main/java/com/volmit/iris/manager/IrisProject.java @@ -283,8 +283,8 @@ public class IrisProject schemas.put(getSchemaEntry(IrisRegion.class, dm, "/regions/*.json")); schemas.put(getSchemaEntry(IrisGenerator.class,dm, "/generators/*.json")); schemas.put(getSchemaEntry(IrisStructure.class, dm, "/structures/*.json")); - schemas.put(getSchemaEntry(IrisStructurePiece.class, dm, "/jigsaw-pieces/*.json")); - schemas.put(getSchemaEntry(IrisStructurePool.class, dm, "/jigsaw-pools/*.json")); + schemas.put(getSchemaEntry(IrisJigsawPiece.class, dm, "/jigsaw-pieces/*.json")); + schemas.put(getSchemaEntry(IrisJigsawPool.class, dm, "/jigsaw-pools/*.json")); schemas.put(getSchemaEntry(IrisBlockData.class, dm, "/blocks/*.json")); schemas.put(getSchemaEntry(IrisLootTable.class, dm, "/loot/*.json")); settings.put("json.schemas", schemas); diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawEdit.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawEdit.java index 69ad9a552..4fe7b514c 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawEdit.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawEdit.java @@ -4,7 +4,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.manager.edit.JigsawEditor; -import com.volmit.iris.object.IrisStructurePiece; +import com.volmit.iris.object.IrisJigsawPiece; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -42,7 +42,7 @@ public class CommandIrisJigsawEdit extends MortarCommand } - IrisStructurePiece piece = IrisDataManager.loadAnyStructurePiece(args[0]); + IrisJigsawPiece piece = IrisDataManager.loadAnyStructurePiece(args[0]); if(piece != null) { diff --git a/src/main/java/com/volmit/iris/manager/edit/JigsawEditor.java b/src/main/java/com/volmit/iris/manager/edit/JigsawEditor.java index 1e480e946..cb21c5e27 100644 --- a/src/main/java/com/volmit/iris/manager/edit/JigsawEditor.java +++ b/src/main/java/com/volmit/iris/manager/edit/JigsawEditor.java @@ -24,7 +24,7 @@ public class JigsawEditor implements Listener { private final Player player; private final IrisObject object; private final File targetSaveLocation; - private final IrisStructurePiece piece; + private final IrisJigsawPiece piece; private final Location origin; private final Cuboid cuboid; private final int ticker; @@ -32,7 +32,7 @@ public class JigsawEditor implements Listener { private final KMap falling = new KMap<>(); private final ChronoLatch cl = new ChronoLatch(100); - public JigsawEditor(Player player, IrisStructurePiece piece, IrisObject object, File saveLocation) + public JigsawEditor(Player player, IrisJigsawPiece piece, IrisObject object, File saveLocation) { if(editors.containsKey(player)) { @@ -45,7 +45,7 @@ public class JigsawEditor implements Listener { origin = player.getLocation().clone().add(0, 7, 0); target = origin; this.targetSaveLocation = saveLocation; - this.piece = piece == null ? new IrisStructurePiece() : piece; + this.piece = piece == null ? new IrisJigsawPiece() : piece; this.piece.setObject(object.getLoadKey()); cuboid = new Cuboid(origin.clone(), origin.clone().add(object.getW()-1, object.getH()-1, object.getD()-1)); ticker = J.sr(this::onTick, 0); @@ -93,8 +93,8 @@ public class JigsawEditor implements Listener { { Vector v = e.getClickedBlock().getLocation().clone().subtract(origin.clone()).toVector(); IrisPosition pos = new IrisPosition(v.getBlockX(), v.getBlockY(), v.getBlockZ()); - IrisStructurePieceConnector connector = null; - for(IrisStructurePieceConnector i : piece.getConnectors()) + IrisJigsawPieceConnector connector = null; + for(IrisJigsawPieceConnector i : piece.getConnectors()) { if(i.getPosition().equals(pos)) { @@ -105,7 +105,7 @@ public class JigsawEditor implements Listener { if(!player.isSneaking() && connector == null) { - connector = new IrisStructurePieceConnector(); + connector = new IrisJigsawPieceConnector(); connector.setDirection(IrisDirection.getDirection(e.getBlockFace())); connector.setPosition(pos); piece.getConnectors().add(connector); @@ -149,7 +149,7 @@ public class JigsawEditor implements Listener { f: for(IrisPosition i : falling.k()) { - for(IrisStructurePieceConnector j : piece.getConnectors()) + for(IrisJigsawPieceConnector j : piece.getConnectors()) { if(j.getPosition().equals(i)) { @@ -160,7 +160,7 @@ public class JigsawEditor implements Listener { falling.remove(i).run(); } - for(IrisStructurePieceConnector i : piece.getConnectors()) + for(IrisJigsawPieceConnector i : piece.getConnectors()) { IrisPosition pos = i.getPosition(); Location at = origin.clone().add(new Vector(pos.getX()+1, pos.getY()+1, pos.getZ()+1)); diff --git a/src/main/java/com/volmit/iris/object/IrisStructurePiece.java b/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java similarity index 79% rename from src/main/java/com/volmit/iris/object/IrisStructurePiece.java rename to src/main/java/com/volmit/iris/object/IrisJigsawPiece.java index 87b998645..24f5f8cf1 100644 --- a/src/main/java/com/volmit/iris/object/IrisStructurePiece.java +++ b/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; @Desc("Represents a structure tile") @Data @EqualsAndHashCode(callSuper = false) -public class IrisStructurePiece extends IrisRegistrant +public class IrisJigsawPiece extends IrisRegistrant { @RegistryListObject @Required @@ -28,7 +28,7 @@ public class IrisStructurePiece extends IrisRegistrant @Required @DontObfuscate - @ArrayType(type = IrisStructurePieceConnector.class, min = 1) + @ArrayType(type = IrisJigsawPieceConnector.class, min = 1) @Desc("The connectors this object contains") - private KList connectors = new KList<>(); + private KList connectors = new KList<>(); } diff --git a/src/main/java/com/volmit/iris/object/IrisStructurePieceConnector.java b/src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisStructurePieceConnector.java rename to src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java index b50c5d1e1..6ccd6cbef 100644 --- a/src/main/java/com/volmit/iris/object/IrisStructurePieceConnector.java +++ b/src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; @Desc("Represents a structure tile") @Data @EqualsAndHashCode(callSuper = false) -public class IrisStructurePieceConnector +public class IrisJigsawPieceConnector { @Required @DontObfuscate diff --git a/src/main/java/com/volmit/iris/object/IrisStructurePool.java b/src/main/java/com/volmit/iris/object/IrisJigsawPool.java similarity index 91% rename from src/main/java/com/volmit/iris/object/IrisStructurePool.java rename to src/main/java/com/volmit/iris/object/IrisJigsawPool.java index 3d1ddd441..f115169a2 100644 --- a/src/main/java/com/volmit/iris/object/IrisStructurePool.java +++ b/src/main/java/com/volmit/iris/object/IrisJigsawPool.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; @Desc("Represents a structure piece pool") @Data @EqualsAndHashCode(callSuper = false) -public class IrisStructurePool extends IrisRegistrant +public class IrisJigsawPool extends IrisRegistrant { @RegistryListStructurePiece @Required