etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed issues with the biome config file. Closes #1693

Browse source
This commit is contained in:
Adubbz 2020-11-09 12:08:14 +11:00
parent 7a9533387b
commit b8bbadd73a
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/biomesoplenty/api/enums/BOPClimates.java
View file

@ -203,7 +203,7 @@ public enum BOPClimates
{
for (WeightedBiomeEntry entry : climate.landBiomes)
{
System.out.println(climate.name()+" "+entry.biome.getRegistryName()+" "+entry.weight);
System.out.println(climate.name()+" "+entry.biome.location()+" "+entry.weight);
}
}
}

20
src/main/java/biomesoplenty/common/biome/BiomeRegistry.java
View file

@ -184,7 +184,7 @@ public class BiomeRegistry
for (DeferredRegistration<SubBiomeRegistrationData> registration : subBiomeRegistrations)
{
SubBiomeRegistrationData regData = registration.regData;
String biomeName = registration.regData.getChild().getRegistryName().toString();
String biomeName = registration.regData.getChild().location().toString();
defaultSubBiomeEntries.put(biomeName, new BiomeConfigData.SubBiomeEntry(regData.getWeight(), regData.getRarity()));
regDataMap.put(biomeName, registration.regData);
}
@ -231,7 +231,7 @@ public class BiomeRegistry
for (DeferredRegistration<SingleClimateRegistrationData> registration : biomeRegistrations)
{
SingleClimateRegistrationData regData = registration.regData;
String biomeName = regData.getBiome().getRegistryName().toString();
String biomeName = regData.getBiome().location().toString();
defaultBiomeEntries.put(biomeName, new BiomeConfigData.ToggleableBiomeEntry(true));
}
@ -257,7 +257,7 @@ public class BiomeRegistry
for (DeferredRegistration<SingleClimateRegistrationData> registration : biomeRegistrations)
{
SingleClimateRegistrationData regData = registration.regData;
String biomeName = regData.getBiome().getRegistryName().toString();
String biomeName = regData.getBiome().location().toString();
if (revisedBiomeEntries.containsKey(biomeName))
{
@ -280,7 +280,7 @@ public class BiomeRegistry
for (DeferredRegistration<SingleClimateRegistrationData> registration : biomeRegistrations)
{
SingleClimateRegistrationData regData = registration.regData;
String biomeName = registration.regData.getBiome().getRegistryName().toString();
String biomeName = registration.regData.getBiome().location().toString();
defaultBiomeEntries.put(biomeName, new BiomeConfigData.WeightedBiomeEntry(regData.getWeight()));
regDataMap.put(biomeName, registration.regData);
}
@ -357,7 +357,7 @@ public class BiomeRegistry
RegistryKey<Biome> biome = ((SubBiomeRegistrationData)reg.regData).getChild();
if (children.contains(biome))
{
throw new RuntimeException(String.format("Sub biome %s cannot be added to multiple parents", biome.getRegistryName().toString()));
throw new RuntimeException(String.format("Sub biome %s cannot be added to multiple parents", biome.location().toString()));
}
children.add(biome);
});
@ -424,22 +424,22 @@ public class BiomeRegistry
SUB_BIOME((SubBiomeRegistrationData data) -> {
if (data.getWeight() == 0)
{
BiomesOPlenty.logger.debug("Weights absent for sub biome" + data.getChild().getRegistryName().toString() + ", disabling...");
BiomesOPlenty.logger.debug("Weights absent for sub biome" + data.getChild().location().toString() + ", disabling...");
return;
}
String childName = data.getChild().getRegistryName().toString();
String childName = data.getChild().location().toString();
BiomesOPlenty.logger.debug(String.format("Sub biome %s weight set to %d", childName, data.getWeight()));
ModBiomes.subBiomes.put(BiomeUtil.getBiomeId(data.getParent()), new ModBiomes.WeightedSubBiome(data.getChild(), data.getRarity(), data.getWeight()));
}),
ISLAND_BIOME((SingleClimateRegistrationData data) -> {
if (data.getWeight() == 0)
{
BiomesOPlenty.logger.debug("Weights absent for island biome" + data.getBiome().getRegistryName().toString() + ", disabling...");
BiomesOPlenty.logger.debug("Weights absent for island biome" + data.getBiome().location().toString() + ", disabling...");
return;
}
String biomeName = data.getBiome().getRegistryName().toString();
String biomeName = data.getBiome().location().toString();
BiomesOPlenty.logger.debug(String.format("Island biome %s weight set to %d for climate %s", biomeName, data.getWeight(), data.getClimate().name()));
ModBiomes.islandBiomeIds.add(BiomeUtil.getBiomeId(data.getBiome()));
data.getClimate().addIslandBiome(data.getWeight(), data.getBiome());
@ -447,7 +447,7 @@ public class BiomeRegistry
VANILLA_BIOME((SingleClimateRegistrationData data) -> {
if (data.getWeight() == 0)
{
BiomesOPlenty.logger.debug("Weights absent for vanilla biome" + data.getBiome().getRegistryName().toString() + ", disabling...");
BiomesOPlenty.logger.debug("Weights absent for vanilla biome" + data.getBiome().location().toString() + ", disabling...");
return;
}

2
src/main/java/biomesoplenty/init/ModCompatibility.java
View file

@ -32,7 +32,7 @@ public class ModCompatibility
// Removes vanilla entries by checking if the biome namespace is not "minecraft"
// If a mod makes their biome with minecraft namespace, they need a bug report as that's a big no-no.
List<BiomeManager.BiomeEntry> moddedBiomesInType = BiomeManager.getBiomes(type).stream()
.filter(biomeEntry -> !biomeEntry.getKey().getRegistryName().getNamespace().equals("minecraft"))
.filter(biomeEntry -> !biomeEntry.getKey().location().getNamespace().equals("minecraft"))
.collect(Collectors.toList());
// calls remapBiomeToBoP on each modded biome and its weight.