refactor(next): remove CatMorningGiftChanceEvent

auioc · Sep 28, 2022 · 5a15ace · 5a15ace
1 parent 9ce7684
commit 5a15ace
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 79 deletions.
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinCatRelaxOnOwnerGoal.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinCatRelaxOnOwnerGoal.java
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventFactory.java b/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventFactory.java
@@ -9,7 +9,6 @@
 import org.apache.logging.log4j.Marker;
 import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
-import org.auioc.mcmod.arnicalib.server.event.impl.CatMorningGiftChanceEvent;
 import org.auioc.mcmod.arnicalib.server.event.impl.EyeOfEnderSurvivableEvent;
 import org.auioc.mcmod.arnicalib.server.event.impl.FishingRodCastEvent;
 import org.auioc.mcmod.arnicalib.server.event.impl.ItemHurtEvent;
@@ -26,7 +25,6 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.animal.Cat;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.projectile.EyeOfEnder;
 import net.minecraft.world.item.ItemStack;
@@ -81,12 +79,6 @@ public static PiglinStanceEvent.Stance onPiglinChooseEvent(LivingEntity target)
         return event.getStance();
     }
 
-    public static double onCatSetMorningGiftChance(Cat cat, Player ownerPlayer) {
-        var event = new CatMorningGiftChanceEvent(cat, ownerPlayer);
-        BUS.post(event);
-        return event.getChance();
-    }
-
     // Coremod arnicalib.fishing_rod_item
     public static FishingRodCastEvent.Pre preFishingRodCast(Player player, Level level, ItemStack fishingRod, int speedBonus, int luckBonus) {
         var event = new FishingRodCastEvent.Pre((ServerPlayer) player, (ServerLevel) level, fishingRod, speedBonus, luckBonus);

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/CatMorningGiftChanceEvent.java b/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/CatMorningGiftChanceEvent.java
diff --git a/src/main/resources/arnicalib.mixin.json b/src/main/resources/arnicalib.mixin.json
@@ -14,8 +14,7 @@
         "server.MixinServerPlayer",
         "server.MixinLivingEntity",
         "server.MixinEyeOfEnder",
-        "server.MixinEnderEyeItem",
-        "server.MixinCatRelaxOnOwnerGoal"
+        "server.MixinEnderEyeItem"
     ],
     "client": [],
     "server": [],