From 4f65555e82a34ab026aeed3e0cb83a4c5ef6bcba Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 2 May 2021 14:37:34 -0700 Subject: [PATCH] remove mixins until annotation processor gets fixed. --- .../src/test/java/biome/DistributionTest.java | 2 +- common/src/test/java/biome/ImageTest.java | 2 +- .../dfsek/terra/forge/TerraForgePlugin.java | 25 ++++++--------- .../forge/mixin/BiomeAmbienceAccessor.java | 31 ------------------- .../src/main/resources/terra.mixins.json | 1 - 5 files changed, 12 insertions(+), 49 deletions(-) delete mode 100644 platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/BiomeAmbienceAccessor.java diff --git a/common/src/test/java/biome/DistributionTest.java b/common/src/test/java/biome/DistributionTest.java index 227afe1df..11b3dcef8 100644 --- a/common/src/test/java/biome/DistributionTest.java +++ b/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() diff --git a/common/src/test/java/biome/ImageTest.java b/common/src/test/java/biome/ImageTest.java index ddc96dafc..04bcee35b 100644 --- a/common/src/test/java/biome/ImageTest.java +++ b/common/src/test/java/biome/ImageTest.java @@ -46,7 +46,7 @@ public class ImageTest { OpenRegistry biomeRegistry = new OpenRegistry() { }; - 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); } diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java index ea1eee4bc..8f2243b33 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java +++ b/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 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) -> { - Biome minecraftBiome = INSTANCE.createBiome(biome); - INSTANCE.logger().info("Registering biome " + minecraftBiome.getRegistryName()); - event.getRegistry().register(minecraftBiome); - })); // Register all Terra biomes. + INSTANCE.getConfigRegistry().forEach(pack -> pack.getBiomeRegistry().forEach((id, biome) -> event.getRegistry().register(INSTANCE.createBiome(biome)))); // 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())) - .waterFogColor(colors.getOrDefault("water-fog", accessor.getWaterFogColor())) - .fogColor(colors.getOrDefault("fog", accessor.getFogColor())) - .skyColor(colors.getOrDefault("sky", accessor.getSkyColor())) - .grassColorModifier(accessor.getGrassColorModifier()); + .waterColor(colors.getOrDefault("water", vanillaEffects.getWaterColor())) + .waterFogColor(colors.getOrDefault("water-fog", vanillaEffects.getWaterFogColor())) + .fogColor(colors.getOrDefault("fog", vanillaEffects.getFogColor())) + .skyColor(colors.getOrDefault("sky", vanillaEffects.getSkyColor())) + .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() diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/BiomeAmbienceAccessor.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/BiomeAmbienceAccessor.java deleted file mode 100644 index 1474a33e0..000000000 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/BiomeAmbienceAccessor.java +++ /dev/null @@ -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 getFoliageColorOverride(); - - @Accessor - Optional getGrassColorOverride(); - - @Accessor - BiomeAmbience.GrassColorModifier getGrassColorModifier(); -} diff --git a/platforms/forge/src/main/resources/terra.mixins.json b/platforms/forge/src/main/resources/terra.mixins.json index 06f3b15ec..c363067da 100644 --- a/platforms/forge/src/main/resources/terra.mixins.json +++ b/platforms/forge/src/main/resources/terra.mixins.json @@ -4,7 +4,6 @@ "compatibilityLevel": "JAVA_8", "refmap": "terra.refmap.json", "mixins": [ - "BiomeAmbienceAccessor" ], "client": [ ],