Minor tweak

Sydokiddo · Apr 5, 2024 · 15f59b6 · 15f59b6
1 parent f9a4c82
commit 15f59b6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 34 deletions.
diff --git a/src/main/java/net/sydokiddo/odyssey/mixin/entities/hostile/SlimeFloatGoalMixin.java b/src/main/java/net/sydokiddo/odyssey/mixin/entities/hostile/SlimeFloatGoalMixin.java
diff --git a/src/main/java/net/sydokiddo/odyssey/mixin/entities/hostile/SlimeMixin.java b/src/main/java/net/sydokiddo/odyssey/mixin/entities/hostile/SlimeMixin.java
@@ -14,9 +14,7 @@
 import net.sydokiddo.odyssey.Odyssey;
 import net.sydokiddo.odyssey.registry.OdysseyRegistry;
 import net.sydokiddo.odyssey.registry.misc.ModSoundEvents;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -206,7 +204,7 @@ private void doEntityConversionEvents(Mob mob) {
  @Inject(at = @At("HEAD"), method = "getJumpDelay", cancellable = true)
  private void odyssey$preventSlimeJumpingWhileConverting(CallbackInfoReturnable<Integer> cir) {
  if ((this.isSlimeConverting() || this.isMagmaConverting()) && Odyssey.getConfig().entities.hostileMobsConfig.slime_and_magma_cube_converting) {
- cir.setReturnValue(conversionTime);
+ cir.setReturnValue(this.conversionTime);
  }
  }
 
@@ -218,5 +216,22 @@ public boolean isInvulnerableTo(DamageSource damageSource) {
  return super.isInvulnerableTo(damageSource);
  }
 
+ @Mixin(targets = "net/minecraft/world/entity/monster/Slime$SlimeFloatGoal", priority = 1500)
+ public static class SlimeFloatGoalMixin {
+
+ @Mutable @Final @Shadow private final Slime slime;
+
+ private SlimeFloatGoalMixin(Slime slime) {
+ this.slime = slime;
+ }
+
+ @Inject(method = "canUse", at = @At(value = "HEAD"), cancellable = true)
+ private void odyssey$preventMagmaCubesFloatingOnWater(CallbackInfoReturnable<Boolean> cir) {
+ if (this.slime instanceof MagmaCube magmaCube && magmaCube.isInWater() && Odyssey.getConfig().entities.hostileMobsConfig.slime_and_magma_cube_converting) {
+ cir.setReturnValue(false);
+ }
+ }
+ }
+
  // endregion
 }
diff --git a/src/main/resources/odyssey.mixins.json b/src/main/resources/odyssey.mixins.json
@@ -32,8 +32,8 @@
  "blocks.plants.SugarCaneBlockMixin",
  "entities.hostile.CreeperMixin",
  "entities.hostile.GuardianMixin",
- "entities.hostile.SlimeFloatGoalMixin",
  "entities.hostile.SlimeMixin",
+ "entities.hostile.SlimeMixin$SlimeFloatGoalMixin",
  "entities.hostile.VexMixin",
  "entities.misc.EntityMixin",
  "entities.misc.ItemFrameMixin",