mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 10:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks for v2 support

Browse Source
This commit is contained in:
Daniel Mills 2020-11-06 00:54:42 -05:00
parent 7322f1a9fb
commit 23188c3898
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/volmit/iris/object/IrisStructurePlacement.java
View File

@ -15,6 +15,7 @@ import com.volmit.iris.util.RNG;
import com.volmit.iris.util.RegistryListStructure; import com.volmit.iris.util.RegistryListStructure;
import com.volmit.iris.util.Required; import com.volmit.iris.util.Required;
import com.volmit.iris.v2.scaffold.data.DataProvider;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; 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); return g.getData().getObjectLoader().load(s);
} }
public int gridSize(ContextualTerrainProvider g) public int gridSize(DataProvider g)
{ {
return getStructure(g).getGridSize(); return getStructure(g).getGridSize();
} }
public int gridHeight(ContextualTerrainProvider g) public int gridHeight(DataProvider g)
{ {
return getStructure(g).getGridHeight(); 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())); return structure.aquire(() -> (g == null ? Iris.globaldata : g.getData()).getStructureLoader().load(getTileset()));
} }
@ -213,4 +214,15 @@ public class IrisStructurePlacement
return chanceCell; 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;
});
}
} }