Fix different firefly colors from merging

Turnip-Labs · Feb 25, 2024 · a475897 · a475897
1 parent c2507ff
commit a475897
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ bta_version=7.1-pre1a
 loader_version=0.14.19-babric.3-bta
 
 # Mod
-mod_version=3.4.11
+mod_version=3.4.12
 mod_group=turniplabs
 mod_name=halplibe
 
diff --git a/src/main/java/turniplabs/halplibe/mixin/mixins/EntityFireflyClusterMixin.java b/src/main/java/turniplabs/halplibe/mixin/mixins/EntityFireflyClusterMixin.java
@@ -78,14 +78,26 @@ public void spawnInit() {
                     ordinal = 0
             )
     )
-    private EnumFireflyColor halplibe$modifyColorExpression(EntityFireflyCluster instance, Operation<EnumFireflyColor> original) {
+    private EnumFireflyColor halplibe$modifyColorExpression1(EntityFireflyCluster instance, Operation<EnumFireflyColor> original) {
         if (((IFireflyColor) instance).halplibe$getColor().getId() == halplibe$getColor().getId()) {
             return null;
         } else {
             return EnumFireflyColor.GREEN;
         }
     }
 
+    @WrapOperation(
+            method = "merge()V",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/core/entity/animal/EntityFireflyCluster;getColor()Lnet/minecraft/core/enums/EnumFireflyColor;",
+                    ordinal = 1
+            )
+    )
+    private EnumFireflyColor halplibe$modifyColorExpression2(EntityFireflyCluster instance, Operation<EnumFireflyColor> original) {
+        return null;
+    }
+
     @Unique
     public void halplibe$setColor(FireflyColor color) {
         this.entityData.set(16, (byte) color.getId());