diff --git a/core/src/main/java/com/volmit/iris/core/commands/CommandObject.java b/core/src/main/java/com/volmit/iris/core/commands/CommandObject.java index 2cfd03e6f..9786c3ec4 100644 --- a/core/src/main/java/com/volmit/iris/core/commands/CommandObject.java +++ b/core/src/main/java/com/volmit/iris/core/commands/CommandObject.java @@ -123,6 +123,16 @@ public class CommandObject implements DecreeExecutor { tile.toBukkitTry(world.getBlockAt(xx, yy, zz)); } + @Override + public void setData(int xx, int yy, int zz, T data) { + + } + + @Override + public T getData(int xx, int yy, int zz, Class t) { + return null; + } + @Override public Engine getEngine() { return null; diff --git a/core/src/main/java/com/volmit/iris/core/service/TreeSVC.java b/core/src/main/java/com/volmit/iris/core/service/TreeSVC.java index a492fd978..d11cd911a 100644 --- a/core/src/main/java/com/volmit/iris/core/service/TreeSVC.java +++ b/core/src/main/java/com/volmit/iris/core/service/TreeSVC.java @@ -189,6 +189,16 @@ public class TreeSVC implements IrisService { } + @Override + public void setData(int xx, int yy, int zz, T data) { + + } + + @Override + public T getData(int xx, int yy, int zz, Class t) { + return null; + } + @Override public Engine getEngine() { return engine; diff --git a/core/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java b/core/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java index b228eb00f..c6762e0b4 100644 --- a/core/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java +++ b/core/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java @@ -24,7 +24,6 @@ import com.volmit.iris.engine.object.IObjectPlacer; import com.volmit.iris.engine.object.IrisObjectPlacement; import com.volmit.iris.engine.object.TileData; import com.volmit.iris.util.math.RNG; -import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; public class HeightmapObjectPlacer implements IObjectPlacer { @@ -83,6 +82,16 @@ public class HeightmapObjectPlacer implements IObjectPlacer { oplacer.setTile(param1Int1, param1Int2, param1Int3, param1TileData); } + @Override + public void setData(int xx, int yy, int zz, T data) { + oplacer.setData(xx, yy, zz, data); + } + + @Override + public T getData(int xx, int yy, int zz, Class t) { + return oplacer.getData(xx, yy, zz, t); + } + @Override public Engine getEngine() { return null; diff --git a/core/src/main/java/com/volmit/iris/engine/framework/placer/WorldObjectPlacer.java b/core/src/main/java/com/volmit/iris/engine/framework/placer/WorldObjectPlacer.java index eef751306..e75f00c6b 100644 --- a/core/src/main/java/com/volmit/iris/engine/framework/placer/WorldObjectPlacer.java +++ b/core/src/main/java/com/volmit/iris/engine/framework/placer/WorldObjectPlacer.java @@ -124,4 +124,13 @@ public class WorldObjectPlacer implements IObjectPlacer { public void setTile(int xx, int yy, int zz, TileData tile) { tile.toBukkitTry(world.getBlockAt(xx, yy + world.getMinHeight(), zz)); } + + @Override + public void setData(int xx, int yy, int zz, T data) { + } + + @Override + public T getData(int xx, int yy, int zz, Class t) { + return null; + } } diff --git a/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java b/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java index c045cf922..96be7cbc8 100644 --- a/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java +++ b/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -154,9 +154,9 @@ public class PlannedStructure { JigsawStructureContainer structure = JigsawStructureContainer.toContainer(getStructure()); i.setRealPositions(xx, height, zz, placer); return v.place(xx, height, zz, placer, options, rng, (b, data) -> { - e.set(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id); - e.set(b.getX(), b.getY(), b.getZ(), structure); - e.set(b.getX(), b.getY(), b.getZ(), piece); + placer.setData(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id); + placer.setData(b.getX(), b.getY(), b.getZ(), structure); + placer.setData(b.getX(), b.getY(), b.getZ(), piece); }, null, getData().getEngine() != null ? getData() : eng.getData()) != -1; } diff --git a/core/src/main/java/com/volmit/iris/engine/object/IObjectPlacer.java b/core/src/main/java/com/volmit/iris/engine/object/IObjectPlacer.java index 3a7a89a38..9e2183b1c 100644 --- a/core/src/main/java/com/volmit/iris/engine/object/IObjectPlacer.java +++ b/core/src/main/java/com/volmit/iris/engine/object/IObjectPlacer.java @@ -20,8 +20,8 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.framework.Engine; -import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; +import org.jetbrains.annotations.Nullable; public interface IObjectPlacer { int getHighest(int x, int z, IrisData data); @@ -46,5 +46,9 @@ public interface IObjectPlacer { void setTile(int xx, int yy, int zz, TileData tile); + void setData(int xx, int yy, int zz, T data); + + @Nullable T getData(int xx, int yy, int zz, Class t); + Engine getEngine(); }