MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Change] No special case for BetterEnd in BiomeSource

Browse source
This commit is contained in:
Frank 2022-07-10 03:49:01 +02:00
parent 91d7931010
commit 6b09a39b95
2 changed files with 22 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/betterx/bclib/BCLib.java
View file

@ -43,10 +43,6 @@ public class BCLib implements ModInitializer {
.getModContainer("nullscape") .getModContainer("nullscape")
.isPresent(); .isPresent();
public static final boolean RUNS_BETTER_END = FabricLoader.getInstance()
.getModContainer("betterend")
.isPresent();
@Override @Override
public void onInitialize() { public void onInitialize() {
LevelGenEvents.register(); LevelGenEvents.register();

29
src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java
View file

@ -360,10 +360,7 @@ public class BCLibEndBiomeSource extends BCLBiomeSource implements BiomeSourceWi
BiomeAPI.BiomeType suggestedType; BiomeAPI.BiomeType suggestedType;
// this is a crude way to fix this issue...
// basically this condition should not exist. The BetterEnd BiomeDeciders
// should do the else part
if (!BCLib.RUNS_BETTER_END || config.generatorVersion == BCLEndBiomeSourceConfig.EndBiomeGeneratorType.VANILLA) {
int x = (SectionPos.blockToSectionCoord(posX) * 2 + 1) * 8; int x = (SectionPos.blockToSectionCoord(posX) * 2 + 1) * 8;
int z = (SectionPos.blockToSectionCoord(posZ) * 2 + 1) * 8; int z = (SectionPos.blockToSectionCoord(posZ) * 2 + 1) * 8;
double d = sampler.erosion().compute(new DensityFunction.SinglePointContext(x, posY, z)); double d = sampler.erosion().compute(new DensityFunction.SinglePointContext(x, posY, z));
@ -386,31 +383,9 @@ public class BCLibEndBiomeSource extends BCLBiomeSource implements BiomeSourceWi
final BiomeAPI.BiomeType originalType = suggestedType; final BiomeAPI.BiomeType originalType = suggestedType;
for (BiomeDecider decider : deciders) { for (BiomeDecider decider : deciders) {
suggestedType = decider suggestedType = decider
.suggestType( .suggestType(originalType, suggestedType, d, maxHeight, posX, posY, posZ, biomeX, biomeY, biomeZ);
originalType,
suggestedType,
d,
maxHeight,
posX,
posY,
posZ,
biomeX,
biomeY,
biomeZ
);
} }
} else {
pos.setLocation(biomeX, biomeZ);
final BiomeAPI.BiomeType originalType = (dist <= (long) config.innerVoidRadiusSquared
? BiomeAPI.BiomeType.END_CENTER
: BiomeAPI.BiomeType.END_LAND);
suggestedType = originalType;
for (BiomeDecider decider : deciders) {
suggestedType = decider
.suggestType(originalType, suggestedType, maxHeight, posX, posY, posZ, biomeX, biomeY, biomeZ);
}
}
BiomePicker.ActualBiome result; BiomePicker.ActualBiome result;
for (BiomeDecider decider : deciders) { for (BiomeDecider decider : deciders) {