From f942e1a100a5ebd8cfaf836689a2a23904be7ef9 Mon Sep 17 00:00:00 2001 From: Yusuf Arfan Ismail Date: Thu, 8 Aug 2024 12:53:53 +0100 Subject: [PATCH] removed some dypricated code --- .../realyusufismail/tutorialmod/TutorialMod.java | 1 + .../realyusufismail/tutorialmod/events/Events.java | 6 ++++++ .../tutorialmod/items/ModShieldItem.java | 10 ---------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/github/realyusufismail/tutorialmod/TutorialMod.java b/src/main/java/io/github/realyusufismail/tutorialmod/TutorialMod.java index 9065669..7431433 100644 --- a/src/main/java/io/github/realyusufismail/tutorialmod/TutorialMod.java +++ b/src/main/java/io/github/realyusufismail/tutorialmod/TutorialMod.java @@ -30,6 +30,7 @@ public TutorialMod(IEventBus bus) { bus.addListener(DataGenerators::gatherData); bus.addListener(Events::clientSetup); bus.addListener(TutorialModShieldItemRendererProvider::init); + bus.addListener(Events::registerClientExtensionsEvent); neoForgeBus.addListener(Events::onPlayerTickEventPre); neoForgeBus.addListener(Events::onEntityDamage); diff --git a/src/main/java/io/github/realyusufismail/tutorialmod/events/Events.java b/src/main/java/io/github/realyusufismail/tutorialmod/events/Events.java index 4d4dfac..52df235 100644 --- a/src/main/java/io/github/realyusufismail/tutorialmod/events/Events.java +++ b/src/main/java/io/github/realyusufismail/tutorialmod/events/Events.java @@ -1,6 +1,7 @@ package io.github.realyusufismail.tutorialmod.events; import io.github.realyusufismail.tutorialmod.armour.ExampleArmor; +import io.github.realyusufismail.tutorialmod.client.shield.TutorialModShieldItemRendererProvider; import io.github.realyusufismail.tutorialmod.init.ItemInit; import io.github.realyusufismail.tutorialmod.items.ModSwordItem; import io.github.realyusufismail.tutorialmod.util.TutorialModUtils; @@ -10,6 +11,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; +import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent; import net.neoforged.neoforge.common.damagesource.DamageContainer; import net.neoforged.neoforge.event.entity.living.LivingDamageEvent; import net.neoforged.neoforge.event.tick.PlayerTickEvent; @@ -57,4 +59,8 @@ public static void onEntityDamage(LivingDamageEvent.Post event) { } } } + + public static void registerClientExtensionsEvent(RegisterClientExtensionsEvent event) { + event.registerItem(TutorialModShieldItemRendererProvider.shield(), ItemInit.GRAPHITE_SHIELD.get()); + } } diff --git a/src/main/java/io/github/realyusufismail/tutorialmod/items/ModShieldItem.java b/src/main/java/io/github/realyusufismail/tutorialmod/items/ModShieldItem.java index 81a08d5..55cccb4 100644 --- a/src/main/java/io/github/realyusufismail/tutorialmod/items/ModShieldItem.java +++ b/src/main/java/io/github/realyusufismail/tutorialmod/items/ModShieldItem.java @@ -1,13 +1,8 @@ package io.github.realyusufismail.tutorialmod.items; -import io.github.realyusufismail.tutorialmod.client.shield.TutorialModShieldItemRendererProvider; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ShieldItem; import net.minecraft.world.item.Tier; -import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; -import org.jetbrains.annotations.NotNull; - -import java.util.function.Consumer; public class ModShieldItem extends ShieldItem { private final Tier tier; @@ -18,11 +13,6 @@ public ModShieldItem(Tier tier, int durability) { this.tier = tier; } - @Override - public void initializeClient(@NotNull Consumer consumer) { - consumer.accept(TutorialModShieldItemRendererProvider.shield()); - } - @Override public boolean isValidRepairItem(ItemStack pToRepair, ItemStack pRepair) { return this.tier.getRepairIngredient().test(pRepair);