add more vanilla biome properties

platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java

@@ -19,26 +19,18 @@ package com.dfsek.terra.fabric;
 
 import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.version.Version;
-import com.dfsek.tectonic.api.exception.ConfigException;
 
 import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
-import com.dfsek.terra.api.registry.key.RegistryKey;
 
-import com.dfsek.terra.fabric.config.BiomeColors;
+import com.dfsek.terra.fabric.config.VanillaBiomeProperties;
 
-import net.minecraft.util.registry.Registry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.dfsek.terra.api.addon.BaseAddon;
-import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.util.generic.pair.Pair.Mutable;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.fabric.config.PostLoadCompatibilityOptions;
 import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
@@ -89,7 +81,7 @@ public final class FabricAddon implements BaseAddon {
                          .register(this, ConfigurationLoadEvent.class)
                          .then(event -> {
                              if(event.is(Biome.class)) {
-                                event.getLoadedObject(Biome.class).getContext().put(event.load(new BiomeColors()));
+                                event.getLoadedObject(Biome.class).getContext().put(event.load(new VanillaBiomeProperties()));
                              }
                          })
                          .global();

platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java

@@ -30,6 +30,9 @@ import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.BuiltinRegistries;
+import net.minecraft.world.biome.Biome.Category;
+import net.minecraft.world.biome.Biome.Precipitation;
+import net.minecraft.world.biome.BiomeEffects.GrassColorModifier;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -163,7 +166,10 @@ public class PlatformImpl extends AbstractPlatform {
                     if(identifier == null)
                         throw new LoadException("Invalid identifier: " + o, depthTracker);
                     return identifier;
-                });
+                })
+                .registerLoader(Precipitation.class, (type, o, loader, depthTracker) -> Precipitation.byName((String) o))
+                .registerLoader(Category.class, (type, o, loader, depthTracker) -> Category.byName((String) o))
+                .registerLoader(GrassColorModifier.class, (type, o, loader, depthTracker) -> GrassColorModifier.byName((String) o));
     }
     
     

platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/VanillaBiomeProperties.java

@@ -6,8 +6,12 @@ import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.properties.Properties;
 
+import net.minecraft.world.biome.Biome.Category;
+import net.minecraft.world.biome.Biome.Precipitation;
+import net.minecraft.world.biome.BiomeEffects.GrassColorModifier;
 
