keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Resuscitate BiomeDictionary using RegistryKeys instead of biome references.

Browse source
This commit is contained in:
LexManos 2020-10-15 12:43:18 -07:00
parent 51fa230e7b
commit 93226bbcff
2 changed files with 68 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

190
src/main/java/net/minecraftforge/common/BiomeDictionary.java
View file

@ -17,11 +17,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
/* Biomes are completely redone in 1.16.2, reevaluate
package net.minecraftforge.common; package net.minecraftforge.common;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -30,12 +30,12 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import net.minecraft.world.biome.Biomes; import net.minecraft.world.biome.Biomes;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.RegistryKey;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.*; import net.minecraft.world.biome.*;
import static net.minecraftforge.common.BiomeDictionary.Type.*; import static net.minecraftforge.common.BiomeDictionary.Type.*;
import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistries;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
public class BiomeDictionary public class BiomeDictionary
@ -45,29 +45,28 @@ public class BiomeDictionary
public static final class Type public static final class Type
{ {
private static final Map<String, Type> byName = new TreeMap<>();
private static final Map<String, Type> byName = new HashMap<String, Type>();
private static Collection<Type> allTypes = Collections.unmodifiableCollection(byName.values()); private static Collection<Type> allTypes = Collections.unmodifiableCollection(byName.values());
/*Temperature-based tags. Specifying neither implies a biome is temperate* / /*Temperature-based tags. Specifying neither implies a biome is temperate*/
public static final Type HOT = new Type("HOT"); public static final Type HOT = new Type("HOT");
public static final Type COLD = new Type("COLD"); public static final Type COLD = new Type("COLD");
//Tags specifying the amount of vegetation a biome has. Specifying neither implies a biome to have moderate amounts* / //Tags specifying the amount of vegetation a biome has. Specifying neither implies a biome to have moderate amounts*/
public static final Type SPARSE = new Type("SPARSE"); public static final Type SPARSE = new Type("SPARSE");
public static final Type DENSE = new Type("DENSE"); public static final Type DENSE = new Type("DENSE");
//Tags specifying how moist a biome is. Specifying neither implies the biome as having moderate humidity* / //Tags specifying how moist a biome is. Specifying neither implies the biome as having moderate humidity*/
public static final Type WET = new Type("WET"); public static final Type WET = new Type("WET");
public static final Type DRY = new Type("DRY"); public static final Type DRY = new Type("DRY");
/*Tree-based tags, SAVANNA refers to dry, desert-like trees (Such as Acacia), CONIFEROUS refers to snowy trees (Such as Spruce) and JUNGLE refers to jungle trees. /*Tree-based tags, SAVANNA refers to dry, desert-like trees (Such as Acacia), CONIFEROUS refers to snowy trees (Such as Spruce) and JUNGLE refers to jungle trees.
* Specifying no tag implies a biome has temperate trees (Such as Oak)* / * Specifying no tag implies a biome has temperate trees (Such as Oak)*/
public static final Type SAVANNA = new Type("SAVANNA"); public static final Type SAVANNA = new Type("SAVANNA");
public static final Type CONIFEROUS = new Type("CONIFEROUS"); public static final Type CONIFEROUS = new Type("CONIFEROUS");
public static final Type JUNGLE = new Type("JUNGLE"); public static final Type JUNGLE = new Type("JUNGLE");
/*Tags specifying the nature of a biome* / /*Tags specifying the nature of a biome*/
public static final Type SPOOKY = new Type("SPOOKY"); public static final Type SPOOKY = new Type("SPOOKY");
public static final Type DEAD = new Type("DEAD"); public static final Type DEAD = new Type("DEAD");
public static final Type LUSH = new Type("LUSH"); public static final Type LUSH = new Type("LUSH");
@ -81,10 +80,10 @@ public class BiomeDictionary
public static final Type RIVER = new Type("RIVER"); public static final Type RIVER = new Type("RIVER");
/** /**
* A general tag for all water-based biomes. Shown as present if OCEAN or RIVER are. * A general tag for all water-based biomes. Shown as present if OCEAN or RIVER are.
** / **/
public static final Type WATER = new Type("WATER", OCEAN, RIVER); public static final Type WATER = new Type("WATER", OCEAN, RIVER);
/*Generic types which a biome can be* / /*Generic types which a biome can be*/
public static final Type MESA = new Type("MESA"); public static final Type MESA = new Type("MESA");
public static final Type FOREST = new Type("FOREST"); public static final Type FOREST = new Type("FOREST");
public static final Type PLAINS = new Type("PLAINS"); public static final Type PLAINS = new Type("PLAINS");
@ -97,15 +96,15 @@ public class BiomeDictionary
public static final Type BEACH = new Type("BEACH"); public static final Type BEACH = new Type("BEACH");
public static final Type VOID = new Type("VOID"); public static final Type VOID = new Type("VOID");
/*Tags specifying the dimension a biome generates in. Specifying none implies a biome that generates in a modded dimension* / /*Tags specifying the dimension a biome generates in. Specifying none implies a biome that generates in a modded dimension*/
public static final Type OVERWORLD = new Type("OVERWORLD"); public static final Type OVERWORLD = new Type("OVERWORLD");
public static final Type NETHER = new Type("NETHER"); public static final Type NETHER = new Type("NETHER");
public static final Type END = new Type("END"); public static final Type END = new Type("END");
private final String name; private final String name;
private final List<Type> subTypes; private final List<Type> subTypes;
private final Set<Biome> biomes = new HashSet<Biome>(); private final Set<RegistryKey<Biome>> biomes = new HashSet<>();
private final Set<Biome> biomesUn = Collections.unmodifiableSet(biomes); private final Set<RegistryKey<Biome>> biomesUn = Collections.unmodifiableSet(biomes);
private Type(String name, Type... subTypes) private Type(String name, Type... subTypes)
{ {
@ -117,7 +116,7 @@ public class BiomeDictionary
/** /**
* Gets the name for this type. * Gets the name for this type.
* / */
public String getName() public String getName()
{ {
return name; return name;
@ -144,7 +143,7 @@ public class BiomeDictionary
* *
* @param name The name of this Type * @param name The name of this Type
* @return An instance of Type for this name. * @return An instance of Type for this name.
* / */
public static Type getType(String name, Type... subTypes) public static Type getType(String name, Type... subTypes)
{ {
name = name.toUpperCase(); name = name.toUpperCase();
@ -158,7 +157,7 @@ public class BiomeDictionary
/** /**
* @return An unmodifiable collection of all current biome types. * @return An unmodifiable collection of all current biome types.
* / */
public static Collection<Type> getAll() public static Collection<Type> getAll()
{ {
return allTypes; return allTypes;
@ -175,16 +174,15 @@ public class BiomeDictionary
} }
} }
private static final Map<ResourceLocation, BiomeInfo> biomeInfoMap = new HashMap<ResourceLocation, BiomeInfo>(); private static final Map<RegistryKey<Biome>, BiomeInfo> biomeInfoMap = new HashMap<>();
private static class BiomeInfo private static class BiomeInfo
{ {
private final Set<Type> types = new HashSet<Type>(); private final Set<Type> types = new HashSet<Type>();
private final Set<Type> typesUn = Collections.unmodifiableSet(this.types); private final Set<Type> typesUn = Collections.unmodifiableSet(this.types);
} }
public static void init() {}
static static
{ {
registerVanillaBiomes(); registerVanillaBiomes();
@ -193,11 +191,9 @@ public class BiomeDictionary
/** /**
* Adds the given types to the biome. * Adds the given types to the biome.
* *
* / */
public static void addTypes(Biome biome, Type... types) public static void addTypes(RegistryKey<Biome> biome, Type... types)
{ {
Preconditions.checkArgument(ForgeRegistries.BIOMES.containsValue(biome), "Cannot add types to unregistered biome %s", biome);
Collection<Type> supertypes = listSupertypes(types); Collection<Type> supertypes = listSupertypes(types);
Collections.addAll(supertypes, types); Collections.addAll(supertypes, types);
@ -214,9 +210,9 @@ public class BiomeDictionary
/** /**
* Gets the set of biomes that have the given type. * Gets the set of biomes that have the given type.
* *
* / */
@Nonnull @Nonnull
public static Set<Biome> getBiomes(Type type) public static Set<RegistryKey<Biome>> getBiomes(Type type)
{ {
return type.biomesUn; return type.biomesUn;
} }
@ -224,11 +220,10 @@ public class BiomeDictionary
/** /**
* Gets the set of types that have been added to the given biome. * Gets the set of types that have been added to the given biome.
* *
* / */
@Nonnull @Nonnull
public static Set<Type> getTypes(Biome biome) public static Set<Type> getTypes(RegistryKey<Biome> biome)
{ {
ensureHasTypes(biome);
return getBiomeInfo(biome).typesUn; return getBiomeInfo(biome).typesUn;
} }
@ -236,25 +231,19 @@ public class BiomeDictionary
* Checks if the two given biomes have types in common. * Checks if the two given biomes have types in common.
* *
* @return returns true if a common type is found, false otherwise * @return returns true if a common type is found, false otherwise
* / */
public static boolean areSimilar(Biome biomeA, Biome biomeB) public static boolean areSimilar(RegistryKey<Biome> biomeA, RegistryKey<Biome> biomeB)
{ {
for (Type type : getTypes(biomeA)) Set<Type> typesA = getTypes(biomeA);
{ Set<Type> typesB = getTypes(biomeB);
if (getTypes(biomeB).contains(type)) return typesA.stream().anyMatch(typesB::contains);
{
return true;
}
}
return false;
} }
/** /**
* Checks if the given type has been added to the given biome. * Checks if the given type has been added to the given biome.
* *
* / */
public static boolean hasType(Biome biome, Type type) public static boolean hasType(RegistryKey<Biome> biome, Type type)
{ {
return getTypes(biome).contains(type); return getTypes(biome).contains(type);
} }
@ -262,90 +251,16 @@ public class BiomeDictionary
/** /**
* Checks if any type has been added to the given biome. * Checks if any type has been added to the given biome.
* *
* / */
public static boolean hasAnyType(Biome biome) public static boolean hasAnyType(RegistryKey<Biome> biome)
{ {
return !getBiomeInfo(biome).types.isEmpty(); return !getBiomeInfo(biome).types.isEmpty();
} }
/**
* Automatically adds appropriate types to a given biome based on certain heuristics.
* If a biome's types are requested and no types have been added to the biome so far, the biome's types
* will be determined and added using this method.
*
* /
public static void makeBestGuess(Biome biome)
{
Type type = Type.fromVanilla(biome.getCategory());
if (type != null)
{
BiomeDictionary.addTypes(biome, type);
}
if (biome.getDownfall() > 0.85f)
{
BiomeDictionary.addTypes(biome, WET);
}
if (biome.getDownfall() < 0.15f)
{
BiomeDictionary.addTypes(biome, DRY);
}
if (biome.getDefaultTemperature() > 0.85f)
{
BiomeDictionary.addTypes(biome, HOT);
}
if (biome.getDefaultTemperature() < 0.15f)
{
BiomeDictionary.addTypes(biome, COLD);
}
if (biome.isHighHumidity() && biome.getDepth() < 0.0F && (biome.getScale() <= 0.3F && biome.getScale() >= 0.0F))
{
BiomeDictionary.addTypes(biome, SWAMP);
}
if (biome.getDepth() <= -0.5F)
{
if (biome.getScale() == 0.0F)
{
BiomeDictionary.addTypes(biome, RIVER);
}
else
{
BiomeDictionary.addTypes(biome, OCEAN);
}
}
if (biome.getScale() >= 0.4F && biome.getScale() < 1.5F)
{
BiomeDictionary.addTypes(biome, HILLS);
}
if (biome.getScale() >= 1.5F)
{
BiomeDictionary.addTypes(biome, MOUNTAIN);
}
}
//Internal implementation //Internal implementation
private static BiomeInfo getBiomeInfo(Biome biome) private static BiomeInfo getBiomeInfo(RegistryKey<Biome> biome)
{ {
return biomeInfoMap.computeIfAbsent(biome.getRegistryName(), k -> new BiomeInfo()); return biomeInfoMap.computeIfAbsent(biome, k -> new BiomeInfo());
}
/**
* Ensure that at least one type has been added to the given biome.
* /
static void ensureHasTypes(Biome biome)
{
if (!hasAnyType(biome))
{
makeBestGuess(biome);
LOGGER.warn("No types have been added to Biome {}, types have been assigned on a best-effort guess: {}", biome.getRegistryName(), !getBiomeInfo(biome).types.isEmpty() ? getBiomeInfo(biome).types : "could not guess types");
}
} }
private static Collection<Type> listSupertypes(Type... types) private static Collection<Type> listSupertypes(Type... types)
@ -443,14 +358,43 @@ public class BiomeDictionary
addTypes(Biomes.ERODED_BADLANDS, HOT, DRY, SPARSE, MOUNTAIN, RARE, OVERWORLD); addTypes(Biomes.ERODED_BADLANDS, HOT, DRY, SPARSE, MOUNTAIN, RARE, OVERWORLD);
addTypes(Biomes.MODIFIED_WOODED_BADLANDS_PLATEAU, HOT, DRY, SPARSE, HILLS, RARE, OVERWORLD, PLATEAU, MODIFIED); addTypes(Biomes.MODIFIED_WOODED_BADLANDS_PLATEAU, HOT, DRY, SPARSE, HILLS, RARE, OVERWORLD, PLATEAU, MODIFIED);
addTypes(Biomes.MODIFIED_BADLANDS_PLATEAU, HOT, DRY, SPARSE, MOUNTAIN, RARE, OVERWORLD, PLATEAU, MODIFIED); addTypes(Biomes.MODIFIED_BADLANDS_PLATEAU, HOT, DRY, SPARSE, MOUNTAIN, RARE, OVERWORLD, PLATEAU, MODIFIED);
addTypes(Biomes.BAMBOO_JUNGLE, HOT, WET, RARE, JUNGLE, OVERWORLD);
addTypes(Biomes.BAMBOO_JUNGLE_HILLS, HOT, WET, RARE, JUNGLE, HILLS, OVERWORLD);
addTypes(Biomes.field_235252_ay_, HOT, DRY, NETHER);
addTypes(Biomes.field_235253_az_, HOT, DRY, NETHER, FOREST);
addTypes(Biomes.field_235250_aA_, HOT, DRY, NETHER, FOREST);
addTypes(Biomes.field_235251_aB_, HOT, DRY, NETHER);
if (DEBUG) if (DEBUG)
{ {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
buf.append("BiomeDictionary:\n"); buf.append("BiomeDictionary:\n");
Type.byName.forEach((name, type) -> buf.append(" ").append(type.name).append(": ").append(type.biomes.stream().map(b -> b.getRegistryName().toString()).collect(Collectors.joining(", "))).append('\n')); Type.byName.forEach((name, type) ->
buf.append(" ").append(type.name).append(": ")
.append(type.biomes.stream()
.map(RegistryKey::func_240901_a_)
.sorted((a,b) -> a.compareNamespaced(b))
.map(Object::toString)
.collect(Collectors.joining(", "))
)
.append('\n')
);
boolean missing = false;
List<RegistryKey<Biome>> all = StreamSupport.stream(ForgeRegistries.BIOMES.spliterator(), false)
.map(b -> RegistryKey.func_240903_a_(Registry.field_239720_u_, b.getRegistryName()))
.sorted().collect(Collectors.toList());
for (RegistryKey<Biome> key : all) {
if (!biomeInfoMap.containsKey(key)) {
if (!missing) {
buf.append("Missing:\n");
missing = true;
}
buf.append(" ").append(key.func_240901_a_()).append('\n');
}
}
LOGGER.debug(buf.toString()); LOGGER.debug(buf.toString());
} }
} }
} }
*/

1
src/main/java/net/minecraftforge/common/ForgeMod.java
View file

@ -127,6 +127,7 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
MinecraftForge.EVENT_BUS.addListener(VillagerTradingManager::loadTrades); MinecraftForge.EVENT_BUS.addListener(VillagerTradingManager::loadTrades);
MinecraftForge.EVENT_BUS.register(MinecraftForge.INTERNAL_HANDLER); MinecraftForge.EVENT_BUS.register(MinecraftForge.INTERNAL_HANDLER);
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
BiomeDictionary.init();
} }
public void preInit(FMLCommonSetupEvent evt) public void preInit(FMLCommonSetupEvent evt)