Simplified impl. of high_humidity biome condition type

apace100 · Oct 2, 2024 · 5833724 · 5833724
1 parent 8e07f54
commit 5833724
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 59 deletions.
diff --git a/src/main/java/io/github/apace100/apoli/access/BiomeWeatherAccess.java b/src/main/java/io/github/apace100/apoli/access/BiomeWeatherAccess.java
diff --git a/src/main/java/io/github/apace100/apoli/condition/type/BiomeConditionTypes.java b/src/main/java/io/github/apace100/apoli/condition/type/BiomeConditionTypes.java
@@ -1,7 +1,6 @@
 package io.github.apace100.apoli.condition.type;
 
 import io.github.apace100.apoli.Apoli;
-import io.github.apace100.apoli.access.BiomeWeatherAccess;
 import io.github.apace100.apoli.condition.factory.ConditionTypeFactory;
 import io.github.apace100.apoli.condition.type.biome.InTagConditionType;
 import io.github.apace100.apoli.condition.type.biome.PrecipitationConditionType;
@@ -25,7 +24,7 @@ public class BiomeConditionTypes {
 
     public static void register() {
         MetaConditionTypes.register(ApoliDataTypes.BIOME_CONDITION, BiomeConditionTypes::register);
-        register(createSimpleFactory(Apoli.identifier("high_humidity"), biomeEntry -> ((BiomeWeatherAccess) (Object) biomeEntry.value()).apoli$getDownfall() > 0.85F));
+        register(createSimpleFactory(Apoli.identifier("high_humidity"), biomeEntry -> biomeEntry.value().weather.downfall() > 0.85F));
         register(TemperatureConditionType.getFactory());
         register(PrecipitationConditionType.getFactory());
         register(InTagConditionType.getFactory());

diff --git a/src/main/java/io/github/apace100/apoli/mixin/BiomeBuilderMixin.java b/src/main/java/io/github/apace100/apoli/mixin/BiomeBuilderMixin.java
diff --git a/src/main/java/io/github/apace100/apoli/mixin/BiomeMixin.java b/src/main/java/io/github/apace100/apoli/mixin/BiomeMixin.java
diff --git a/src/main/resources/apoli.accesswidener b/src/main/resources/apoli.accesswidener
@@ -27,3 +27,5 @@ accessible class net/minecraft/registry/tag/TagGroupLoader$TagDependencies
 extendable method net/minecraft/text/TranslatableTextContent updateTranslations ()V
 accessible field net/minecraft/text/TranslatableTextContent languageCache Lnet/minecraft/util/Language;
 accessible field net/minecraft/text/TranslatableTextContent translations Ljava/util/List;
+accessible field net/minecraft/world/biome/Biome weather Lnet/minecraft/world/biome/Biome$Weather;
+accessible class net/minecraft/world/biome/Biome$Weather
diff --git a/src/main/resources/apoli.mixins.json b/src/main/resources/apoli.mixins.json
@@ -12,8 +12,6 @@
 		"ArmorSlotMixin",
 		"ArmorStandEntityMixin",
 		"AttributeContainerMixin",
-		"BiomeBuilderMixin",
-		"BiomeMixin",
 		"BlockCollisionSpliteratorMixin",
 		"BlockItemMixin",
 		"ComponentSubPredicateMixin",