keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Updated The Json enum helper to point to the new packaged names. And fixed a casing change in ModLoader

Browse source
This commit is contained in:
LexManos 2012-03-03 18:16:43 -08:00
parent 25e57d950a
commit b2305b9d62
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
forge/forge_client/src/net/minecraft/src/forge/EnumHelperClient.java
View file

@ -1,6 +1,6 @@
package net.minecraft.src.forge; package net.minecraft.src.forge;
import net.minecraft.src.EnumJsonNodeType; import argo.jdom.JsonNodeType;
import net.minecraft.src.EnumOS2; import net.minecraft.src.EnumOS2;
import net.minecraft.src.EnumOptions; import net.minecraft.src.EnumOptions;
import net.minecraft.src.EnumRarity; import net.minecraft.src.EnumRarity;
@ -10,7 +10,7 @@ public class EnumHelperClient extends EnumHelper
private static Class[][] ctrs = private static Class[][] ctrs =
{ {
{EnumJsonNodeType.class}, {JsonNodeType.class},
{EnumOptions.class, String.class, boolean.class, boolean.class}, {EnumOptions.class, String.class, boolean.class, boolean.class},
{EnumOS2.class}, {EnumOS2.class},
{EnumRarity.class, int.class, String.class} {EnumRarity.class, int.class, String.class}
@ -19,14 +19,14 @@ public class EnumHelperClient extends EnumHelper
private static boolean[] decompiled = new boolean[ctrs.length]; private static boolean[] decompiled = new boolean[ctrs.length];
private static boolean isSetup = false; private static boolean isSetup = false;
public static EnumJsonNodeType addJsonNodeType(String name) public static JsonNodeType addJsonNodeType(String name)
{ {
if (!isSetup) if (!isSetup)
{ {
setup(); setup();
} }
return addEnum(decompiled[0], EnumJsonNodeType.class, name, return addEnum(decompiled[0], JsonNodeType.class, name,
new Class[] {}, new Class[] {},
new Object[] {}); new Object[] {});
} }

2
forge/forge_client/src/net/minecraft/src/forge/PacketHandlerClient.java
View file

@ -137,7 +137,7 @@ public class PacketHandlerClient implements IPacketHandler
{ {
e.printStackTrace(); e.printStackTrace();
ModLoader.getLogger().throwing("ForgeHooksClient", "onEntitySpawnPacket", e); ModLoader.getLogger().throwing("ForgeHooksClient", "onEntitySpawnPacket", e);
ModLoader.ThrowException(String.format("Error spawning entity of type %d for %s.", packet.typeID, MinecraftForge.getModByID(packet.modID)), e); ModLoader.throwException(String.format("Error spawning entity of type %d for %s.", packet.typeID, MinecraftForge.getModByID(packet.modID)), e);
} }
} }