Added NMSAddon override for BukkitAddon

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitAddon.java

@@ -4,18 +4,15 @@ import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.version.Version;
 
 import com.dfsek.terra.api.addon.BaseAddon;
-import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.bukkit.config.PreLoadCompatibilityOptions;
-import com.dfsek.terra.bukkit.config.VanillaBiomeProperties;
 
 
 public class BukkitAddon implements BaseAddon {
     private static final Version VERSION = Versions.getVersion(1, 0, 0);
 
-    private final PlatformImpl terraBukkitPlugin;
+    protected final PlatformImpl terraBukkitPlugin;
 
     public BukkitAddon(PlatformImpl terraBukkitPlugin) {
         this.terraBukkitPlugin = terraBukkitPlugin;
@@ -28,16 +25,6 @@ public class BukkitAddon implements BaseAddon {
             .register(this, ConfigPackPreLoadEvent.class)
             .then(event -> event.getPack().getContext().put(event.loadTemplate(new PreLoadCompatibilityOptions())))
             .global();
-
-        terraBukkitPlugin.getEventManager()
-            .getHandler(FunctionalEventHandler.class)
-            .register(this, ConfigurationLoadEvent.class)
-            .then(event -> {
-                if(event.is(Biome.class)) {
-                    event.getLoadedObject(Biome.class).getContext().put(event.load(new VanillaBiomeProperties()));
-                }
-            })
-            .global();
     }
 
     @Override

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java

@@ -20,6 +20,9 @@ package com.dfsek.terra.bukkit;
 import com.dfsek.tectonic.api.TypeRegistry;
 import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
+
+import com.dfsek.terra.bukkit.nms.Initializer;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.EntityType;
 import org.jetbrains.annotations.NotNull;
@@ -96,7 +99,7 @@ public class PlatformImpl extends AbstractPlatform {
 
     @Override
     protected Iterable<BaseAddon> platformAddon() {
-        return List.of(new BukkitAddon(this));
+        return List.of(Initializer.nmsAddon(this));
     }
 
     @Override

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/config/VanillaBiomeProperties.java

@@ -1,58 +0,0 @@
-package com.dfsek.terra.bukkit.config;
-
-import com.dfsek.tectonic.api.config.template.ConfigTemplate;
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.api.properties.Properties;
-
-
-public class VanillaBiomeProperties implements ConfigTemplate, Properties {
-    @Value("colors.grass")
-    @Default
-    private Integer grassColor = null;
-
-    @Value("colors.fog")
-    @Default
-    private Integer fogColor = null;
-
-    @Value("colors.water")
-    @Default
-    private Integer waterColor = null;
-
-    @Value("colors.water-fog")
-    @Default
-    private Integer waterFogColor = null;
-
-    @Value("colors.foliage")
-    @Default
-    private Integer foliageColor = null;
-
-    @Value("colors.sky")
-    @Default
-    private Integer skyColor = null;
-
-    public Integer getFogColor() {
-        return fogColor;
-    }
-
-    public Integer getFoliageColor() {
-        return foliageColor;
-    }
-
-    public Integer getGrassColor() {
-        return grassColor;
-    }
-
-    public Integer getWaterColor() {
-        return waterColor;
-    }
-
-    public Integer getWaterFogColor() {
-        return waterFogColor;
-    }
-
-    public Integer getSkyColor() {
-        return skyColor;
-    }
-}

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java

@@ -1,5 +1,7 @@
 package com.dfsek.terra.bukkit.nms;
 
+import com.dfsek.terra.bukkit.BukkitAddon;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -13,20 +15,11 @@ public interface Initializer {
 
     static boolean init(PlatformImpl platform) {
         Logger logger = LoggerFactory.getLogger(Initializer.class);
-        try {
-            String packageVersion = NMS;
-            if(NMS.equals("v1_21_1")) {
-                packageVersion = "v1_21";
-            }
 
-            Class<?> initializerClass = Class.forName(TERRA_PACKAGE + "." + packageVersion + ".NMSInitializer");
-            try {
-                Initializer initializer = (Initializer) initializerClass.getConstructor().newInstance();
-                initializer.initialize(platform);
-            } catch(ReflectiveOperationException e) {
-                throw new RuntimeException("Error initializing NMS bindings. Report this to Terra.", e);
-            }
-        } catch(ClassNotFoundException e) {
+        Initializer initializer = constructInitializer();
+        if(initializer != null) {
+            initializer.initialize(platform);
+        } else {
             logger.error("NMS bindings for version {} do not exist. Support for this version is limited.", NMS);
             logger.error("This is usually due to running Terra on an unsupported Minecraft version.");
             String bypassKey = "IKnowThereAreNoNMSBindingsFor" + NMS + "ButIWillProceedAnyway";
@@ -49,8 +42,34 @@ public interface Initializer {
                 logger.error("Since you enabled the \"{}\" flag, we won't disable Terra. But be warned.", bypassKey);
             }
         }
+
         return true;
     }
 
+    static BukkitAddon nmsAddon(PlatformImpl platform) {
+        Initializer initializer = constructInitializer();
+        return initializer != null ? initializer.getNMSAddon(platform) : new BukkitAddon(platform);
+    }
+
+    private static Initializer constructInitializer() {
+        try {
+            String packageVersion = NMS;
+            if(NMS.equals("v1_21_3")) {
+                packageVersion = "v1_21"; // TODO: Refactor nms package to v1_21_3
+            }
+
+            Class<?> initializerClass = Class.forName(TERRA_PACKAGE + "." + packageVersion + ".NMSInitializer");
+            try {
+                return (Initializer) initializerClass.getConstructor().newInstance();
+            } catch(ReflectiveOperationException e) {
+                throw new RuntimeException("Error initializing NMS bindings. Report this to Terra.", e);
+            }
+        } catch(ClassNotFoundException e) {
+            return null;
+        }
+    }
+
     void initialize(PlatformImpl plugin);
+
+    BukkitAddon getNMSAddon(PlatformImpl plugin);
 }

platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/NMSAddon.java

@@ -0,0 +1,31 @@
+package com.dfsek.terra.bukkit.nms.v1_21;
+
+import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
+import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
+import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.bukkit.BukkitAddon;
+import com.dfsek.terra.bukkit.PlatformImpl;
+import com.dfsek.terra.bukkit.nms.v1_21.config.VanillaBiomeProperties;
+
+
+public class NMSAddon extends BukkitAddon {
+
+    public NMSAddon(PlatformImpl platform) {
+        super(platform);
+    }
+
+    @Override
+    public void initialize() {
+        super.initialize();
+
+        terraBukkitPlugin.getEventManager()
+            .getHandler(FunctionalEventHandler.class)
+            .register(this, ConfigurationLoadEvent.class)
+            .then(event -> {
+                if(event.is(Biome.class)) {
+                    event.getLoadedObject(Biome.class).getContext().put(event.load(new VanillaBiomeProperties()));
+                }
+            })
+            .global();
+    }
+}

platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/NMSBiomeInjector.java

@@ -11,7 +11,7 @@ import java.util.Objects;
 import java.util.Optional;
 
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.bukkit.config.VanillaBiomeProperties;
+import com.dfsek.terra.bukkit.nms.v1_21.config.VanillaBiomeProperties;
 
 
 public class NMSBiomeInjector {
@@ -26,49 +26,62 @@ public class NMSBiomeInjector {
     throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
         Biome.BiomeBuilder builder = new Biome.BiomeBuilder();
 
-        builder
-            .downfall(vanilla.climateSettings.downfall())
-            .temperature(vanilla.getBaseTemperature())
-            .mobSpawnSettings(vanilla.getMobSettings())
-            .generationSettings(vanilla.getGenerationSettings());
-
-
         BiomeSpecialEffects.Builder effects = new BiomeSpecialEffects.Builder();
 
-        effects.grassColorModifier(vanilla.getSpecialEffects().getGrassColorModifier());
-
         VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
 
         effects.fogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getFogColor(), vanilla.getFogColor()))
-
             .waterColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterColor(), vanilla.getWaterColor()))
-
             .waterFogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterFogColor(), vanilla.getWaterFogColor()))
