diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index 8b2ae5b..9147ff5 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -56,6 +56,7 @@ import thaumcraft.common.tiles.TileEldritchAltar; import thaumcraft.common.tiles.TileEldritchCap; import thaumcraft.common.tiles.TileEldritchObelisk; +import java.util.ArrayList; import java.util.List; /** @@ -163,7 +164,7 @@ public class ClientProxy extends CommonProxy { IResourceManager manager = Minecraft.getMinecraft().getResourceManager(); if(manager instanceof SimpleReloadableResourceManager) { SimpleReloadableResourceManager rm = (SimpleReloadableResourceManager) manager; - rm.registerReloadListener(new ResourceReloadListener()); + rm.registerReloadListener(ResourceReloadListener.getInstance()); } MinecraftForge.EVENT_BUS.register(EffectHandler.getInstance()); @@ -225,4 +226,11 @@ public class ClientProxy extends CommonProxy { } return null; } + + public final List clientActions = new ArrayList(); + + @Override + public void runDelayedClientSide(Runnable run) { + clientActions.add(run); + } } diff --git a/src/main/java/makeo/gadomancy/client/events/ClientHandler.java b/src/main/java/makeo/gadomancy/client/events/ClientHandler.java index 83ea7df..4d1841e 100644 --- a/src/main/java/makeo/gadomancy/client/events/ClientHandler.java +++ b/src/main/java/makeo/gadomancy/client/events/ClientHandler.java @@ -3,10 +3,14 @@ package makeo.gadomancy.client.events; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.network.FMLNetworkEvent; +import makeo.gadomancy.client.ClientProxy; import makeo.gadomancy.client.effect.EffectHandler; import makeo.gadomancy.client.util.FamiliarHandlerClient; +import makeo.gadomancy.common.Gadomancy; import net.minecraft.client.Minecraft; +import java.util.List; + /** * This class is part of the Gadomancy Mod * Gadomancy is Open Source and distributed under the @@ -27,6 +31,12 @@ public class ClientHandler { EffectHandler.getInstance().tick(); } + + List actions = ((ClientProxy)Gadomancy.proxy).clientActions; + while(actions.size() > 0) { + actions.get(0).run(); + actions.remove(0); + } } @SubscribeEvent diff --git a/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java b/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java index ac5fcf6..9e5e3d3 100644 --- a/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java +++ b/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java @@ -3,6 +3,7 @@ package makeo.gadomancy.client.events; import makeo.gadomancy.api.GadomancyApi; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.client.textures.GolemGuiTexture; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.utils.Injector; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.IResourceManager; @@ -22,9 +23,14 @@ import java.util.Map; * Created by makeo @ 03.10.2015 12:09 */ public class ResourceReloadListener implements IResourceManagerReloadListener { + public static final ResourceReloadListener instance = new ResourceReloadListener(); + public static ResourceReloadListener getInstance() { + return instance; + } + public static Map languageList; - public ResourceReloadListener() { + private ResourceReloadListener() { Injector instance = new Injector(new Injector(StringTranslate.class) .getField(Injector.findField(StringTranslate.class, StringTranslate.class))); languageList = instance.getField(instance.findField(Map.class)); @@ -32,8 +38,18 @@ public class ResourceReloadListener implements IResourceManagerReloadListener { @Override public void onResourceManagerReload(IResourceManager resourceManager) { + reloadGolemResources(); + } + + public void reloadGolemResources() { manipulateLanguageFile(); - registerTextureOverride(); + + Gadomancy.proxy.runDelayedClientSide(new Runnable() { + @Override + public void run() { + registerTextureOverride(); + } + }); } private void manipulateLanguageFile() { diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java index 3f34f1c..82a7137 100644 --- a/src/main/java/makeo/gadomancy/common/CommonProxy.java +++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java @@ -128,6 +128,8 @@ public class CommonProxy implements IGuiHandler { return null; } + public void runDelayedClientSide(Runnable run) { } + public Side getSide() { return this instanceof ClientProxy ? Side.CLIENT : Side.SERVER; } diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java b/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java index 904f3d8..c70d88c 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java @@ -23,7 +23,7 @@ public class ObsidianGolemType extends AdditionalGolemType { @Override public String getUnlocalizedName() { - return "item.ItemGolemPlacer.obsidian.name"; + return "item.ItemGolemPlacer.obsidian"; } private IIcon icon; @@ -44,6 +44,6 @@ public class ObsidianGolemType extends AdditionalGolemType { @Override public ResourceLocation getInvSlotTexture() { - return new SimpleResourceLocation("gui/default_slot.png"); + return new SimpleResourceLocation("gui/obsidian_slot.png"); } } diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java b/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java index 56fb7e2..2e50fc0 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java @@ -44,6 +44,6 @@ public class SilverwoodGolemType extends AdditionalGolemType { @Override public ResourceLocation getInvSlotTexture() { - return new SimpleResourceLocation("gui/default_slot.png"); + return new SimpleResourceLocation("gui/silverwood_slot.png"); } } diff --git a/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java b/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java index 30ee4a7..70c9d63 100644 --- a/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java @@ -2,6 +2,7 @@ package makeo.gadomancy.common.utils; import makeo.gadomancy.api.GadomancyApi; import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.client.events.ResourceReloadListener; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.entities.golems.types.RemovedGolemType; import net.minecraftforge.common.util.EnumHelper; @@ -145,6 +146,9 @@ public class GolemEnumHelper { } } } + + new Injector(EnumGolemType.class).setField("codeToTypeMapping", null); + ResourceReloadListener.getInstance().reloadGolemResources(); } private static void resetEnum() { diff --git a/src/main/resources/assets/gadomancy/textures/gui/obsidian_slot.png b/src/main/resources/assets/gadomancy/textures/gui/obsidian_slot.png new file mode 100644 index 0000000..2403b75 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/gui/obsidian_slot.png differ diff --git a/src/main/resources/assets/gadomancy/textures/gui/default_slot.png b/src/main/resources/assets/gadomancy/textures/gui/silverwood_slot.png similarity index 100% rename from src/main/resources/assets/gadomancy/textures/gui/default_slot.png rename to src/main/resources/assets/gadomancy/textures/gui/silverwood_slot.png diff --git a/src/main/resources/assets/gadomancy/textures/models/golem_obsidian.png b/src/main/resources/assets/gadomancy/textures/models/golem_obsidian.png index a10d5d9..5838bd8 100644 Binary files a/src/main/resources/assets/gadomancy/textures/models/golem_obsidian.png and b/src/main/resources/assets/gadomancy/textures/models/golem_obsidian.png differ