Merge pull request #1 from Spacexplorer11/fix-codacy-issues

Spacexplorer11 · web-flow · commit 15a68ab06759 · 2025-06-05T22:54:05.000+01:00
Fix codacy issues and also fixes a bug which didn't allow cats to unsit after being tamed using a custom item. This was because the code wouldn't fallback to vanilla functionality, however now it does, meaning if none of my custom code runs, it will fallback to vanilla now! It also fixes a bug where the cat would spam the love messages when feeding a baby.
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ loom_version=1.10-SNAPSHOT
 fabric_kotlin_version=1.13.3+kotlin.2.1.21
 
 # Mod Properties
-mod_version=1.0.1
+mod_version=1.0.2
 maven_group=singh.akaalroop.meowmeals
 archives_base_name=meowmeals
 
diff --git a/src/client/kotlin/singh/akaalroop/meowmeals/MeowMealsClient.kt b/src/client/kotlin/singh/akaalroop/meowmeals/MeowMealsClient.kt
@@ -2,6 +2,7 @@ package singh.akaalroop.meowmeals
 
 import net.fabricmc.api.ClientModInitializer
 
+// This is to set up client only logic
 object MeowMealsClient : ClientModInitializer {
     override fun onInitializeClient() {
         // This entrypoint is suitable for setting up client-specific logic, such as rendering.
diff --git a/src/client/kotlin/singh/akaalroop/meowmeals/MeowMealsDataGenerator.kt b/src/client/kotlin/singh/akaalroop/meowmeals/MeowMealsDataGenerator.kt
@@ -3,6 +3,7 @@ package singh.akaalroop.meowmeals
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator
 
+// This to generate data for the mod
 object MeowMealsDataGenerator : DataGeneratorEntrypoint {
     override fun onInitializeDataGenerator(fabricDataGenerator: FabricDataGenerator) {
     }
diff --git a/src/main/java/singh/akaalroop/meowmeals/mixin/CatEntityMixin.java b/src/main/java/singh/akaalroop/meowmeals/mixin/CatEntityMixin.java
@@ -7,27 +7,25 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.Registries;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import static net.minecraft.sound.SoundEvents.ENTITY_CAT_EAT;
+import static singh.akaalroop.meowmeals.MeowMeals.MOD_ID;
+
 
 @Mixin(CatEntity.class)
 public abstract class CatEntityMixin {
 
-    @Shadow
-    protected abstract void tryTame(PlayerEntity player);
-
     @Unique
     private void sendMeowMealsMessage(PlayerEntity player, String text, Formatting colour) {
         MutableText message = Text.literal("[MeowMeals] ")
@@ -36,6 +34,11 @@ private void sendMeowMealsMessage(PlayerEntity player, String text, Formatting c
         player.sendMessage(message, false);
     }
 
+    @Unique
+    private void sendMeowMealsBreedingMessage(PlayerEntity player) {
+        sendMeowMealsMessage(player, "Your cat is now in love mode! 🥰", Formatting.RED);
+    }
+
     @Inject(method = "isBreedingItem", at = @At("HEAD"), cancellable = true)
     private void isBreedingItem(ItemStack stack, CallbackInfoReturnable<Boolean> cir) {
         String[] items = {
@@ -45,7 +48,7 @@ private void isBreedingItem(ItemStack stack, CallbackInfoReturnable<Boolean> cir
                 "smoked_rabbit"
         };
         for (String item : items) {
-            if (stack.isOf(Registries.ITEM.get(Identifier.of("meowmeals", item)))) {
+            if (stack.isOf(Registries.ITEM.get(Identifier.of(MOD_ID, item)))) {
                 cir.setReturnValue(true);
                 return;
             }
@@ -56,172 +59,87 @@ private void isBreedingItem(ItemStack stack, CallbackInfoReturnable<Boolean> cir
         }
     }
 
-    // Hook into interactMob instead, since it has the player and hand info.
+
     @Inject(method = "interactMob", at = @At("HEAD"), cancellable = true)
     private void onInteractMob(PlayerEntity player, net.minecraft.util.Hand hand, CallbackInfoReturnable<ActionResult> cir) {
         ItemStack stack = player.getStackInHand(hand);
         CatEntity cat = (CatEntity) (Object) this;
-        if (cat.getHealth() < cat.getMaxHealth() || !cat.isTamed() || cat.isBaby() || !cat.hasStatusEffect(StatusEffects.SATURATION) || !cat.hasStatusEffect(StatusEffects.JUMP_BOOST) || !cat.hasStatusEffect(StatusEffects.SPEED)) {
-            if (!cat.getWorld().isClient()) {
-                if (stack.isOf(Registries.ITEM.get(Identifier.of("meowmeals", "cat_food_tin")))) {
-                    var actioned = false;
-                    // Heal the cat if it’s hurt
-                    if (cat.getHealth() < cat.getMaxHealth()) {
-                        cat.heal(6.0f); // 3 hearts
-                        actioned = true;
-                    }
-
-                    // Tame the cat if it’s not already tamed
-                    if (!cat.isTamed()) {
-                        cat.setOwner(player);
-                        cat.setSitting(true);
-                        cat.getWorld().sendEntityStatus(cat, EntityStatuses.ADD_POSITIVE_PLAYER_REACTION_PARTICLES);
-                        sendMeowMealsMessage(player, "Your cat liked that so much that it's now tamed! 🐱", Formatting.GREEN);
-                        actioned = true;
-                    }
-
-                    // Set in love if tamed and adult
-                    if (cat.isTamed() && !cat.isBaby() && cat.isReadyToBreed()) {
-                        cat.setLoveTicks(600); // 30 seconds of love mode, 1 tick = 50 ms, so 20 ticks = 1 second, so 600 ticks / 20 = 30
-                        sendMeowMealsMessage(player, "Your cat is now in love mode! 🥰", Formatting.RED);
-                        actioned = true;
-                    }
-
-                    // Consume one item from the stack
-                    if (!player.getAbilities().creativeMode && actioned) {
-                        stack.decrement(1);
-                    }
-
-                    cir.setReturnValue(ActionResult.SUCCESS); // or ActionResult.PASS / FAIL depending on logic
-                    cir.cancel();
-                } else if (stack.isOf(Registries.ITEM.get(Identifier.of("meowmeals", "fish_feast")))) {
-                    var actioned = false;
-                    // Heal the cat if it’s hurt
-                    if (cat.getHealth() < cat.getMaxHealth()) {
-                        cat.heal(5.0f); // 2.5 hearts
-                        actioned = true;
-                    }
-
-                    // Tame the cat if it’s not already tamed
-                    if (!cat.isTamed()) {
-                        tryTame(player);
-                        actioned = true;
-                    }
-
-                    // Breed
-                    if (cat.isTamed() && !cat.isBaby() && cat.isReadyToBreed()) {
-                        cat.setLoveTicks(600);
-                        sendMeowMealsMessage(player, "Your cat is now in love mode! 🥰", Formatting.RED);
-                        actioned = true;
-                    }
-
-                    // ✨ Add potion effects
-                    if (!cat.hasStatusEffect(StatusEffects.SPEED) && cat.isTamed()) {
-                        cat.addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 400, 0));
-                        sendMeowMealsMessage(player, "Your cat feels energised! ✨", Formatting.GREEN);
-                        actioned = true;
-                    } else if (actioned) {
-                        cat.getWorld().addParticle(
-                                ParticleTypes.HEART,
-                                cat.getX(), cat.getY() + 1, cat.getZ(),
-                                0.0, 0.1, 0.0
-                        );
-                        sendMeowMealsMessage(player, "The cat enjoyed that! 🐟", Formatting.YELLOW);
-                    }
-
-                    // Consume item
-                    if (!player.getAbilities().creativeMode && actioned) {
-                        stack.decrement(1);
-                        player.getInventory().insertStack(new ItemStack(Items.BOWL));
-                    }
-
-                    cir.setReturnValue(ActionResult.SUCCESS);
-                    cir.cancel();
-                } else if (stack.isOf(Registries.ITEM.get(Identifier.of("meowmeals", "meat_feast")))) {
-                    var actioned = false;
-                    // Heal the cat if it’s hurt
-                    if (cat.getHealth() < cat.getMaxHealth()) {
-                        cat.heal(8.0f); // 4 hearts
-                        actioned = true;
-                    }
 
-                    // Tame the cat if it’s not already tamed
-                    if (!cat.isTamed()) {
-                        tryTame(player);
-                        actioned = true;
-                    }
+        if (!cat.getWorld().isClient()) {
+            boolean actioned = false;
+
+            // Cat Food Tin
+            if (stack.isOf(Registries.ITEM.get(Identifier.of(MOD_ID, "cat_food_tin")))) {
+                if (cat.getHealth() < cat.getMaxHealth()) {
+                    cat.heal(6.0f);
+                    actioned = true;
+                } else if (!cat.isTamed()) {
+                    cat.setOwner(player);
+                    cat.setSitting(true);
+                    cat.getWorld().sendEntityStatus(cat, EntityStatuses.ADD_POSITIVE_PLAYER_REACTION_PARTICLES);
+                    sendMeowMealsMessage(player, "Your cat liked that so much that it's now tamed! 🐱", Formatting.YELLOW);
+                    actioned = true;
+                } else if (cat.isTamed() && !cat.isInLove() && cat.getBreedingAge() == 0) {
+                    cat.lovePlayer(player);
+                    sendMeowMealsBreedingMessage(player);
+                    actioned = true;
+                }
 
-                    // Breed
-                    if (cat.isTamed() && !cat.isBaby() && cat.isReadyToBreed()) {
-                        cat.setLoveTicks(600);
-                        sendMeowMealsMessage(player, "Your cat is now in love mode! 🥰", Formatting.RED);
-                        actioned = true;
-                    }
+                // Fish Feast
+            } else if (stack.isOf(Registries.ITEM.get(Identifier.of(MOD_ID, "fish_feast")))) {
+                if (cat.getHealth() < cat.getMaxHealth()) {
+                    cat.heal(5.0f);
+                    actioned = true;
+                } else if (cat.isTamed() && !cat.isInLove() && cat.getBreedingAge() == 0) {
+                    cat.lovePlayer(player);
+                    sendMeowMealsBreedingMessage(player);
+                    actioned = true;
+                } else if (!cat.hasStatusEffect(StatusEffects.SPEED)) {
+                    cat.addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 400, 0));
+                    sendMeowMealsMessage(player, "Your cat feels energised! ✨", Formatting.GREEN);
+                    actioned = true;
+                }
+                // Meat Feast
+            } else if (stack.isOf(Registries.ITEM.get(Identifier.of(MOD_ID, "meat_feast")))) {
+                if (cat.getHealth() < cat.getMaxHealth()) {
+                    cat.heal(8.0f);
+                    actioned = true;
+                } else if (cat.isTamed() && !cat.isInLove() && cat.getBreedingAge() == 0) {
+                    cat.lovePlayer(player);
+                    sendMeowMealsBreedingMessage(player);
+                    actioned = true;
+                } else if (!cat.hasStatusEffect(StatusEffects.SATURATION)) {
+                    cat.addStatusEffect(new StatusEffectInstance(StatusEffects.SATURATION, 400, 0));
+                    sendMeowMealsMessage(player, "Your cat feels more full! 😋", Formatting.GREEN);
+                    actioned = true;
+                }
 
-                    // ✨ Add potion effects
-                    if (!cat.hasStatusEffect(StatusEffects.SATURATION) && cat.isTamed()) {
-                        cat.addStatusEffect(new StatusEffectInstance(StatusEffects.SATURATION, 400, 0));
-                        sendMeowMealsMessage(player, "Your cat feels more full! 😋", Formatting.GREEN);
-                        actioned = true;
-                    } else if (actioned) {
-                        cat.getWorld().addParticle(
-                                ParticleTypes.HEART,
-                                cat.getX(), cat.getY() + 1, cat.getZ(),
-                                0.0, 0.1, 0.0
-                        );
-                        sendMeowMealsMessage(player, "The cat enjoyed that! 🍗", Formatting.YELLOW);
-                    }
+                // Smoked Rabbit
+            } else if (stack.isOf(Registries.ITEM.get(Identifier.of(MOD_ID, "smoked_rabbit")))) {
+                if (cat.getHealth() < cat.getMaxHealth()) {
+                    cat.heal(4.0f);
+                    actioned = true;
+                } else if (cat.isTamed() && !cat.isInLove() && cat.getBreedingAge() == 0) {
+                    cat.lovePlayer(player);
+                    sendMeowMealsBreedingMessage(player);
+                    actioned = true;
+                } else if (!cat.hasStatusEffect(StatusEffects.JUMP_BOOST)) {
+                    cat.addStatusEffect(new StatusEffectInstance(StatusEffects.JUMP_BOOST, 400, 0));
+                    sendMeowMealsMessage(player, "Your cat feels bouncier, like a rabbit! 🐇", Formatting.GREEN);
+                    actioned = true;
+                }
+            }
 
-                    // Consume item
-                    if (!player.getAbilities().creativeMode && actioned) {
-                        stack.decrement(1);
+            if (actioned) {
+                if (!player.getAbilities().creativeMode) {
+                    stack.decrement(1);
+                    if (stack.isOf(Registries.ITEM.get(Identifier.of(MOD_ID, "fish_feast")))
+                            || stack.isOf(Registries.ITEM.get(Identifier.of(MOD_ID, "meat_feast")))) {
                         player.getInventory().insertStack(new ItemStack(Items.BOWL));
                     }
-                    cir.setReturnValue(ActionResult.SUCCESS);
-                    cir.cancel();
-                } else if (stack.isOf(Registries.ITEM.get(Identifier.of("meowmeals", "smoked_rabbit")))) {
-                    var actioned = false;
-                    // Heal the cat if it’s hurt
-                    if (cat.getHealth() < cat.getMaxHealth()) {
-                        cat.heal(4.0f); // 2 hearts
-                        actioned = true;
-                    }
-
-                    // Tame the cat if it’s not already tamed
-                    if (!cat.isTamed()) {
-                        tryTame(player);
-                        actioned = true;
-                    }
-
-                    // Breed
-                    if (cat.isTamed() && !cat.isBaby() && cat.isReadyToBreed()) {
-                        cat.setLoveTicks(600);
-                        sendMeowMealsMessage(player, "Your cat is now in love mode! 🥰", Formatting.RED);
-                        actioned = true;
-                    }
-
-                    // ✨ Add potion effects
-                    if (!cat.hasStatusEffect(StatusEffects.JUMP_BOOST) && cat.isTamed()) {
-                        cat.addStatusEffect(new StatusEffectInstance(StatusEffects.JUMP_BOOST, 400, 0));
-                        sendMeowMealsMessage(player, "Your cat feels bouncier, like a rabbit! 🐇", Formatting.GREEN);
-                        actioned = true;
-                    } else if (actioned) {
-                        cat.getWorld().addParticle(
-                                ParticleTypes.HEART,
-                                cat.getX(), cat.getY() + 1, cat.getZ(),
-                                0.0, 0.1, 0.0
-                        );
-                        sendMeowMealsMessage(player, "The cat enjoyed that! 😋", Formatting.YELLOW);
-                    }
-
-                    // Consume item
-                    if (!player.getAbilities().creativeMode && actioned) {
-                        stack.decrement(1);
-                    }
-
-                    cir.setReturnValue(ActionResult.SUCCESS);
-                    cir.cancel();
                 }
+                cat.playSound(ENTITY_CAT_EAT, 1.0F, 1.0F);
+                cir.setReturnValue(ActionResult.SUCCESS);
             }
         }
     }
diff --git a/src/main/kotlin/singh/akaalroop/meowmeals/MeowMeals.kt b/src/main/kotlin/singh/akaalroop/meowmeals/MeowMeals.kt
@@ -14,8 +14,9 @@ import net.minecraft.text.Text
 import net.minecraft.util.Identifier
 import org.slf4j.LoggerFactory
 
+// This is all the code run when the mod is initialised
 object MeowMeals : ModInitializer {
-    private const val MOD_ID = "meowmeals"
+    const val MOD_ID: String = "meowmeals"
     private val logger = LoggerFactory.getLogger(MOD_ID)
     private val MEOWMEALS_GROUP = RegistryKey.of(
         RegistryKeys.ITEM_GROUP,
diff --git a/src/main/kotlin/singh/akaalroop/meowmeals/items/CatFoodTin.kt b/src/main/kotlin/singh/akaalroop/meowmeals/items/CatFoodTin.kt

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package singh.akaalroop.meowmeals`
`3`	`3`	`import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint`
`4`	`4`	`import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator`
`5`	`5`
	`6`	`+// This to generate data for the mod`
`6`	`7`	`object MeowMealsDataGenerator : DataGeneratorEntrypoint {`
`7`	`8`	`override fun onInitializeDataGenerator(fabricDataGenerator: FabricDataGenerator) {`
`8`	`9`	`}`