diff --git a/src/main/java/ru/betterend/interfaces/BreakableItem.java b/src/main/java/ru/betterend/interfaces/BreakableItem.java deleted file mode 100644 index 7af4687b..00000000 --- a/src/main/java/ru/betterend/interfaces/BreakableItem.java +++ /dev/null @@ -1,5 +0,0 @@ -package ru.betterend.interfaces; - -public interface BreakableItem { - void registerBrokenItem(); -} diff --git a/src/main/java/ru/betterend/interfaces/MultiModelItem.java b/src/main/java/ru/betterend/interfaces/MultiModelItem.java new file mode 100644 index 00000000..d12966f6 --- /dev/null +++ b/src/main/java/ru/betterend/interfaces/MultiModelItem.java @@ -0,0 +1,9 @@ +package ru.betterend.interfaces; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public interface MultiModelItem { + void registerModelPredicate(); +} diff --git a/src/main/java/ru/betterend/item/ArmoredElytra.java b/src/main/java/ru/betterend/item/ArmoredElytra.java index 38ceb39c..b9bedd45 100644 --- a/src/main/java/ru/betterend/item/ArmoredElytra.java +++ b/src/main/java/ru/betterend/item/ArmoredElytra.java @@ -1,7 +1,7 @@ package ru.betterend.item; -import net.fabricmc.fabric.api.item.v1.EquipmentSlotProvider; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EquipmentSlot; @@ -10,12 +10,10 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import ru.betterend.BetterEnd; -import ru.betterend.interfaces.BreakableItem; -import ru.betterend.patterns.Patterned; -import ru.betterend.patterns.Patterns; +import ru.betterend.interfaces.MultiModelItem; import ru.betterend.registry.EndItems; -public class ArmoredElytra extends ElytraItem implements BreakableItem { +public class ArmoredElytra extends ElytraItem implements MultiModelItem { private final ResourceLocation wingTexture; private final Item repairItem; @@ -35,6 +33,7 @@ public class ArmoredElytra extends ElytraItem implements BreakableItem { return movementFactor; } + @Environment(EnvType.CLIENT) public ResourceLocation getWingTexture() { return wingTexture; } @@ -45,7 +44,8 @@ public class ArmoredElytra extends ElytraItem implements BreakableItem { } @Override - public void registerBrokenItem() { + @Environment(EnvType.CLIENT) + public void registerModelPredicate() { FabricModelPredicateProviderRegistry.register(this, new ResourceLocation("broken"), (itemStack, clientLevel, livingEntity) -> ElytraItem.isFlyEnabled(itemStack) ? 0.0F : 1.0F); } diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index 9590fe7f..abbb4040 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -21,7 +21,7 @@ import net.minecraft.world.item.*; import net.minecraft.world.level.block.DispenserBlock; import ru.betterend.BetterEnd; import ru.betterend.config.Configs; -import ru.betterend.interfaces.BreakableItem; +import ru.betterend.interfaces.MultiModelItem; import ru.betterend.item.*; import ru.betterend.item.material.EndArmorMaterial; import ru.betterend.item.material.EndToolMaterial; @@ -132,8 +132,8 @@ public class EndItems { return item; } registerItem(id, item, MOD_ITEMS); - if (item instanceof BreakableItem) { - ((BreakableItem) item).registerBrokenItem(); + if (item instanceof MultiModelItem) { + ((MultiModelItem) item).registerModelPredicate(); } return item; } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 315cf94c..c3da285a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -43,9 +43,9 @@ ], "depends": { - "fabricloader": ">=0.10.0", - "fabric": ">=0.29.0", - "minecraft": ">=1.16.3" + "fabricloader": ">=0.11.0", + "fabric": ">=0.32.0", + "minecraft": ">=1.16.4" }, "suggests": { "byg": ">=1.1.3",