Refactor NeoForge platform integration and data providers

Shadowbee27 · Shadowbee27 · commit 5249782eda74 · 2025-10-31T00:14:57.000+01:00
- Replace deprecated NetworkManager side constants with explicit enums -
Use explicit type in ManualTagHolder - Add felnull-java-library as
implementation dependency - Fix model loading using
ModelResourceLocation with variant "inventory" - Replace reflection
utility with direct constructor invocation - Implement custom Tier
interface instead of deprecated SimpleTier - Replace vanilla Tags
references with OEForgeItemTags wrappers - Update mod initialization for
NeoForge event bus - Fix client renderer layer addLayer method cast -
Improve model registration to use ModelResourceLocation with "inventory"
- Add new overloaded data provider constructors with
HolderLookup.Provider - Update loot table provider to support async
lookup provider - Update recipe provider to support async lookup and
RecipeOutput consumer - Migrate item attribute modifiers to new
ItemAttributeModifiers API - Add new OEForgeItemTags entries for shears,
bows, stone, glass_blocks, etc.
diff --git a/common/src/main/java/org/modsauce/otyacraftenginerenewed/networking/OEPackets.java b/common/src/main/java/org/modsauce/otyacraftenginerenewed/networking/OEPackets.java
@@ -36,7 +36,7 @@ public class OEPackets {
 
   public static void init() {
     NetworkManager.registerReceiver(
-      NetworkManager.c2s(),
+      NetworkManager.Side.C2S,
       BLOCK_ENTITY_INSTRUCTION,
       (friendlyByteBuf, packetContext) ->
         ServerMessageHandler.onBlockEntityInstructionMessage(
@@ -45,7 +45,7 @@ public static void init() {
         )
     );
     NetworkManager.registerReceiver(
-      NetworkManager.c2s(),
+      NetworkManager.Side.C2S,
       ITEM_INSTRUCTION,
       (friendlyByteBuf, packetContext) ->
         ServerMessageHandler.onItemInstructionMessage(
@@ -57,7 +57,7 @@ public static void init() {
 
   public static void clientInit() {
     NetworkManager.registerReceiver(
-      NetworkManager.s2c(),
+      NetworkManager.Side.S2C,
       BLOCK_ENTITY_INSTRUCTION_RETURN,
       (friendlyByteBuf, packetContext) ->
         ClientMessageHandler.onBlockEntityInstructionReturn(
@@ -66,7 +66,7 @@ public static void clientInit() {
         )
     );
     NetworkManager.registerReceiver(
-      NetworkManager.s2c(),
+      NetworkManager.Side.S2C,
       ITEM_INSTRUCTION_RETURN,
       (friendlyByteBuf, packetContext) ->
         ClientMessageHandler.onItemInstructionReturn(
diff --git a/common/src/main/java/org/modsauce/otyacraftenginerenewed/tag/ManualTagHolder.java b/common/src/main/java/org/modsauce/otyacraftenginerenewed/tag/ManualTagHolder.java
@@ -21,7 +21,7 @@ static <T> ManualTagHolder<T> of(@NotNull TagKey<T> tagKey) {
 
   @NotNull
   static <T> ManualTagHolder<T> of(@NotNull Supplier<TagKey<T>> tagKey) {
-    return new ManualTagHolder<>() {
+    return new ManualTagHolder<T>() {
       @Override
       public @NotNull TagKey<T> getKey() {
         return tagKey.get();
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     modApi "me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}"
     modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${rootProject.rei_version}"
 
+    implementation "dev.felnull:felnull-java-library:${rootProject.felnull_version}"
     shadowIn "dev.felnull:felnull-java-library:${rootProject.felnull_version}"
     shadowIn 'com.madgag:animated-gif-lib:1.4'
 }
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/explatform/client/neoforge/OEClientExpectPlatformImpl.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/explatform/client/neoforge/OEClientExpectPlatformImpl.java
@@ -4,6 +4,7 @@
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.ItemLike;
 import org.modsauce.otyacraftenginerenewed.client.renderer.item.BEWLItemRenderer;
@@ -18,11 +19,12 @@ public static InputConstants.Key getKey(KeyMapping key) {
   }
 
   public static BakedModel getModel(ResourceLocation location) {
-    return mc.getModelManager().getModel(location);
+    ModelResourceLocation modelLocation = new ModelResourceLocation(location, "inventory");
+    return mc.getModelManager().getModel(modelLocation);
   }
 
   public static float getPartialTicks() {
-    return mc.getPartialTick();
+    return mc.getTimer().getGameTimeDeltaPartialTick(mc.isPaused());
   }
 
   public static void registerItemRenderer(
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/explatform/neoforge/OEExpectPlatformImpl.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/explatform/neoforge/OEExpectPlatformImpl.java
@@ -1,6 +1,5 @@
 package org.modsauce.otyacraftenginerenewed.explatform.neoforge;
 
-import dev.felnull.fnjl.util.FNReflectionUtil;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -52,7 +51,10 @@ public static <T> List<T> getCallPoints(
           cls = Class.forName(n.clazz().getClassName());
         } catch (Exception ignored) {}
         if (cls == null) return;
-        var inst = FNReflectionUtil.newInstance(cls);
+        Object inst = null;
+        try {
+          inst = cls.getDeclaredConstructor().newInstance();
+        } catch (Exception ignored) {}
         if (interfaceClass.isInstance(inst)) lst.add((T) inst);
       });
     return lst;
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/explatform/neoforge/OERegisterExpectPlatformImpl.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/explatform/neoforge/OERegisterExpectPlatformImpl.java
@@ -10,7 +10,6 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 //import net.minecraftforge.common.TierSortingRegistry;
-import net.neoforged.neoforge.common.SimpleTier;
 import org.jetbrains.annotations.NotNull;
 import org.modsauce.otyacraftenginerenewed.blockentity.BlockEntityCreateSupplier;
 
@@ -41,14 +40,36 @@ public static Tier createTier(
     @NotNull Supplier<Ingredient> repairIngredient
   ) {
     //   TierSortingRegistry.registerTier()
-    return new SimpleTier(
-      level,
-      uses,
-      speed,
-      attackDamageBonus,
-      enchantmentValue,
-      tag,
-      repairIngredient
-    );
+    return new Tier() {
+      @Override
+      public int getUses() {
+        return uses;
+      }
+
+      @Override
+      public float getSpeed() {
+        return speed;
+      }
+
+      @Override
+      public float getAttackDamageBonus() {
+        return attackDamageBonus;
+      }
+
+      @Override
+      public TagKey<Block> getIncorrectBlocksForDrops() {
+        return tag;
+      }
+
+      @Override
+      public int getEnchantmentValue() {
+        return enchantmentValue;
+      }
+
+      @Override
+      public Ingredient getRepairIngredient() {
+        return repairIngredient.get();
+      }
+    };
   }
 }
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/explatform/neoforge/OETagsExpectPlatformImpl.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/explatform/neoforge/OETagsExpectPlatformImpl.java
@@ -28,15 +28,15 @@ public static Optional<TagKey<Item>> axes() {
   }
 
   public static TagKey<Item> shears() {
-    return Tags.Items.SHEARS;
+    return OEForgeItemTags.SHEARS.get();
   }
 
   public static Optional<TagKey<Item>> swords() {
     return Optional.empty();
   }
 
   public static TagKey<Item> bows() {
-    return Tags.Items.TOOLS_BOWS;
+    return OEForgeItemTags.BOWS.get();
   }
 
   public static TagKey<Item> ironIngots() {
@@ -52,7 +52,7 @@ public static TagKey<Item> copperIngots() {
   }
 
   public static TagKey<Item> netheriteIngots() {
-    return Tags.Items.INGOTS_NETHER_BRICK;
+    return Tags.Items.INGOTS_NETHERITE;
   }
 
   public static TagKey<Item> redstoneDusts() {
@@ -64,7 +64,7 @@ public static TagKey<Item> diamonds() {
   }
 
   public static TagKey<Item> glassBlocks() {
-    return Tags.Items.GLASS;
+    return OEForgeItemTags.GLASS_BLOCKS.get();
   }
 
   public static TagKey<Item> glassPanes() {
@@ -84,7 +84,7 @@ public static ManualTagHolder<Item> enderPearls() {
   }
 
   public static ManualTagHolder<Item> stone() {
-    return ManualTagHolder.of(() -> Tags.Items.STONE);
+    return OEForgeItemTags.STONE.get();
   }
 
   public static ManualTagHolder<Item> redstoneBlocks() {
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/OtyacraftEngineForge.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/OtyacraftEngineForge.java
@@ -1,18 +1,15 @@
 package org.modsauce.otyacraftenginerenewed.neoforge;
 
-import dev.architectury.platform.forge.EventBuses;
 import org.modsauce.otyacraftenginerenewed.OtyacraftEngine;
 import org.modsauce.otyacraftenginerenewed.neoforge.handler.CommonHandlerForge;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.common.NeoForge;
 
 @Mod(OtyacraftEngine.MODID)
 public class OtyacraftEngineForge {
-    public OtyacraftEngineForge() {
+    public OtyacraftEngineForge(ModContainer modContainer) {
         NeoForge.EVENT_BUS.register(CommonHandlerForge.class);
-        EventBuses.registerModEventBus(OtyacraftEngine.MODID, FMLJavaModLoadingContext.get().getModEventBus());
         OtyacraftEngine.init();
     }
 }
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/client/handler/ClientBusHandler.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/client/handler/ClientBusHandler.java
@@ -12,13 +12,13 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.client.event.EntityRenderersEvent;
 
-@Mod.EventBusSubscriber(modid = OtyacraftEngine.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+@EventBusSubscriber(modid = OtyacraftEngine.MODID, value = Dist.CLIENT)
 public class ClientBusHandler {
     @SubscribeEvent
     public static void onClientSetup(FMLClientSetupEvent event) {
@@ -35,9 +35,11 @@ public <T extends LivingEntity, M extends EntityModel<T>> void addLayerV2(Entity
                 if (entityType == EntityType.PLAYER) {
                     for (PlayerSkin.Model skin : e.getSkins()) {
                         var renderer = e.getSkin(PlayerSkin.Model.valueOf(String.valueOf(skin)));
-                        if (renderer != null) {
-                            RenderLayer theLayer = layer.create((RenderLayerParent<T, M>) renderer, e.getEntityModels());
-                            renderer.addLayer(theLayer);
+                        if (renderer instanceof LivingEntityRenderer<?, ?> livingRenderer) {
+                            RenderLayer<T, M> theLayer = layer.create((RenderLayerParent<T, M>) renderer, e.getEntityModels());
+                            @SuppressWarnings("unchecked")
+                            LivingEntityRenderer<T, M> typedRenderer = (LivingEntityRenderer<T, M>) livingRenderer;
+                            typedRenderer.addLayer(theLayer);
                         }
                     }
                 } else {
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/client/handler/ModelHandler.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/client/handler/ModelHandler.java
@@ -1,16 +1,26 @@
 package org.modsauce.otyacraftenginerenewed.neoforge.client.handler;
 
+import org.modsauce.otyacraftenginerenewed.OtyacraftEngine;
 import org.modsauce.otyacraftenginerenewed.client.callpoint.ClientCallPointManager;
+import org.modsauce.otyacraftenginerenewed.client.callpoint.ModelRegister;
 import net.neoforged.neoforge.client.event.ModelEvent;
 import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.api.distmarker.Dist;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.resources.model.ModelResourceLocation;
 
-@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+@EventBusSubscriber(modid = OtyacraftEngine.MODID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
 public class ModelHandler {
 
     @SubscribeEvent
     public static void onModelRegistry(ModelEvent.RegisterAdditional e) {
-        ClientCallPointManager.getInstance().call().onModelRegistry(e::register);
+        ClientCallPointManager.getInstance().call().onModelRegistry(new ModelRegister() {
+            @Override
+            public void addModelLoad(ResourceLocation location) {
+                ModelResourceLocation modelLocation = new ModelResourceLocation(location, "inventory");
+                e.register(modelLocation);
+            }
+        });
     }
 }
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/data/CrossDataGeneratorAccessImpl.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/data/CrossDataGeneratorAccessImpl.java
@@ -64,6 +64,11 @@ public Mod getMod() {
         return Platform.getMod(gatherDataEvent.getModContainer().getModId());
     }
 
+    @Override
+    public RecipeProvider createRecipeProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup, RecipeProviderWrapper recipeProviderWrapper) {
+        return new WrappedRecipeProvider(packOutput, lookup, recipeProviderWrapper);
+    }
+
     @Override
     public RecipeProvider createRecipeProvider(PackOutput packOutput, RecipeProviderWrapper recipeProviderWrapper) {
         return new WrappedRecipeProvider(packOutput, recipeProviderWrapper);
@@ -108,11 +113,21 @@ public DataProvider createBasicProvider(BasicProviderWrapper basicProviderWrappe
         return new WrappedBasicProvider(basicProviderWrapper);
     }
 
+    @Override
+    public DataProvider createBlockLootTableProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup, BlockLootTableProviderWrapper blockLootTableProviderWrapper) {
+        return new WrappedBlockLootTableProvider(packOutput, lookup, blockLootTableProviderWrapper);
+    }
+
     @Override
     public DataProvider createBlockLootTableProvider(PackOutput packOutput, BlockLootTableProviderWrapper blockLootTableProviderWrapper) {
         return new WrappedBlockLootTableProvider(packOutput, blockLootTableProviderWrapper);
     }
 
+    @Override
+    public DataProvider createAdvancementProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup, AdvancementProviderWrapper advancementProviderWrapper, List<AdvancementSubProviderWrapper> subProviderWrappers) {
+        return new WrappedAdvancementProvider(packOutput, lookup, subProviderWrappers, advancementProviderWrapper);
+    }
+
     @Override
     public DataProvider createAdvancementProvider(PackOutput packOutput, AdvancementProviderWrapper advancementProviderWrapper, List<AdvancementSubProviderWrapper> subProviderWrappers) {
         return new WrappedAdvancementProvider(getVanillaGenerator().getPackOutput(), gatherDataEvent.getLookupProvider(), subProviderWrappers, advancementProviderWrapper);
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/data/model/BlockStateAndModelProviderAccessImpl.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/data/model/BlockStateAndModelProviderAccessImpl.java
@@ -14,7 +14,7 @@
 import net.minecraft.world.level.block.StairBlock;
 import org.jetbrains.annotations.NotNull;
 import net.neoforged.neoforge.client.model.generators.*;
-import net.neoforged.neoforge.registries.NeoForgeRegistries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 
 import java.util.Objects;
@@ -218,7 +218,7 @@ public void horizontalBlockState(@NotNull Block block, @NotNull FileModel model)
 
     @Override
     public void parentedBlockItemModel(@NotNull Block block, @NotNull ResourceLocation parentLocation) {
-        var name = Objects.requireNonNull(NeoForgeRegistries.ITEMS.getKey(block.asItem()));
+        var name = Objects.requireNonNull(BuiltInRegistries.ITEM.getKey(block.asItem()));
         this.blockStateProvider.itemModels().getBuilder(name.toString()).parent(new ModelFile.UncheckedModelFile(parentLocation));
     }
 
@@ -241,7 +241,7 @@ private String name(Block block) {
     }
 
     private ResourceLocation key(Block block) {
-        return NeoForgeRegistries.BLOCKS.getKey(block);
+        return BuiltInRegistries.BLOCK.getKey(block);
     }
 
     private BlockModelBuilder setTexture(BlockModelBuilder blockModelBuilder, String key, FileTexture fileTexture) {
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/data/provider/WrappedBlockLootTableProvider.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/data/provider/WrappedBlockLootTableProvider.java
@@ -3,38 +3,38 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import org.modsauce.otyacraftenginerenewed.data.provider.BlockLootTableProviderWrapper;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.loot.BlockLootSubProvider;
 import net.minecraft.data.loot.LootTableProvider;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.flag.FeatureFlags;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.storage.loot.LootTable;
-import net.minecraft.world.level.storage.loot.ValidationContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 
-import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 
 public class WrappedBlockLootTableProvider extends LootTableProvider {
     private final BlockLootTableProviderWrapper blockLootTableProviderWrapper;
 
     public WrappedBlockLootTableProvider(PackOutput arg, BlockLootTableProviderWrapper blockLootTableProviderWrapper) {
-        super(arg, Set.of(), ImmutableList.of(new LootTableProvider.SubProviderEntry(() -> new WrappedBlockLootSubProvider(blockLootTableProviderWrapper), LootContextParamSets.BLOCK)));
+        super(arg, Set.of(), ImmutableList.of(new LootTableProvider.SubProviderEntry((provider) -> new WrappedBlockLootSubProvider(blockLootTableProviderWrapper, provider), LootContextParamSets.BLOCK)), CompletableFuture.completedFuture(null));
         this.blockLootTableProviderWrapper = blockLootTableProviderWrapper;
     }
 
-    @Override
-    protected void validate(Map<ResourceLocation, LootTable> map, ValidationContext validationcontext) {
-
+    public WrappedBlockLootTableProvider(PackOutput arg, CompletableFuture<HolderLookup.Provider> lookup, BlockLootTableProviderWrapper blockLootTableProviderWrapper) {
+        super(arg, Set.of(), ImmutableList.of(new LootTableProvider.SubProviderEntry((provider) -> new WrappedBlockLootSubProvider(blockLootTableProviderWrapper, provider), LootContextParamSets.BLOCK)), lookup);
+        this.blockLootTableProviderWrapper = blockLootTableProviderWrapper;
     }
 
+
     private static class WrappedBlockLootSubProvider extends BlockLootSubProvider {
         private final BlockLootTableProviderWrapper blockLootTableProviderWrapper;
 
-        protected WrappedBlockLootSubProvider(BlockLootTableProviderWrapper blockLootTableProviderWrapper) {
-            super(ImmutableSet.of(), FeatureFlags.REGISTRY.allFlags());
+        protected WrappedBlockLootSubProvider(BlockLootTableProviderWrapper blockLootTableProviderWrapper, HolderLookup.Provider provider) {
+            super(ImmutableSet.of(), FeatureFlags.REGISTRY.allFlags(), provider);
             this.blockLootTableProviderWrapper = blockLootTableProviderWrapper;
         }
 
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/data/provider/WrappedRecipeProvider.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/data/provider/WrappedRecipeProvider.java
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/mixin/self/StackAttributeModifierItemExtender.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/mixin/self/StackAttributeModifierItemExtender.java
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/tag/OEForgeItemTags.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/tag/OEForgeItemTags.java

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ dependencies {`
`39`	`39`	`modApi "me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}"`
`40`	`40`	`modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${rootProject.rei_version}"`
`41`	`41`
	`42`	`+ implementation "dev.felnull:felnull-java-library:${rootProject.felnull_version}"`
`42`	`43`	`shadowIn "dev.felnull:felnull-java-library:${rootProject.felnull_version}"`
`43`	`44`	`shadowIn 'com.madgag:animated-gif-lib:1.4'`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import net.minecraft.client.KeyMapping;`
`5`	`5`	`import net.minecraft.client.Minecraft;`
`6`	`6`	`import net.minecraft.client.resources.model.BakedModel;`
	`7`	`+import net.minecraft.client.resources.model.ModelResourceLocation;`
`7`	`8`	`import net.minecraft.resources.ResourceLocation;`
`8`	`9`	`import net.minecraft.world.level.ItemLike;`
`9`	`10`	`import org.modsauce.otyacraftenginerenewed.client.renderer.item.BEWLItemRenderer;`
`@@ -18,11 +19,12 @@ public static InputConstants.Key getKey(KeyMapping key) {`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`public static BakedModel getModel(ResourceLocation location) {`
`21`		`- return mc.getModelManager().getModel(location);`
	`22`	`+ ModelResourceLocation modelLocation = new ModelResourceLocation(location, "inventory");`
	`23`	`+ return mc.getModelManager().getModel(modelLocation);`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`public static float getPartialTicks() {`
`25`		`- return mc.getPartialTick();`
	`27`	`+ return mc.getTimer().getGameTimeDeltaPartialTick(mc.isPaused());`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`public static void registerItemRenderer(`
Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,15 @@ public static Optional<TagKey<Item>> axes() {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public static TagKey<Item> shears() {`
`31`		`- return Tags.Items.SHEARS;`
	`31`	`+ return OEForgeItemTags.SHEARS.get();`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public static Optional<TagKey<Item>> swords() {`
`35`	`35`	`return Optional.empty();`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public static TagKey<Item> bows() {`
`39`		`- return Tags.Items.TOOLS_BOWS;`
	`39`	`+ return OEForgeItemTags.BOWS.get();`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public static TagKey<Item> ironIngots() {`
`@@ -52,7 +52,7 @@ public static TagKey<Item> copperIngots() {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public static TagKey<Item> netheriteIngots() {`
`55`		`- return Tags.Items.INGOTS_NETHER_BRICK;`
	`55`	`+ return Tags.Items.INGOTS_NETHERITE;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public static TagKey<Item> redstoneDusts() {`
`@@ -64,7 +64,7 @@ public static TagKey<Item> diamonds() {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public static TagKey<Item> glassBlocks() {`
`67`		`- return Tags.Items.GLASS;`
	`67`	`+ return OEForgeItemTags.GLASS_BLOCKS.get();`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public static TagKey<Item> glassPanes() {`
`@@ -84,7 +84,7 @@ public static ManualTagHolder<Item> enderPearls() {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public static ManualTagHolder<Item> stone() {`
`87`		`- return ManualTagHolder.of(() -> Tags.Items.STONE);`
	`87`	`+ return OEForgeItemTags.STONE.get();`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public static ManualTagHolder<Item> redstoneBlocks() {`