From cd2deb7d7e0ef3b92bfcb60a47ef0c0439637da9 Mon Sep 17 00:00:00 2001 From: patience Date: Sun, 22 Feb 2026 16:22:48 +0000 Subject: [PATCH] Cleaned up ModEnchantments --- .../patience/mc_rebalance/MCRebalance.java | 2 +- .../patience/mc_rebalance/ModEnchantments.java | 18 +++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/MCRebalance.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/MCRebalance.java index 882817e..ef9ae98 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/MCRebalance.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/MCRebalance.java @@ -18,7 +18,7 @@ public class MCRebalance implements ModInitializer { ModItems.init(); // Initialise: load all static values ModBlocks.init(); ModEffects.init(); - ModEnchantments.registerModEnchantmentEffects(); + ModEnchantments.init(); LOGGER.info("Thanks for trying out our stuff!"); } } \ No newline at end of file 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 86aebb5..cb7f727 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModEnchantments.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModEnchantments.java @@ -3,25 +3,14 @@ package xyz.nearmisses.patience.mc_rebalance; import com.mojang.serialization.MapCodec; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.enchantment.Enchantment; 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; // Copied off the Fabric wiki. I don't think I like this code. public class ModEnchantments { - - public static final ResourceKey Windup = of("windup"); - public static MapCodec Effect_Windup = register("windup", WindupEffect.CODEC); - public static MapCodec Effect_Smack = register("smack", SmackEffect.CODEC); - - private static ResourceKey of(String path) { - ResourceLocation id = ResourceLocation.fromNamespaceAndPath(MCRebalance.MOD_ID, path); - return ResourceKey.create(Registries.ENCHANTMENT, id); - } + public static void init(){} private static MapCodec register(String id, MapCodec codec) { return Registry.register( @@ -31,7 +20,6 @@ public class ModEnchantments { ); } - public static void registerModEnchantmentEffects() { - MCRebalance.LOGGER.info("Registering EnchantmentEffects for " + MCRebalance.MOD_ID); - } + public static MapCodec Effect_Windup = register("windup", WindupEffect.CODEC); + public static MapCodec Effect_Smack = register("smack", SmackEffect.CODEC); }