From 0e34510032b34be224e835e1886f35feb27f58b4 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Tue, 17 Feb 2015 21:20:14 +0300 Subject: [PATCH] Removed event bus call from the ModelLoader --- .../java/net/minecraftforge/client/ForgeHooksClient.java | 1 + .../java/net/minecraftforge/client/model/ModelLoader.java | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index e236112dfd..93819a3ff8 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -284,6 +284,7 @@ public class ForgeHooksClient public static void onTextureStitchedPre(TextureMap map) { MinecraftForge.EVENT_BUS.post(new TextureStitchEvent.Pre(map)); + ModelLoader.White.instance.register(map); } public static void onTextureStitchedPost(TextureMap map) diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java index 6364608eab..d4b896ce1f 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -77,7 +77,6 @@ public class ModelLoader extends ModelBakery super(manager, map, shapes); VanillaLoader.instance.setLoader(this); ModelLoaderRegistry.clearModelCache(); - MinecraftForge.EVENT_BUS.register(White.instance); } @Override @@ -484,10 +483,9 @@ public class ModelLoader extends ModelBakery return false; } - @SubscribeEvent - public void handleStitchPre(TextureStitchEvent.Pre event) + public void register(TextureMap map) { - event.map.setTextureEntry(White.loc.toString(), White.instance); + map.setTextureEntry(White.loc.toString(), White.instance); } }