From ee880291e88e089a4ae562b43d295ab9ae95237c Mon Sep 17 00:00:00 2001 From: iceBear67 Date: Wed, 2 Oct 2024 09:08:05 +0800 Subject: [PATCH] (update) fix --- src/main/java/io/ib67/sfcraft/SFItems.java | 6 ++---- src/main/java/io/ib67/sfcraft/SFRegistries.java | 15 +++++++++++++++ .../sfcraft/mixin/server/item/ItemStackMixin.java | 3 ++- 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 src/main/java/io/ib67/sfcraft/SFRegistries.java diff --git a/src/main/java/io/ib67/sfcraft/SFItems.java b/src/main/java/io/ib67/sfcraft/SFItems.java index 6768478..54bb259 100644 --- a/src/main/java/io/ib67/sfcraft/SFItems.java +++ b/src/main/java/io/ib67/sfcraft/SFItems.java @@ -10,14 +10,12 @@ import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; import net.minecraft.util.Identifier; +import static io.ib67.sfcraft.SFRegistries.ITEMS; + public class SFItems { public static final Item AERO_BACKPACK = register( new AeroBackpack(new Item.Settings().maxDamage(ArmorItem.Type.CHESTPLATE.getMaxDamage(15))), "aero_backpack"); public static final String SF_ITEM_TYPE_KEY = "sf_type"; - public static final Registry ITEMS = FabricRegistryBuilder - .createSimple(RegistryKey.ofRegistry(Identifier.of(SFCraft.MOD_ID, "item"))) - .attribute(RegistryAttribute.MODDED) - .buildAndRegister(); public static void init() { } diff --git a/src/main/java/io/ib67/sfcraft/SFRegistries.java b/src/main/java/io/ib67/sfcraft/SFRegistries.java new file mode 100644 index 0000000..ba3973a --- /dev/null +++ b/src/main/java/io/ib67/sfcraft/SFRegistries.java @@ -0,0 +1,15 @@ +package io.ib67.sfcraft; + +import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder; +import net.fabricmc.fabric.api.event.registry.RegistryAttribute; +import net.minecraft.item.Item; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.util.Identifier; + +public class SFRegistries { + public static final Registry ITEMS = FabricRegistryBuilder + .createSimple(RegistryKey.ofRegistry(Identifier.of(SFCraft.MOD_ID, "item"))) + .attribute(RegistryAttribute.MODDED) + .buildAndRegister(); +} diff --git a/src/main/java/io/ib67/sfcraft/mixin/server/item/ItemStackMixin.java b/src/main/java/io/ib67/sfcraft/mixin/server/item/ItemStackMixin.java index b88268e..25f1c91 100644 --- a/src/main/java/io/ib67/sfcraft/mixin/server/item/ItemStackMixin.java +++ b/src/main/java/io/ib67/sfcraft/mixin/server/item/ItemStackMixin.java @@ -2,6 +2,7 @@ package io.ib67.sfcraft.mixin.server.item; import io.ib67.sfcraft.SFCraft; import io.ib67.sfcraft.SFItems; +import io.ib67.sfcraft.SFRegistries; import net.minecraft.component.ComponentHolder; import net.minecraft.component.ComponentMapImpl; import net.minecraft.component.DataComponentTypes; @@ -39,7 +40,7 @@ public abstract class ItemStackMixin implements ComponentHolder { if (_id != null && _id.contains(SFItems.SF_ITEM_TYPE_KEY)) { var id = _id.copyNbt().getString(SFItems.SF_ITEM_TYPE_KEY); try { - sfItem = SFItems.ITEMS.get(Identifier.of(SFCraft.MOD_ID, id)); + sfItem = SFRegistries.ITEMS.get(Identifier.of(SFCraft.MOD_ID, id)); }catch(Exception e){ e.printStackTrace(); }