Updated to work with Forge client changes

TeamMetallurgy · Jul 9, 2022 · 6f78036 · 6f78036
1 parent 47caf85
commit 6f78036
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -56,9 +56,9 @@ minecraft {
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
-    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
-    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
+    //compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
+    //compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
+    //runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
     //compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-forge-1.18.1:${ct_version}")
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 minecraft_version=1.19
-forge_version=41.0.61
-mod_version=2.4.2
+forge_version=41.0.85
+mod_version=2.4.3
 jei_version=11.0.0.206
 ct_version=9.0.81
 

diff --git a/src/main/java/com/teammetallurgy/aquaculture/api/AquacultureAPI.java b/src/main/java/com/teammetallurgy/aquaculture/api/AquacultureAPI.java
@@ -35,7 +35,7 @@ public static RegistryObject<Item> registerFishMount(@Nonnull String name) {
     }
 
     public static class Tags {
-        public static final TagKey<Item> FILLET_KNIFE = tag("forge", "forge:tools/knives");
+        public static final TagKey<Item> FILLET_KNIFE = tag("forge", "tools/knives");
         public static final TagKey<Item> FISHING_LINE = tag(Aquaculture.MOD_ID, "fishing_line");
         public static final TagKey<Item> BOBBER = tag(Aquaculture.MOD_ID, "bobber");
         public static final TagKey<Item> TACKLE_BOX = tag(Aquaculture.MOD_ID, "tackle_box");

diff --git a/src/main/java/com/teammetallurgy/aquaculture/client/ClientHandler.java b/src/main/java/com/teammetallurgy/aquaculture/client/ClientHandler.java
@@ -28,8 +28,7 @@
 import net.minecraft.world.item.Item;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.EntityRenderersEvent;
-import net.minecraftforge.client.event.ModelRegistryEvent;
-import net.minecraftforge.client.model.ForgeModelBakery;
+import net.minecraftforge.client.event.ModelEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -90,13 +89,13 @@ public static void registerLayerDefinition(EntityRenderersEvent.RegisterLayerDef
     }
 
     @SubscribeEvent
-    public static void registerModels(ModelRegistryEvent event) {
-        ForgeModelBakery.addSpecialModel(FishMountRenderer.OAK);
-        ForgeModelBakery.addSpecialModel(FishMountRenderer.SPRUCE);
-        ForgeModelBakery.addSpecialModel(FishMountRenderer.BIRCH);
-        ForgeModelBakery.addSpecialModel(FishMountRenderer.JUNGLE);
-        ForgeModelBakery.addSpecialModel(FishMountRenderer.ACACIA);
-        ForgeModelBakery.addSpecialModel(FishMountRenderer.DARK_OAK);
+    public static void registerModels(ModelEvent.RegisterAdditional event) {
+        event.register(FishMountRenderer.OAK);
+        event.register(FishMountRenderer.SPRUCE);
+        event.register(FishMountRenderer.BIRCH);
+        event.register(FishMountRenderer.JUNGLE);
+        event.register(FishMountRenderer.ACACIA);
+        event.register(FishMountRenderer.DARK_OAK);
     }
 
     public static void registerFishingRodModelProperties(Item fishingRod) {

diff --git a/src/main/java/com/teammetallurgy/aquaculture/integration/jei/JEIIntegration.java b/src/main/java/com/teammetallurgy/aquaculture/integration/jei/JEIIntegration.java
@@ -1,4 +1,4 @@
-package com.teammetallurgy.aquaculture.integration.jei;
+/*package com.teammetallurgy.aquaculture.integration.jei;
 
 import com.teammetallurgy.aquaculture.Aquaculture;
 import com.teammetallurgy.aquaculture.integration.jei.recipes.FilletKnifeRecipeMaker;
@@ -26,4 +26,4 @@ public void registerRecipes(@Nonnull IRecipeRegistration registration) {
             registration.addRecipes(RecipeTypes.CRAFTING, FilletKnifeRecipeMaker.createFilletKnifeRecipes());
         }
     }
-}
+}*/
diff --git a/...n/java/com/teammetallurgy/aquaculture/integration/jei/recipes/FilletKnifeRecipeMaker.java b/...n/java/com/teammetallurgy/aquaculture/integration/jei/recipes/FilletKnifeRecipeMaker.java
@@ -1,4 +1,4 @@
-package com.teammetallurgy.aquaculture.integration.jei.recipes;
+/*package com.teammetallurgy.aquaculture.integration.jei.recipes;
 
 import com.teammetallurgy.aquaculture.Aquaculture;
 import com.teammetallurgy.aquaculture.api.AquacultureAPI;
@@ -36,4 +36,4 @@ public static List<CraftingRecipe> createFilletKnifeRecipes() {
         }
         return recipes;
     }
-}
+}*/
diff --git a/src/main/java/com/teammetallurgy/aquaculture/item/BlockItemWithoutLevelRenderer.java b/src/main/java/com/teammetallurgy/aquaculture/item/BlockItemWithoutLevelRenderer.java
@@ -5,7 +5,7 @@
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.level.block.Block;
-import net.minecraftforge.client.IItemRenderProperties;
+import net.minecraftforge.client.extensions.common.IClientItemExtensions;
 
 import javax.annotation.Nonnull;
 import java.util.function.Consumer;
@@ -17,11 +17,10 @@ public BlockItemWithoutLevelRenderer(Block block, Properties properties) {
     }
 
     @Override
-    public void initializeClient(@Nonnull Consumer<IItemRenderProperties> consumer) {
-        if (Minecraft.getInstance() == null) return;
-        consumer.accept(new IItemRenderProperties() {
+    public void initializeClient(@Nonnull Consumer<IClientItemExtensions> consumer) {
+        consumer.accept(new IClientItemExtensions() {
             @Override
-            public BlockEntityWithoutLevelRenderer getItemStackRenderer() {
+            public BlockEntityWithoutLevelRenderer getCustomRenderer() {
                 return new AquaItemRenderer(Minecraft.getInstance().getBlockEntityRenderDispatcher(), Minecraft.getInstance().getEntityModels());
             }
         });

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -17,6 +17,6 @@ license="All Rights Reserved"
 [[dependencies.aquaculture]]
     modId="forge"
     mandatory=true
-    versionRange="[41.0.46,)"
+    versionRange="[41.0.64,)"
     ordering="AFTER"
     side="BOTH"