From 5fb948fb355d765b4be88ffdd194bff3fa7d3ec0 Mon Sep 17 00:00:00 2001 From: tterrag Date: Fri, 21 Jun 2019 19:34:58 -0400 Subject: [PATCH] Fix #5805 ModelBakeEvent does not fire --- .../client/renderer/model/ModelManager.java.patch | 8 ++++++++ .../java/net/minecraftforge/client/ForgeHooksClient.java | 2 +- .../net/minecraftforge/client/event/ModelBakeEvent.java | 7 ++++--- .../java/net/minecraftforge/client/model/ModelLoader.java | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/model/ModelManager.java.patch b/patches/minecraft/net/minecraft/client/renderer/model/ModelManager.java.patch index 3070d9a441..1db5930104 100644 --- a/patches/minecraft/net/minecraft/client/renderer/model/ModelManager.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/model/ModelManager.java.patch @@ -26,3 +26,11 @@ p_212854_2_.func_219897_b(); return modelbakery; } +@@ -47,6 +53,7 @@ + p_212853_1_.func_217844_a(p_212853_3_); + this.field_174958_a = p_212853_1_.func_217846_a(); + this.field_174955_d = this.field_174958_a.get(ModelBakery.field_177604_a); ++ net.minecraftforge.client.ForgeHooksClient.onModelBake(this, this.field_174958_a, (net.minecraftforge.client.model.ModelLoader) p_212853_1_); + p_212853_3_.func_219895_b("cache"); + this.field_174957_c.func_178124_c(); + p_212853_3_.func_76319_b(); diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 539f1476f9..34b35db1c3 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -371,7 +371,7 @@ public class ForgeHooksClient MinecraftForge.EVENT_BUS.post(new EntityViewRenderEvent.RenderFogEvent(fogRenderer, renderer, info, partial, mode, distance)); } - public static void onModelBake(ModelManager modelManager, Map modelRegistry, ModelLoader modelLoader) + public static void onModelBake(ModelManager modelManager, Map modelRegistry, ModelLoader modelLoader) { MinecraftForge.EVENT_BUS.post(new ModelBakeEvent(modelManager, modelRegistry, modelLoader)); modelLoader.onPostBakeEvent(modelRegistry); diff --git a/src/main/java/net/minecraftforge/client/event/ModelBakeEvent.java b/src/main/java/net/minecraftforge/client/event/ModelBakeEvent.java index b45b9bdad1..658cf62f43 100644 --- a/src/main/java/net/minecraftforge/client/event/ModelBakeEvent.java +++ b/src/main/java/net/minecraftforge/client/event/ModelBakeEvent.java @@ -24,6 +24,7 @@ import java.util.Map; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ModelManager; import net.minecraft.client.renderer.model.ModelResourceLocation; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; /** @@ -34,10 +35,10 @@ import net.minecraftforge.client.model.ModelLoader; public class ModelBakeEvent extends net.minecraftforge.eventbus.api.Event { private final ModelManager modelManager; - private final Map modelRegistry; + private final Map modelRegistry; private final ModelLoader modelLoader; - public ModelBakeEvent(ModelManager modelManager, Map modelRegistry, ModelLoader modelLoader) + public ModelBakeEvent(ModelManager modelManager, Map modelRegistry, ModelLoader modelLoader) { this.modelManager = modelManager; this.modelRegistry = modelRegistry; @@ -49,7 +50,7 @@ public class ModelBakeEvent extends net.minecraftforge.eventbus.api.Event return modelManager; } - public Map getModelRegistry() + public Map getModelRegistry() { return modelRegistry; } diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java index 532b77ba2f..ef415efa31 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -943,7 +943,7 @@ public final class ModelLoader extends ModelBakery /** * Internal, do not use. */ - public void onPostBakeEvent(Map modelRegistry) + public void onPostBakeEvent(Map modelRegistry) { IBakedModel missingModel = modelRegistry.get(MODEL_MISSING); for(Map.Entry entry : loadingExceptions.entrySet())