+            .skyColor(Objects.requireNonNullElse(vanillaBiomeProperties.getSkyColor(), vanilla.getSkyColor()))
+            .grassColorModifier(Objects.requireNonNullElse(vanillaBiomeProperties.getGrassColorModifier(), vanilla.getSpecialEffects().getGrassColorModifier()))
+            .grassColorOverride(Objects.requireNonNullElse(vanillaBiomeProperties.getGrassColor(), vanilla.getSpecialEffects().getGrassColorOverride().orElseGet(() -> Reflection.BIOME.invokeGrassColorFromTexture(vanilla))))
+            .foliageColorOverride(Objects.requireNonNullElse(vanillaBiomeProperties.getFoliageColor(), vanilla.getFoliageColor()));
 
-            .skyColor(Objects.requireNonNullElse(vanillaBiomeProperties.getSkyColor(), vanilla.getSkyColor()));
-
-        if(vanillaBiomeProperties.getFoliageColor() == null) {
-            vanilla.getSpecialEffects().getFoliageColorOverride().ifPresent(effects::foliageColorOverride);
+        if(vanillaBiomeProperties.getParticleConfig() == null) {
+            vanilla.getSpecialEffects().getAmbientParticleSettings().ifPresent(effects::ambientParticle);
         } else {
-            effects.foliageColorOverride(vanillaBiomeProperties.getFoliageColor());
+            effects.ambientParticle(vanillaBiomeProperties.getParticleConfig());
         }
 
-        if(vanillaBiomeProperties.getGrassColor() == null) {
-            vanilla.getSpecialEffects().getGrassColorOverride().ifPresent(effects::grassColorOverride);
+        if(vanillaBiomeProperties.getLoopSound() == null) {
+            vanilla.getSpecialEffects().getAmbientLoopSoundEvent().ifPresent(effects::ambientLoopSound);
         } else {
-            // grass
-            effects.grassColorOverride(vanillaBiomeProperties.getGrassColor());
+            RegistryFetcher.soundEventRegistry().get(vanillaBiomeProperties.getLoopSound().location()).ifPresent(effects::ambientLoopSound);
         }
 
-        vanilla.getAmbientLoop().ifPresent(effects::ambientLoopSound);
-        vanilla.getAmbientAdditions().ifPresent(effects::ambientAdditionsSound);
-        vanilla.getAmbientMood().ifPresent(effects::ambientMoodSound);
-        vanilla.getBackgroundMusic().ifPresent(effects::backgroundMusic);
-        vanilla.getAmbientParticle().ifPresent(effects::ambientParticle);
+        if(vanillaBiomeProperties.getMoodSound() == null) {
+            vanilla.getSpecialEffects().getAmbientMoodSettings().ifPresent(effects::ambientMoodSound);
+        } else {
+            effects.ambientMoodSound(vanillaBiomeProperties.getMoodSound());
+        }
 
-        builder.specialEffects(effects.build());
+        if(vanillaBiomeProperties.getAdditionsSound() == null) {
+            vanilla.getSpecialEffects().getAmbientAdditionsSettings().ifPresent(effects::ambientAdditionsSound);
+        } else {
+            effects.ambientAdditionsSound(vanillaBiomeProperties.getAdditionsSound());
+        }
 
-        return builder.build();
+        if(vanillaBiomeProperties.getMusic() == null) {
+            vanilla.getSpecialEffects().getBackgroundMusic().ifPresent(effects::backgroundMusic);
+        } else {
+            effects.backgroundMusic(vanillaBiomeProperties.getMusic());
+        }
+
+        builder.hasPrecipitation(Objects.requireNonNullElse(vanillaBiomeProperties.getPrecipitation(), vanilla.hasPrecipitation()));
+
+        builder.temperature(Objects.requireNonNullElse(vanillaBiomeProperties.getTemperature(), vanilla.getBaseTemperature()));
+
+        builder.downfall(Objects.requireNonNullElse(vanillaBiomeProperties.getDownfall(), vanilla.climateSettings.downfall()));
+
+        builder.temperatureAdjustment(Objects.requireNonNullElse(vanillaBiomeProperties.getTemperatureModifier(), vanilla.climateSettings.temperatureModifier()));
+
+        builder.mobSpawnSettings(Objects.requireNonNullElse(vanillaBiomeProperties.getSpawnSettings(), vanilla.getMobSettings()));
+
+        return builder
+            .specialEffects(effects.build())
+            .generationSettings(vanilla.getGenerationSettings())
+            .build();
     }
 
     public static String createBiomeID(ConfigPack pack, com.dfsek.terra.api.registry.key.RegistryKey biomeID) {

platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/NMSInitializer.java

@@ -1,5 +1,7 @@
 package com.dfsek.terra.bukkit.nms.v1_21;
 
+import com.dfsek.terra.bukkit.BukkitAddon;
+
 import org.bukkit.Bukkit;
 
 import com.dfsek.terra.bukkit.PlatformImpl;
@@ -12,4 +14,9 @@ public class NMSInitializer implements Initializer {
         AwfulBukkitHacks.registerBiomes(platform.getRawConfigRegistry());
         Bukkit.getPluginManager().registerEvents(new NMSInjectListener(), platform.getPlugin());
     }
+
+    @Override
+    public BukkitAddon getNMSAddon(PlatformImpl plugin) {
+        return new NMSAddon(plugin);
+    }
 }

platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/Reflection.java

@@ -7,6 +7,7 @@ import net.minecraft.core.MappedRegistry;
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.StructureManager;
+import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.status.WorldGenContext;
 import xyz.jpenilla.reflectionremapper.ReflectionRemapper;
 import xyz.jpenilla.reflectionremapper.proxy.ReflectionProxyFactory;
@@ -24,8 +25,10 @@ public class Reflection {
 
     public static final ReferenceProxy REFERENCE;
 
+
     public static final ChunkMapProxy CHUNKMAP;
     public static final HolderSetProxy HOLDER_SET;
+    public static final BiomeProxy BIOME;
 
     static {
         ReflectionRemapper reflectionRemapper = ReflectionRemapper.forReobfMappingsInPaperJar();
@@ -37,6 +40,7 @@ public class Reflection {
         REFERENCE = reflectionProxyFactory.reflectionProxy(ReferenceProxy.class);
         CHUNKMAP = reflectionProxyFactory.reflectionProxy(ChunkMapProxy.class);
         HOLDER_SET = reflectionProxyFactory.reflectionProxy(HolderSetProxy.class);
+        BIOME = reflectionProxyFactory.reflectionProxy(BiomeProxy.class);
     }
 
 
@@ -74,4 +78,10 @@ public class Reflection {
         @MethodName("contents")
         <T> List<Holder<T>> invokeContents(HolderSet<T> instance);
     }
+
+    @Proxies(Biome.class)
+    public interface BiomeProxy {
+        @MethodName("getGrassColorFromTexture")
+        int invokeGrassColorFromTexture(Biome instance);
+    }
 }

platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/RegistryFetcher.java

@@ -4,6 +4,7 @@ import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.dedicated.DedicatedServer;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.biome.Biome;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.CraftServer;
@@ -23,4 +24,8 @@ public class RegistryFetcher {
     public static Registry<Biome> biomeRegistry() {
         return getRegistry(Registries.BIOME);
     }
+
+    public static Registry<SoundEvent> soundEventRegistry() {
+        return getRegistry(Registries.SOUND_EVENT);
+    }
 }

platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/config/VanillaBiomeProperties.java

@@ -0,0 +1,164 @@
+package com.dfsek.terra.bukkit.nms.v1_21.config;
+
+import com.dfsek.tectonic.api.config.template.ConfigTemplate;
+import com.dfsek.tectonic.api.config.template.annotations.Default;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+
+import com.dfsek.terra.api.properties.Properties;
+
+import net.minecraft.sounds.Music;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.entity.npc.VillagerType;
+import net.minecraft.world.level.biome.AmbientAdditionsSettings;
+import net.minecraft.world.level.biome.AmbientMoodSettings;
+import net.minecraft.world.level.biome.AmbientParticleSettings;
+import net.minecraft.world.level.biome.Biome.TemperatureModifier;
+import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier;
+import net.minecraft.world.level.biome.MobSpawnSettings;
+
+
+public class VanillaBiomeProperties implements ConfigTemplate, Properties {
+    @Value("colors.grass")
+    @Default
+    private Integer grassColor = null;
+
+    @Value("colors.fog")
+    @Default
+    private Integer fogColor = null;
+
+    @Value("colors.water")
+    @Default
+    private Integer waterColor = null;
+
+    @Value("colors.water-fog")
+    @Default
+    private Integer waterFogColor = null;
+
+    @Value("colors.foliage")
+    @Default
+    private Integer foliageColor = null;
+
+    @Value("colors.sky")
+    @Default
+    private Integer skyColor = null;
+
+    @Value("colors.modifier")
+    @Default
+    private GrassColorModifier grassColorModifier = null;
+
+    @Value("particles")
+    @Default
+    private AmbientParticleSettings particleConfig = null;
+
+    @Value("climate.precipitation")
+    @Default
+    private Boolean precipitation = true;
+
+    @Value("climate.temperature")
+    @Default
+    private Float temperature = null;
+
+    @Value("climate.temperature-modifier")
+    @Default
+    private TemperatureModifier temperatureModifier = null;
+
+    @Value("climate.downfall")
+    @Default
+    private Float downfall = null;
+
+    @Value("sound.loop-sound.sound")
+    @Default
+    private SoundEvent loopSound = null;
+
+    @Value("sound.mood-sound")
+    @Default
+    private AmbientMoodSettings moodSound = null;
+
+    @Value("sound.additions-sound")
+    @Default
+    private AmbientAdditionsSettings additionsSound = null;
+
+    @Value("sound.music")
+    @Default
+    private Music music = null;
+
+    @Value("spawning")
+    @Default
+    private MobSpawnSettings spawnSettings = null;
+
+    @Value("villager-type")
+    @Default
+    private VillagerType villagerType = null;
+
+    public Integer getFogColor() {
+        return fogColor;
+    }
+
+    public Integer getFoliageColor() {
+        return foliageColor;
+    }
+
+    public Integer getGrassColor() {
+        return grassColor;
+    }
+
+    public Integer getWaterColor() {
+        return waterColor;
+    }
+
+    public Integer getWaterFogColor() {
+        return waterFogColor;
+    }
+
+    public Integer getSkyColor() {
+        return skyColor;
+    }
+
+    public GrassColorModifier getGrassColorModifier() {
+        return grassColorModifier;
+    }
+
+    public AmbientParticleSettings getParticleConfig() {
+        return particleConfig;
+    }
+
+    public Boolean getPrecipitation() {
+        return precipitation;
+    }
+
+    public Float getTemperature() {
+        return temperature;
+    }
+
+    public TemperatureModifier getTemperatureModifier() {
+        return temperatureModifier;
+    }
+
+    public Float getDownfall() {
+        return downfall;
+    }
+
+    public SoundEvent getLoopSound() {
+        return loopSound;
+    }
+
+    public AmbientMoodSettings getMoodSound() {
+        return moodSound;
+    }
+
+    public AmbientAdditionsSettings getAdditionsSound() {
+        return additionsSound;
+    }
+
+    public Music getMusic() {
+        return music;
+    }
+
+    public MobSpawnSettings getSpawnSettings() {
+        return spawnSettings;
+    }
+
+    public VillagerType getVillagerType() {
+        return villagerType;
+    }
+}

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java

@@ -107,9 +107,9 @@ public final class MinecraftUtil {
             .waterFogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterFogColor(), vanilla.getWaterFogColor()))
             .fogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getFogColor(), vanilla.getFogColor()))
             .skyColor(Objects.requireNonNullElse(vanillaBiomeProperties.getSkyColor(), vanilla.getSkyColor()))
-            .grassColorModifier(
-                Objects.requireNonNullElse(vanillaBiomeProperties.getGrassColorModifier(),
-                    vanilla.getEffects().getGrassColorModifier()));
+            .grassColorModifier(Objects.requireNonNullElse(vanillaBiomeProperties.getGrassColorModifier(), vanilla.getEffects().getGrassColorModifier()))
+            .grassColor(Objects.requireNonNullElse(vanillaBiomeProperties.getGrassColor(), vanilla.getEffects().getGrassColor().orElseGet(vanilla.getDefaultGrassColor())))
+            .foliageColor(Objects.requireNonNullElse(vanillaBiomeProperties.getFoliageColor(), vanilla.getFoliageColor()));
 
         if(vanillaBiomeProperties.getFoliageColor() == null) {
             vanilla.getEffects().getFoliageColor().ifPresent(effects::foliageColor);