-public class BiomeColors implements ConfigTemplate, Properties {
+
+public class VanillaBiomeProperties implements ConfigTemplate, Properties {
     @Value("colors.grass")
     @Default
     private Integer grassColor = null;
@@ -32,6 +36,18 @@ public class BiomeColors implements ConfigTemplate, Properties {
     @Default
     private Integer skyColor = null;
     
+    @Value("colors.modifier")
+    @Default
+    private GrassColorModifier modifier = GrassColorModifier.NONE;
+    
+    @Value("climate.precipitation")
+    @Default
+    private Precipitation precipitation = null;
+    
+    @Value("climate.category")
+    @Default
+    private Category category = null;
+    
     public Integer getFogColor() {
         return fogColor;
     }
@@ -55,4 +71,16 @@ public class BiomeColors implements ConfigTemplate, Properties {
     public Integer getSkyColor() {
         return skyColor;
     }
+    
+    public Category getCategory() {
+        return category;
+    }
+    
+    public Precipitation getPrecipitation() {
+        return precipitation;
+    }
+    
+    public GrassColorModifier getModifier() {
+        return modifier;
+    }
 }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java

@@ -17,42 +17,30 @@
 
 package com.dfsek.terra.fabric.util;
 
-import com.dfsek.terra.fabric.config.BiomeColors;
-
-import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
-
-import com.mojang.serialization.Lifecycle;
-import net.minecraft.block.entity.LootableContainerBlockEntity;
-import net.minecraft.block.entity.MobSpawnerBlockEntity;
-import net.minecraft.block.entity.SignBlockEntity;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.registry.DynamicRegistryManager;
-import net.minecraft.util.registry.MutableRegistry;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.util.registry.RegistryKey;
-import net.minecraft.world.WorldAccess;
-import net.minecraft.world.biome.BiomeEffects;
-import net.minecraft.world.biome.GenerationSettings;
-import net.minecraft.world.gen.GenerationStep;
-import net.minecraft.world.gen.carver.ConfiguredCarver;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.OptionalInt;
-import java.util.function.Supplier;
-
 import com.dfsek.terra.api.block.entity.BlockEntity;
 import com.dfsek.terra.api.block.entity.Container;
 import com.dfsek.terra.api.block.entity.MobSpawner;
 import com.dfsek.terra.api.block.entity.Sign;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
+import com.dfsek.terra.fabric.config.VanillaBiomeProperties;
 import com.dfsek.terra.fabric.mixin.access.BiomeEffectsAccessor;
 
+import net.minecraft.block.entity.LootableContainerBlockEntity;
+import net.minecraft.block.entity.MobSpawnerBlockEntity;
+import net.minecraft.block.entity.SignBlockEntity;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.registry.DynamicRegistryManager;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.RegistryKey;
+import net.minecraft.world.WorldAccess;
+import net.minecraft.world.biome.BiomeEffects;
+import net.minecraft.world.biome.GenerationSettings;
+
+import java.util.*;
+
 
 public final class FabricUtil {
     
@@ -74,15 +62,15 @@ public final class FabricUtil {
                                      com.dfsek.terra.api.registry.key.RegistryKey id) {
         Registry<net.minecraft.world.biome.Biome> biomeRegistry = registryManager.get(Registry.BIOME_KEY);
         net.minecraft.world.biome.Biome vanilla = ((ProtoPlatformBiome) biome.getPlatformBiome()).get(biomeRegistry);
-    
+        
-    
+        
         if(pack.getContext().get(PreLoadCompatibilityOptions.class).useVanillaBiomes()) {
             ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(vanilla);
         } else {
             net.minecraft.world.biome.Biome minecraftBiome = createBiome(biome, vanilla);
-    
+            
             Identifier identifier = new Identifier("terra", FabricUtil.createBiomeID(pack, id));
-    
+            
             if(biomeRegistry.containsId(identifier)) {
                 ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(biomeRegistry.get(identifier));
             } else {
@@ -96,50 +84,32 @@ public final class FabricUtil {
     
     public static net.minecraft.world.biome.Biome createBiome(Biome biome, net.minecraft.world.biome.Biome vanilla) {
         GenerationSettings.Builder generationSettings = new GenerationSettings.Builder();
-    
+        
         BiomeEffectsAccessor accessor = (BiomeEffectsAccessor) vanilla.getEffects();
-        BiomeEffects.Builder effects = new BiomeEffects.Builder()
+        BiomeEffects.Builder effects = new BiomeEffects.Builder();
-                .grassColorModifier(accessor.getGrassColorModifier());
-    
-        if(biome.getContext().has(BiomeColors.class)) {
-            BiomeColors biomeColors = biome.getContext().get(BiomeColors.class);
         
-            if(biomeColors.getWaterColor() == null) {
+        VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
-                effects.waterColor(vanilla.getWaterColor());
-            } else {
-                effects.waterColor(biomeColors.getWaterColor());
-            }
         
-            if(biomeColors.getWaterFogColor() == null) {
+        if(biome.getContext().has(VanillaBiomeProperties.class)) {
-                effects.waterFogColor(vanilla.getWaterFogColor());
+            effects.waterColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterColor(), vanilla.getWaterColor()))
-            } else {
+                   .waterFogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterFogColor(), vanilla.getWaterFogColor()))
-                effects.waterFogColor(biomeColors.getWaterFogColor());
+                   .waterFogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getFogColor(), vanilla.getFogColor()))
-            }
+                   .skyColor(Objects.requireNonNullElse(vanillaBiomeProperties.getSkyColor(), vanilla.getSkyColor()))
-        
+                   .grassColorModifier(Objects.requireNonNullElse(vanillaBiomeProperties.getModifier(), accessor.getGrassColorModifier()));
-            if(biomeColors.getFogColor() == null) {
+            
-                effects.fogColor(vanilla.getFogColor());
+            
-            } else {
+            if(vanillaBiomeProperties.getGrassColor() == null) {
-                effects.fogColor(biomeColors.getFogColor());
-            }
-        
-            if(biomeColors.getSkyColor() == null) {
-                effects.skyColor(vanilla.getSkyColor());
-            } else {
-                effects.skyColor(biomeColors.getSkyColor());
-            }
-        
-            if(biomeColors.getGrassColor() == null) {
                 accessor.getGrassColor().ifPresent(effects::grassColor);
-            } else  {
+            } else {
-                effects.grassColor(biomeColors.getGrassColor());
+                effects.grassColor(vanillaBiomeProperties.getGrassColor());
             }
-        
+            
-            if(biomeColors.getFoliageColor() == null) {
+            if(vanillaBiomeProperties.getFoliageColor() == null) {
                 accessor.getFoliageColor().ifPresent(effects::foliageColor);
             } else {
-                effects.foliageColor(biomeColors.getFoliageColor());
+                effects.foliageColor(vanillaBiomeProperties.getFoliageColor());
             }
-        
+            
         } else {
             effects.waterColor(accessor.getWaterColor())
                    .waterFogColor(accessor.getWaterFogColor())
@@ -148,10 +118,10 @@ public final class FabricUtil {
             accessor.getFoliageColor().ifPresent(effects::foliageColor);
             accessor.getGrassColor().ifPresent(effects::grassColor);
         }
-    
+        
         return new net.minecraft.world.biome.Biome.Builder()
-                .precipitation(vanilla.getPrecipitation())
+                .precipitation(Objects.requireNonNullElse(vanillaBiomeProperties.getPrecipitation(), vanilla.getPrecipitation()))
-                .category(vanilla.getCategory())
+                .category(Objects.requireNonNullElse(vanillaBiomeProperties.getCategory(), vanilla.getCategory()))
                 .temperature(vanilla.getTemperature())
                 .downfall(vanilla.getDownfall())
                 .effects(effects.build())