remove mixins until annotation processor gets fixed.

common/src/test/java/biome/DistributionTest.java

@@ -159,7 +159,7 @@ public class DistributionTest {
         new GenericLoaders(MAIN).register(loader);
 
         BiomeRegistry biomeRegistry = new BiomeRegistry();
-        folderLoader.open("biomes", ".yml").then(inputStreams -> ConfigPack.buildAll((template, main) -> template, biomeRegistry, loader.load(inputStreams, TestBiome::new), MAIN));
+        folderLoader.open("biomes", ".yml").then(inputStreams -> ConfigPack.buildAll((template, main) -> template, biomeRegistry, loader.loadConfigs(inputStreams, TestBiome::new), MAIN));
 
         BiomeProviderTemplate template = new BiomeProviderTemplate();
         ConfigLoader pipeLoader = new ConfigLoader()

common/src/test/java/biome/ImageTest.java

@@ -46,7 +46,7 @@ public class ImageTest {
 
         OpenRegistry<TerraBiome> biomeRegistry = new OpenRegistry<TerraBiome>() {
         };
-        folderLoader.open("biomes", ".yml").then(inputStreams -> ConfigPack.buildAll((template, main) -> template, biomeRegistry, loader.load(inputStreams, TestBiome::new), null));
+        folderLoader.open("biomes", ".yml").then(inputStreams -> ConfigPack.buildAll((template, main) -> template, biomeRegistry, loader.loadConfigs(inputStreams, TestBiome::new), null));
 
         return new ImageBiomeProvider(biomeRegistry.entries(), ImageIO.read(ImageTest.class.getResourceAsStream("/map.jpg")), 1, ImageBiomeProvider.Align.CENTER);
     }

platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java

@@ -37,7 +37,6 @@ import com.dfsek.terra.config.lang.Language;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.forge.inventory.ForgeItemHandle;
-import com.dfsek.terra.forge.mixin.BiomeAmbienceAccessor;
 import com.dfsek.terra.forge.world.ForgeAdapter;
 import com.dfsek.terra.forge.world.ForgeBiome;
 import com.dfsek.terra.forge.world.ForgeTree;
@@ -196,11 +195,7 @@ public class TerraForgePlugin implements TerraPlugin {
     @SubscribeEvent
     public static void register(RegistryEvent.Register<Biome> event) {
         INSTANCE.setup(); // Setup now because we need the biomes, and this event happens after blocks n stuff
-        INSTANCE.getConfigRegistry().forEach(pack -> pack.getBiomeRegistry().forEach((id, biome) -> {
+        INSTANCE.getConfigRegistry().forEach(pack -> pack.getBiomeRegistry().forEach((id, biome) -> event.getRegistry().register(INSTANCE.createBiome(biome)))); // Register all Terra biomes.
-            Biome minecraftBiome = INSTANCE.createBiome(biome);
-            INSTANCE.logger().info("Registering biome " + minecraftBiome.getRegistryName());
-            event.getRegistry().register(minecraftBiome);
-        })); // Register all Terra biomes.
     }
 
     @SubscribeEvent
@@ -224,24 +219,24 @@ public class TerraForgePlugin implements TerraPlugin {
         generationSettings.surfaceBuilder(SurfaceBuilder.DEFAULT.configured(new SurfaceBuilderConfig(Blocks.GRASS_BLOCK.defaultBlockState(), Blocks.DIRT.defaultBlockState(), Blocks.GRAVEL.defaultBlockState()))); // It needs a surfacebuilder, even though we dont use it.
         generationSettings.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, POPULATOR_CONFIGURED_FEATURE);
 
-        BiomeAmbienceAccessor accessor = ((BiomeAmbienceAccessor) vanilla.getSpecialEffects());
+        BiomeAmbience vanillaEffects =  vanilla.getSpecialEffects();
         BiomeAmbience.Builder effects = new BiomeAmbience.Builder()
-                .waterColor(colors.getOrDefault("water", accessor.getWaterColor()))
+                .waterColor(colors.getOrDefault("water", vanillaEffects.getWaterColor()))
-                .waterFogColor(colors.getOrDefault("water-fog", accessor.getWaterFogColor()))
+                .waterFogColor(colors.getOrDefault("water-fog", vanillaEffects.getWaterFogColor()))
-                .fogColor(colors.getOrDefault("fog", accessor.getFogColor()))
+                .fogColor(colors.getOrDefault("fog", vanillaEffects.getFogColor()))
-                .skyColor(colors.getOrDefault("sky", accessor.getSkyColor()))
+                .skyColor(colors.getOrDefault("sky", vanillaEffects.getSkyColor()))
-                .grassColorModifier(accessor.getGrassColorModifier());
+                .grassColorModifier(vanillaEffects.getGrassColorModifier());
 
         if(colors.containsKey("grass")) {
             effects.grassColorOverride(colors.get("grass"));
         } else {
-            accessor.getGrassColorOverride().ifPresent(effects::grassColorOverride);
+            vanillaEffects.getGrassColorOverride().ifPresent(effects::grassColorOverride);
         }
-        accessor.getFoliageColorOverride().ifPresent(effects::foliageColorOverride);
+        vanillaEffects.getFoliageColorOverride().ifPresent(effects::foliageColorOverride);
         if(colors.containsKey("foliage")) {
             effects.foliageColorOverride(colors.get("foliage"));
         } else {
-            accessor.getFoliageColorOverride().ifPresent(effects::foliageColorOverride);
+            vanillaEffects.getFoliageColorOverride().ifPresent(effects::foliageColorOverride);
         }
 
         return new Biome.Builder()

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/BiomeAmbienceAccessor.java

@@ -1,31 +0,0 @@
-package com.dfsek.terra.forge.mixin;
-
-import net.minecraft.world.biome.BiomeAmbience;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.Optional;
-
-@Mixin(BiomeAmbience.class)
-public interface BiomeAmbienceAccessor {
-    @Accessor
-    int getFogColor();
-
-    @Accessor
-    int getWaterColor();
-
-    @Accessor
-    int getWaterFogColor();
-
-    @Accessor
-    int getSkyColor();
-
-    @Accessor
-    Optional<Integer> getFoliageColorOverride();
-
-    @Accessor
-    Optional<Integer> getGrassColorOverride();
-
-    @Accessor
-    BiomeAmbience.GrassColorModifier getGrassColorModifier();
-}

platforms/forge/src/main/resources/terra.mixins.json

@@ -4,7 +4,6 @@
   "compatibilityLevel": "JAVA_8",
   "refmap": "terra.refmap.json",
   "mixins": [
-    "BiomeAmbienceAccessor"
   ],
   "client": [
   ],