From 23188c3898c5f1ebee64363fe925e2a026f2e08a Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Fri, 6 Nov 2020 00:54:42 -0500 Subject: [PATCH] Tweaks for v2 support --- .../iris/object/IrisStructurePlacement.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/volmit/iris/object/IrisStructurePlacement.java b/src/main/java/com/volmit/iris/object/IrisStructurePlacement.java index cc4caf990..60cbc053b 100644 --- a/src/main/java/com/volmit/iris/object/IrisStructurePlacement.java +++ b/src/main/java/com/volmit/iris/object/IrisStructurePlacement.java @@ -15,6 +15,7 @@ import com.volmit.iris.util.RNG; import com.volmit.iris.util.RegistryListStructure; import com.volmit.iris.util.Required; +import com.volmit.iris.v2.scaffold.data.DataProvider; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -168,22 +169,22 @@ public class IrisStructurePlacement }); } - public IrisObject load(ContextualTerrainProvider g, String s) + public IrisObject load(DataProvider g, String s) { return g.getData().getObjectLoader().load(s); } - public int gridSize(ContextualTerrainProvider g) + public int gridSize(DataProvider g) { return getStructure(g).getGridSize(); } - public int gridHeight(ContextualTerrainProvider g) + public int gridHeight(DataProvider g) { return getStructure(g).getGridHeight(); } - public IrisStructure getStructure(ContextualTerrainProvider g) + public IrisStructure getStructure(DataProvider g) { return structure.aquire(() -> (g == null ? Iris.globaldata : g.getData()).getStructureLoader().load(getTileset())); } @@ -213,4 +214,15 @@ public class IrisStructurePlacement return chanceCell; }); } + + public CellGenerator getChanceGenerator(RNG g) + { + return chanceCell.aquire(() -> + { + CellGenerator chanceCell = new CellGenerator(g.nextParallelRNG(-72346).nextParallelRNG((height + 10000) * rarity)); + chanceCell.setCellScale(1D); + chanceCell.setShuffle(getShuffle()); + return chanceCell; + }); + } }