From a404e3ada86a7ca42e77a999be256918704976e9 Mon Sep 17 00:00:00 2001 From: patience Date: Sun, 22 Feb 2026 17:31:51 +0000 Subject: [PATCH] Moved enemy reworks into their own directory --- .../patience/mc_rebalance/ModEnchantments.java | 4 ++-- .../effect => enchant_effects}/SmackEffect.java | 2 +- .../effect => enchant_effects}/WindupEffect.java | 2 +- .../mc_rebalance/mixin/{ => mob}/BlazeAIRework.java | 2 +- .../mc_rebalance/mixin/{ => mob}/BlazeRework.java | 2 +- .../mc_rebalance/mixin/{ => mob}/CreakingRework.java | 2 +- .../mixin/{ => mob}/HappyGhastTweak.java | 2 +- .../mc_rebalance/mixin/{ => mob}/WardenRework.java | 2 +- .../mixin/{ => mob}/WitherSkeletonRework.java | 2 +- src/main/resources/mc_rebalance.mixins.json | 12 ++++++------ 10 files changed, 16 insertions(+), 16 deletions(-) rename src/main/java/xyz/nearmisses/patience/mc_rebalance/{enchantment/effect => enchant_effects}/SmackEffect.java (95%) rename src/main/java/xyz/nearmisses/patience/mc_rebalance/{enchantment/effect => enchant_effects}/WindupEffect.java (95%) rename src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/{ => mob}/BlazeAIRework.java (94%) rename src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/{ => mob}/BlazeRework.java (95%) rename src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/{ => mob}/CreakingRework.java (97%) rename src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/{ => mob}/HappyGhastTweak.java (97%) rename src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/{ => mob}/WardenRework.java (97%) rename src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/{ => mob}/WitherSkeletonRework.java (97%) diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModEnchantments.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModEnchantments.java index cb7f727..0525c62 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModEnchantments.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModEnchantments.java @@ -5,8 +5,8 @@ import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.enchantment.effects.EnchantmentEntityEffect; -import xyz.nearmisses.patience.mc_rebalance.enchantment.effect.SmackEffect; -import xyz.nearmisses.patience.mc_rebalance.enchantment.effect.WindupEffect; +import xyz.nearmisses.patience.mc_rebalance.enchant_effects.SmackEffect; +import xyz.nearmisses.patience.mc_rebalance.enchant_effects.WindupEffect; // Copied off the Fabric wiki. I don't think I like this code. public class ModEnchantments { diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchantment/effect/SmackEffect.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchant_effects/SmackEffect.java similarity index 95% rename from src/main/java/xyz/nearmisses/patience/mc_rebalance/enchantment/effect/SmackEffect.java rename to src/main/java/xyz/nearmisses/patience/mc_rebalance/enchant_effects/SmackEffect.java index 8a80806..549c894 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchantment/effect/SmackEffect.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchant_effects/SmackEffect.java @@ -1,4 +1,4 @@ -package xyz.nearmisses.patience.mc_rebalance.enchantment.effect; +package xyz.nearmisses.patience.mc_rebalance.enchant_effects; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchantment/effect/WindupEffect.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchant_effects/WindupEffect.java similarity index 95% rename from src/main/java/xyz/nearmisses/patience/mc_rebalance/enchantment/effect/WindupEffect.java rename to src/main/java/xyz/nearmisses/patience/mc_rebalance/enchant_effects/WindupEffect.java index 3086230..9f56227 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchantment/effect/WindupEffect.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchant_effects/WindupEffect.java @@ -1,4 +1,4 @@ -package xyz.nearmisses.patience.mc_rebalance.enchantment.effect; +package xyz.nearmisses.patience.mc_rebalance.enchant_effects; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/BlazeAIRework.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/BlazeAIRework.java similarity index 94% rename from src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/BlazeAIRework.java rename to src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/BlazeAIRework.java index 4cd2de7..29a58cd 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/BlazeAIRework.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/BlazeAIRework.java @@ -1,4 +1,4 @@ -package xyz.nearmisses.patience.mc_rebalance.mixin; +package xyz.nearmisses.patience.mc_rebalance.mixin.mob; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.ai.attributes.Attributes; diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/BlazeRework.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/BlazeRework.java similarity index 95% rename from src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/BlazeRework.java rename to src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/BlazeRework.java index 495cfd7..b7eb6d2 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/BlazeRework.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/BlazeRework.java @@ -1,4 +1,4 @@ -package xyz.nearmisses.patience.mc_rebalance.mixin; +package xyz.nearmisses.patience.mc_rebalance.mixin.mob; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/CreakingRework.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/CreakingRework.java similarity index 97% rename from src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/CreakingRework.java rename to src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/CreakingRework.java index 97e1e4d..7131ee4 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/CreakingRework.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/CreakingRework.java @@ -1,4 +1,4 @@ -package xyz.nearmisses.patience.mc_rebalance.mixin; +package xyz.nearmisses.patience.mc_rebalance.mixin.mob; import com.blackgear.vanillabackport.common.level.entities.creaking.Creaking; import net.minecraft.world.effect.MobEffectInstance; diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/HappyGhastTweak.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/HappyGhastTweak.java similarity index 97% rename from src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/HappyGhastTweak.java rename to src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/HappyGhastTweak.java index c4e4251..39cb026 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/HappyGhastTweak.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/HappyGhastTweak.java @@ -1,4 +1,4 @@ -package xyz.nearmisses.patience.mc_rebalance.mixin; +package xyz.nearmisses.patience.mc_rebalance.mixin.mob; import com.blackgear.vanillabackport.client.registries.ModSoundEvents; import com.blackgear.vanillabackport.common.level.entities.happyghast.HappyGhast; diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/WardenRework.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/WardenRework.java similarity index 97% rename from src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/WardenRework.java rename to src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/WardenRework.java index e6e23e6..682a31f 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/WardenRework.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/WardenRework.java @@ -1,4 +1,4 @@ -package xyz.nearmisses.patience.mc_rebalance.mixin; +package xyz.nearmisses.patience.mc_rebalance.mixin.mob; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/WitherSkeletonRework.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/WitherSkeletonRework.java similarity index 97% rename from src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/WitherSkeletonRework.java rename to src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/WitherSkeletonRework.java index ee272d5..0f65bfc 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/WitherSkeletonRework.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/mixin/mob/WitherSkeletonRework.java @@ -1,4 +1,4 @@ -package xyz.nearmisses.patience.mc_rebalance.mixin; +package xyz.nearmisses.patience.mc_rebalance.mixin.mob; import net.minecraft.core.Holder; import net.minecraft.world.effect.MobEffect; diff --git a/src/main/resources/mc_rebalance.mixins.json b/src/main/resources/mc_rebalance.mixins.json index 767c25f..9a102bf 100644 --- a/src/main/resources/mc_rebalance.mixins.json +++ b/src/main/resources/mc_rebalance.mixins.json @@ -3,15 +3,15 @@ "package": "xyz.nearmisses.patience.mc_rebalance.mixin", "compatibilityLevel": "JAVA_21", "mixins": [ - "BlazeAIRework", - "BlazeRework", + "mob.BlazeAIRework", + "mob.BlazeRework", "PlayerTweaks", - "CreakingRework", + "mob.CreakingRework", "ExperienceOrbRework", "GrowRateTweak", - "HappyGhastTweak", - "WardenRework", - "WitherSkeletonRework" + "mob.HappyGhastTweak", + "mob.WardenRework", + "mob.WitherSkeletonRework" ], "injectors": { "defaultRequire": 1