GUIs working in FML for ML mods

This commit is contained in:
Christian committed 2012-08-20 21:44:28 -04:00
1 parent 52483ee6bd
commit 3a8b047e3c
10 files changed
+87 -19

No files matched your search

@@ -8,6 +8,8 @@ import java.util.Map.Entry;
import net.minecraft.client.Minecraft;
import net.minecraft.src.BaseMod;
import net.minecraft.src.Entity;
import net.minecraft.src.EntityClientPlayerMP;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.KeyBinding;
import net.minecraft.src.Render;
@@ -92,4 +94,11 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper
handler.addKeyBinding(keyHandler, allowRepeat);
KeyBindingRegistry.registerKeyBinding(handler);
}
@Override
public Object getClientGui(BaseModProxy mod, EntityPlayer player, int ID, int x, int y, int z)
{
return ((net.minecraft.src.BaseMod)mod).getContainerGUI((EntityClientPlayerMP) player, ID, x, y, z);
}
}
+1 -2
View File
@@ -234,8 +234,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
* @return
*/
@SideOnly(CLIENT)
@Override
public GuiScreen getContainerGUI(EntityPlayer player, int containerID, int x, int y, int z)
public GuiContainer getContainerGUI(EntityClientPlayerMP player, int containerID, int x, int y, int z)
{
return null;
}
+6 -7
View File
@@ -35,7 +35,6 @@ import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.common.asm.SideOnly;
import cpw.mods.fml.common.modloader.BaseModProxy;
import cpw.mods.fml.common.modloader.ModLoaderHelper;
import cpw.mods.fml.common.modloader.ModLoaderModContainer;
import cpw.mods.fml.common.network.NetworkRegistry;
@@ -573,7 +572,7 @@ public class ModLoader
GameRegistry.registerBlock(block, itemclass);
}
public static void registerContainerID(BaseModProxy mod, int id)
public static void registerContainerID(BaseMod mod, int id)
{
ModLoaderHelper.buildGuiHelper(mod, id);
}
@@ -604,7 +603,7 @@ public class ModLoader
}
@SideOnly(CLIENT)
public static void registerKey(BaseModProxy mod, KeyBinding keyHandler, boolean allowRepeat)
public static void registerKey(BaseMod mod, KeyBinding keyHandler, boolean allowRepeat)
{
ModLoaderClientHelper.registerKeyBinding(mod, keyHandler, allowRepeat);
}
@@ -616,7 +615,7 @@ public class ModLoader
* @param mod
* @param channel
*/
public static void registerPacketChannel(BaseModProxy mod, String channel)
public static void registerPacketChannel(BaseMod mod, String channel)
{
NetworkRegistry.instance().registerChannel(ModLoaderHelper.buildPacketHandlerFor(mod), channel);
}
@@ -751,7 +750,7 @@ public class ModLoader
//TODO
}
public static void serverOpenWindow(EntityPlayer player, Container container, int ID, int x, int y, int z)
public static void serverOpenWindow(EntityPlayerMP player, Container container, int ID, int x, int y, int z)
{
ModLoaderHelper.openGui(ID, player, container, x, y, z);
}
@@ -763,13 +762,13 @@ public class ModLoader
* @param enable indicates whether you want to recieve them or not
* @param useClock don't receive render subticks, just world ticks
*/
public static void setInGameHook(BaseModProxy mod, boolean enable, boolean useClock)
public static void setInGameHook(BaseMod mod, boolean enable, boolean useClock)
{
ModLoaderHelper.updateStandardTicks(mod, enable, useClock);
}
public static void setInGUIHook(BaseModProxy mod, boolean enable, boolean useClock)
public static void setInGUIHook(BaseMod mod, boolean enable, boolean useClock)
{
ModLoaderHelper.updateGUITicks(mod, enable, useClock);
}