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

Fixes

Browse Source
This commit is contained in:
cyberpwn 2021-08-28 19:54:41 -04:00
parent dd5f55f4fc
commit 376d7a8878
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java
View File

@ -401,9 +401,9 @@ public class IrisBiome extends IrisRegistrant implements IRare {
return data; return data;
} }
for (int i = 0; i < layers.size(); i++) { for (int i = 0; i < caveCeilingLayers.size(); i++) {
CNG hgen = getLayerHeightGenerators(random, rdata).get(i); CNG hgen = getLayerHeightGenerators(random, rdata).get(i);
double d = hgen.fit(layers.get(i).getMinHeight(), layers.get(i).getMaxHeight(), wx / layers.get(i).getZoom(), wz / layers.get(i).getZoom()); double d = hgen.fit(caveCeilingLayers.get(i).getMinHeight(), caveCeilingLayers.get(i).getMaxHeight(), wx / caveCeilingLayers.get(i).getZoom(), wz / caveCeilingLayers.get(i).getZoom());
if (d <= 0) { if (d <= 0) {
continue; continue;
@ -415,7 +415,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
} }
try { try {
data.add(getCaveCeilingLayers().get(i).get(random.nextParallelRNG(i + j), (wx + j) / layers.get(i).getZoom(), j, (wz - j) / layers.get(i).getZoom(), rdata)); data.add(getCaveCeilingLayers().get(i).get(random.nextParallelRNG(i + j), (wx + j) / caveCeilingLayers.get(i).getZoom(), j, (wz - j) / caveCeilingLayers.get(i).getZoom(), rdata));
} catch (Throwable e) { } catch (Throwable e) {
Iris.reportError(e); Iris.reportError(e);
e.printStackTrace(); e.printStackTrace();

4
src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorator.java
View File

@ -47,6 +47,10 @@ public class IrisDecorator {
@Desc("Forcefully place this decorant anywhere it is supposed to go even if it should not go on a specific surface block. For example, you could force tallgrass to place on top of stone by using this.") @Desc("Forcefully place this decorant anywhere it is supposed to go even if it should not go on a specific surface block. For example, you could force tallgrass to place on top of stone by using this.")
private boolean forcePlace = false; private boolean forcePlace = false;
@DependsOn({"scaleStack", "stackMin", "stackMax"})
@Desc("If stackMax is set to true, use this to limit its max height for large caverns")
private int absoluteMaxStack = 30;
@Desc("Dispersion is used to pick places to spawn. Scatter randomly places them (vanilla) or Wispy for a streak like patch system.") @Desc("Dispersion is used to pick places to spawn. Scatter randomly places them (vanilla) or Wispy for a streak like patch system.")
private IrisGeneratorStyle style = NoiseStyle.STATIC.style(); private IrisGeneratorStyle style = NoiseStyle.STATIC.style();

8
src/main/java/com/volmit/iris/util/data/B.java
View File

@ -150,6 +150,10 @@ public class B {
IntSet b = new IntOpenHashSet(); IntSet b = new IntOpenHashSet();
Arrays.stream(new Material[]{ Arrays.stream(new Material[]{
GLOWSTONE, GLOWSTONE,
AMETHYST_CLUSTER,
SMALL_AMETHYST_BUD,
MEDIUM_AMETHYST_BUD,
LARGE_AMETHYST_BUD,
END_ROD, END_ROD,
SOUL_SAND, SOUL_SAND,
TORCH, TORCH,
@ -211,6 +215,10 @@ public class B {
return IntSets.unmodifiable(b); return IntSets.unmodifiable(b);
} }
public static boolean isOre(BlockData blockData) {
return blockData.getMaterial().name().endsWith("_ORE");
}
private static IntSet buildStorageChestCache() { private static IntSet buildStorageChestCache() {
IntSet b = new IntOpenHashSet(storageCache); IntSet b = new IntOpenHashSet(storageCache);
b.remove(SMOKER.ordinal()); b.remove(SMOKER.ordinal());