Remove DEFER from InferredType

Unused
This commit is contained in:
CocoTheOwner
2023-02-17 11:25:10 +01:00
parent f6571367db
commit 131c4692bc
4 changed files with 4 additions and 13 deletions
@@ -220,7 +220,6 @@ public class IrisComplex implements DataProvider {
return seaBiomeStream; return seaBiomeStream;
case SHORE: case SHORE:
return shoreBiomeStream; return shoreBiomeStream;
case DEFER:
default: default:
break; break;
} }
@@ -32,8 +32,5 @@ public enum InferredType {
SEA, SEA,
@Desc("Represents any cave biome type") @Desc("Represents any cave biome type")
CAVE, CAVE
@Desc("Defers the type to whatever another biome type that already exists is.")
DEFER
} }
@@ -484,11 +484,6 @@ public class IrisBiome extends IrisRegistrant implements IRare {
}); });
} }
public IrisBiome infer(InferredType t, InferredType type) {
setInferredType(t.equals(InferredType.DEFER) ? type : t);
return this;
}
public KList<BlockData> generateSeaLayers(double wx, double wz, RNG random, int maxDepth, IrisData rdata) { public KList<BlockData> generateSeaLayers(double wx, double wz, RNG random, int maxDepth, IrisData rdata) {
KList<BlockData> data = new KList<>(); KList<BlockData> data = new KList<>();
@@ -76,17 +76,17 @@ public class IrisSpawner extends IrisRegistrant {
public boolean isValid(IrisBiome biome) { public boolean isValid(IrisBiome biome) {
return switch (group) { return switch (group) {
case NORMAL -> switch (biome.getInferredType()) { case NORMAL -> switch (biome.getInferredType()) {
case SHORE, SEA, CAVE, DEFER -> false; case SHORE, SEA, CAVE -> false;
case LAND -> true; case LAND -> true;
}; };
case CAVE -> true; case CAVE -> true;
case UNDERWATER -> switch (biome.getInferredType()) { case UNDERWATER -> switch (biome.getInferredType()) {
case SHORE, LAND, CAVE, DEFER -> false; case SHORE, LAND, CAVE -> false;
case SEA -> true; case SEA -> true;
}; };
case BEACH -> switch (biome.getInferredType()) { case BEACH -> switch (biome.getInferredType()) {
case SHORE -> true; case SHORE -> true;
case LAND, CAVE, SEA, DEFER -> false; case LAND, CAVE, SEA -> false;
}; };
}; };
} }