Compare commits

...
9 Commits
Author SHA1 Message Date
Christian 6dadc1d889 Fix up references to minecraftDir in obf code 2012-10-23 18:10:06 -04:00
Christian 8a55f68a18 Update FML for Minecraft 1.4.1 2012-10-23 18:00:33 -04:00
LexManos 5645fa5847 First update to 1.4.1, patches need updating. 2012-10-23 14:44:04 -07:00
LexManos ff0f00f64f Add some null checks, and throw descriptive exception when SideTransformer prevents a class from loading. 2012-10-23 13:32:02 -07:00
Christian 7a34246dc9 Ship a client only class so the merge works both sides. 2012-10-21 22:50:20 -04:00
Christian 62a6b52487 Fix RenderRegistry render ID - now at 36
Fix SpriteMaps - they're running out fast! Switch to forge if you can!
RenderBiped now has an armorlist- so armortypes add to it as well
2012-10-21 12:41:53 -04:00
Christian b845cde73d Fix up FML python script for forge 2012-10-21 08:19:36 -04:00
Christian 2c36dfbb34 Update to MCP pre 3. Fixes some weirdnesses with explosions. 2012-10-21 07:11:09 -04:00
Christian acd880dd2a Merge branch '1.4' 2012-10-20 18:07:22 -04:00
22 changed files with 15600 additions and 15551 deletions

No files matched your search

+14 -14
View File
@@ -34,7 +34,7 @@ public class SpriteHelper
SpriteHelper.toBitSet( SpriteHelper.toBitSet(
"0000000000000000" + "0000000000000000" +
"0000000000110000" + "0000000000110000" +
"0000000001100000" + "0000000000100000" +
"0000000001100000" + "0000000001100000" +
"0000000000000000" + "0000000000000000" +
"0000000000000000" + "0000000000000000" +
@@ -43,10 +43,10 @@ public class SpriteHelper
"0000000000000000" + "0000000000000000" +
"0000000000000000" + "0000000000000000" +
"0000000000000000" + "0000000000000000" +
"0000000011111111" + "0000000000011111" +
"0000000011111000" + "0000000000000000" +
"0000000111111100" + "0000000001111100" +
"0000000111111000" + "0000000001111000" +
"0000000000000000"); "0000000000000000");
spriteInfo.put("/terrain.png", slots); spriteInfo.put("/terrain.png", slots);
@@ -57,15 +57,15 @@ public class SpriteHelper
"0000000000000000" + "0000000000000000" +
"0000000000000000" + "0000000000000000" +
"0000000000000000" + "0000000000000000" +
"0000001000000000" + "0000000000000000" +
"0000001110000000" + "0000000000000000" +
"0000001000000000" + "0000000000000000" +
"1111101010000000" + "0111100000000000" +
"1111101010000000" + "1111100010000000" +
"1111101110000000" + "0000101110000000" +
"1111111111110000" + "0111000000000000" +
"1111111111111111" + "1100001100001111" +
"1111111111111111" + "0000000000001111" +
"0000000000000000"); "0000000000000000");
spriteInfo.put("/gui/items.png", slots); spriteInfo.put("/gui/items.png", slots);
} }
@@ -7,6 +7,7 @@ import net.minecraft.src.Block;
import net.minecraft.src.Entity; import net.minecraft.src.Entity;
import net.minecraft.src.IBlockAccess; import net.minecraft.src.IBlockAccess;
import net.minecraft.src.Render; import net.minecraft.src.Render;
import net.minecraft.src.RenderBiped;
import net.minecraft.src.RenderBlocks; import net.minecraft.src.RenderBlocks;
import net.minecraft.src.RenderManager; import net.minecraft.src.RenderManager;
import net.minecraft.src.RenderPlayer; import net.minecraft.src.RenderPlayer;
@@ -26,7 +27,7 @@ public class RenderingRegistry
{ {
private static final RenderingRegistry INSTANCE = new RenderingRegistry(); private static final RenderingRegistry INSTANCE = new RenderingRegistry();
private int nextRenderId = 32; private int nextRenderId = 36;
private Map<Integer, ISimpleBlockRenderingHandler> blockRenderers = Maps.newHashMap(); private Map<Integer, ISimpleBlockRenderingHandler> blockRenderers = Maps.newHashMap();
@@ -40,6 +41,7 @@ public class RenderingRegistry
public static int addNewArmourRendererPrefix(String armor) public static int addNewArmourRendererPrefix(String armor)
{ {
RenderPlayer.field_77110_j = ObjectArrays.concat(RenderPlayer.field_77110_j, armor); RenderPlayer.field_77110_j = ObjectArrays.concat(RenderPlayer.field_77110_j, armor);
RenderBiped.field_82424_k = RenderPlayer.field_77110_j;
return RenderPlayer.field_77110_j.length - 1; return RenderPlayer.field_77110_j.length - 1;
} }
@@ -145,6 +145,7 @@ public class AccessTransformer implements IClassTransformer
@Override @Override
public byte[] transform(String name, byte[] bytes) public byte[] transform(String name, byte[] bytes)
{ {
if (bytes == null) { return null; }
if (!modifiers.containsKey(name)) { return bytes; } if (!modifiers.containsKey(name)) { return bytes; }
ClassNode classNode = new ClassNode(); ClassNode classNode = new ClassNode();
@@ -288,7 +288,7 @@ public class MCPMerger
reader.accept(classNode, 0); reader.accept(classNode, 0);
if (!classNode.name.equals("bcs")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad. if (!classNode.name.equals("bct")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad.
{ {
if (classNode.visibleAnnotations == null) classNode.visibleAnnotations = new ArrayList<AnnotationNode>(); if (classNode.visibleAnnotations == null) classNode.visibleAnnotations = new ArrayList<AnnotationNode>();
classNode.visibleAnnotations.add(getSideAnn(isClientOnly)); classNode.visibleAnnotations.add(getSideAnn(isClientOnly));
@@ -89,6 +89,7 @@ public class MarkerTransformer implements IClassTransformer
@Override @Override
public byte[] transform(String name, byte[] bytes) public byte[] transform(String name, byte[] bytes)
{ {
if (bytes == null) { return null; }
if (!markers.containsKey(name)) { return bytes; } if (!markers.containsKey(name)) { return bytes; }
ClassNode classNode = new ClassNode(); ClassNode classNode = new ClassNode();
@@ -23,6 +23,8 @@ public class SideTransformer implements IClassTransformer
@Override @Override
public byte[] transform(String name, byte[] bytes) public byte[] transform(String name, byte[] bytes)
{ {
if (bytes == null) { return null; }
ClassNode classNode = new ClassNode(); ClassNode classNode = new ClassNode();
ClassReader classReader = new ClassReader(bytes); ClassReader classReader = new ClassReader(bytes);
classReader.accept(classNode, 0); classReader.accept(classNode, 0);
@@ -33,7 +35,7 @@ public class SideTransformer implements IClassTransformer
{ {
System.out.println(String.format("Attempted to load class %s for invalid side %s", classNode.name, SIDE)); System.out.println(String.format("Attempted to load class %s for invalid side %s", classNode.name, SIDE));
} }
return null; throw new RuntimeException(String.format("Attempted to load class %s for invalid side %s", classNode.name, SIDE));
} }
Iterator<FieldNode> fields = classNode.fields.iterator(); Iterator<FieldNode> fields = classNode.fields.iterator();
@@ -120,7 +120,7 @@ public class FMLRelauncher
private Class<? super Object> setupNewClientHome(File minecraftHome) private Class<? super Object> setupNewClientHome(File minecraftHome)
{ {
Class<? super Object> client = ReflectionHelper.getClass(classLoader, "net.minecraft.client.Minecraft"); Class<? super Object> client = ReflectionHelper.getClass(classLoader, "net.minecraft.client.Minecraft");
ReflectionHelper.setPrivateValue(client, null, minecraftHome, "field_71463_am", "am", "minecraftDir"); ReflectionHelper.setPrivateValue(client, null, minecraftHome, "field_71463_am", "an", "minecraftDir");
return client; return client;
} }
@@ -188,7 +188,7 @@ public class FMLRelauncher
if (str != null) if (str != null)
{ {
str = str.replace('/', File.separatorChar); str = str.replace('/', File.separatorChar);
ReflectionHelper.setPrivateValue(mcMaster, null, new File(str), "minecraftDir", "am", "minecraftDir"); ReflectionHelper.setPrivateValue(mcMaster, null, new File(str), "minecraftDir", "an", "minecraftDir");
} }
// We force minecraft to setup it's homedir very early on so we can // We force minecraft to setup it's homedir very early on so we can
// inject stuff into it // inject stuff into it
@@ -201,7 +201,7 @@ public class FMLRelauncher
{ {
// Hmmm // Hmmm
} }
File minecraftHome = ReflectionHelper.getPrivateValue(mcMaster, null, "field_71463_am", "am", "minecraftDir"); File minecraftHome = ReflectionHelper.getPrivateValue(mcMaster, null, "field_71463_am", "an", "minecraftDir");
return minecraftHome; return minecraftHome;
} }
+55 -55
View File
@@ -1,71 +1,71 @@
#Main FML Access Transformer configuration file #Main FML Access Transformer configuration file
# TileEntity addMapping # TileEntity addMapping
public aml.a(Ljava/lang/Class;Ljava/lang/String;)V public amm.a(Ljava/lang/Class;Ljava/lang/String;)V # TileEntity/func_70306_a
# EntityList addMappings # EntityList addMappings
public le.a(Ljava/lang/Class;Ljava/lang/String;I)V public lf.a(Ljava/lang/Class;Ljava/lang/String;I)V # EntityList/func_75618_a
public le.a(Ljava/lang/Class;Ljava/lang/String;III)V public lf.a(Ljava/lang/Class;Ljava/lang/String;III)V # EntityList/func_75614_a
# EntityList nameToClassMap and idToClassMap and classToNameMap public lf.b # EntityList/field_75625_b nameToClassMap
public le.b public lf.c # EntityList/field_75626_c classToNameMap
public le.d public lf.d # EntityList/field_75623_d idToClassMap
public le.c
# RenderEngine # RenderEngine
public azb.h # textureList public azc.h # RenderEngine/field_78367_h textureList
public azb.k # texturePack public azc.k # RenderEngine/field_78366_k texturePack
# RenderManager renderers # RenderManager
public azv.o public azw.o # RenderManager/field_78729_o renderers
# RenderBlocks - everything # RenderBlocks - everything
public azc.* public azd.*
public azc.*() public azd.*()
#RenderPlayer - make armorlist public and not final #RenderPlayer
public-f bap.h public-f baq.h # RenderPlayer/field_77110_j armorlist
#StringTranslate - make the current table and language public #RenderBiped
public bd.b public-f bae.k # RenderBiped/field_82424_k armorlist
public bd.d #StringTranslate
# TileEntityRenderer - make the list of renderers public public be.b # StringTranslate/field_74815_b
public bbx.m public be.d # StringTranslate/field_74813_d
# TileEntityRenderer
public bby.m # TileEntityRenderer/field_76966_m
# CraftingManager - make the add recipe methods public # CraftingManager - make the add recipe methods public
public vp.a(Ltu;[Ljava/lang/Object;)V public vq.a(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77595_a
public vp.b(Ltu;[Ljava/lang/Object;)V public vq.b(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77596_b
# WeightedRandomItem - make the "probability" public # WeightedRandomItem
public kf.a public kg.a # WeightedRandomItem/field_76292_a probability
# ItemStack - make itemId final # ItemStack
#public+f tu.c #public+f tv.c # ItemStack/field_77993_c itemId
# StatBase - Make statName public, no server side getter # StatBase
public jb.a public jc.a # StatBase/field_75978_a statName
# NetLoginHandler make the "complete connection" callback public so I can reset it during FML negotiation # NetLoginHandler
public ij.a(Lij;Z)Z public ik.a(Lik;Z)Z # NetLoginHandler/func_72531_a 'complete connection'
# NetLoginHandler userName field public ik.h # NetLoginHandler/field_72543_h userName
public ij.h
# EntityPlayerMP getNextWindowId # EntityPlayerMP getNextWindowId
public ig.cd()V public ih.cd()V # EntityPlayerMP/func_71117_bO
public ig.cu public ih.cv # EntityPlayerMP/field_71139_cq
# EntityAITaskEntry class -> public # EntityAITaskEntry
public mn public mo
# EntityAITasks taskList # EntityAITasks
public mm.a public mmn.a # EntityAITasks/field_75782_a taskList
# BlockChest isOcelotBlockingChest (a bounding box check actually) # BlockChest
public ahy.n(Lxd;III)Z public ahy.n(Lxd;III)Z # BlockChest/func_72292_n isOcelotBlockingChest
# EntityLiving # EntityLiving
public lm.aS # carryoverDamage public ln.aS # EntityLiving/field_70736_aM carryoverDamage
public lm.bn # tasks public ln.bn # EntityLiving/field_70714_bg tasks
public lm.bF # isJumping public ln.bG # EntityLiving/field_70703_bu isJumping
# EntityAIOcelotSit # EntityAIOcelotSit
protected mz.a(Lxd;III)Z # nearestSittableBlock protected na.a(Lxe;III)Z # EntityAIOcelotSit/func_75398_a nearestSittableBlock
protected mz.f()Z # isblocksittable protected na.f()Z # EntityAIOcelotSit/func_75399_f isblocksittable
# CallableMinecraftVersion - sanity check the MC version # CallableMinecraftVersion - sanity check the MC version
public b public b
public b.<init>(La;)V # constructor public b.<init>(La;)V # constructor
# EntityAnimal # EntityAnimal
public og.d # inLove public oh.d # EntityAnimal/field_70881_d inLove
# WorldType # WorldType
public xo.<init>(ILjava/lang/String;)V public xp.<init>(ILjava/lang/String;)V
public xo.<init>(ILjava/lang/String;I)V public xp.<init>(ILjava/lang/String;I)V
# ComponentVillage # ComponentVillage
public aep public aeq
# EntityVillager - addbuy and addsell and minmax lists # EntityVillager - minmax lists
public qc.a(Lwv;ILjava/util/Random;F)V public qd.a(Lww;ILjava/util/Random;F)V # EntityVillager/func_70948_a addBuy
public qc.b(Lwv;ILjava/util/Random;F)V public qd.b(Lww;ILjava/util/Random;F)V # EntityVillager/func_70949_b addSell
public qc.bO public qd.bP # EntityVillager/field_70958_bB
public qc.bP public qd.bQ # EntityVillager/field_70960_bC
# GuiButtonMerchant # GuiButtonMerchant
public aul public aum
+3 -3
View File
@@ -2,11 +2,11 @@
# Only runs at runtime because it's not necessary at compile time # Only runs at runtime because it's not necessary at compile time
# has deobf and obf mappings so it runs OK in mcp # has deobf and obf mappings so it runs OK in mcp
# entityplayer -> network/player # entityplayer -> network/player
qf cpw/mods/fml/common/network/Player qg cpw/mods/fml/common/network/Player
net.minecraft.src.EntityPlayer cpw/mods/fml/common/network/Player net.minecraft.src.EntityPlayer cpw/mods/fml/common/network/Player
# block -> blockproxy # block -> blockproxy
ale cpw/mods/fml/common/registry/BlockProxy alf cpw/mods/fml/common/registry/BlockProxy
net.minecraft.src.Block cpw/mods/fml/common/registry/BlockProxy net.minecraft.src.Block cpw/mods/fml/common/registry/BlockProxy
# item -> itemproxy # item -> itemproxy
ts cpw/mods/fml/common/registry/ItemProxy tt cpw/mods/fml/common/registry/ItemProxy
net.minecraft.src.Item cpw/mods/fml/common/registry/ItemProxy net.minecraft.src.Item cpw/mods/fml/common/registry/ItemProxy
+15443 -15413
View File
File diff suppressed because it is too large. Load diff
+2 -2
View File
@@ -36,8 +36,8 @@ DirNatives = %(DirJars)s/bin/natives
Client = %(DirJars)s/bin/minecraft.jar Client = %(DirJars)s/bin/minecraft.jar
Server = %(DirJars)s/minecraft_server.jar Server = %(DirJars)s/minecraft_server.jar
LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
MD5Client = 32a654388b54d3e4bb29c1a46e7d6a12 MD5Client = 542621a5298659dc65f383f35170fc4c
MD5Server = 99f84541e184979c5b0312e9afc56ce1 MD5Server = 736ffcb0d9f36d47de96a6923ec82699
[RETROGUARD] [RETROGUARD]
Location = %(DirRuntime)s/bin/retroguard.jar Location = %(DirRuntime)s/bin/retroguard.jar
+24 -10
View File
@@ -41,10 +41,6 @@ p_70038_1_,par1,2
p_70038_3_,par3,2 p_70038_3_,par3,2
p_70038_5_,par5,2 p_70038_5_,par5,2
p_70039_1_,par1NBTTagCompound,2 p_70039_1_,par1NBTTagCompound,2
p_70041_1_,par1,2
p_70041_2_,par2,2
p_70041_3_,par3,2
p_70041_4_,par4,2
p_70048_1_,par1,2 p_70048_1_,par1,2
p_70048_3_,par3,2 p_70048_3_,par3,2
p_70048_5_,par5,2 p_70048_5_,par5,2
@@ -132,11 +128,6 @@ p_70227_1_,par1MovingObjectPosition,2
p_70239_1_,par1,2 p_70239_1_,par1,2
p_70240_1_,par1,2 p_70240_1_,par1,2
p_70243_1_,par1,2 p_70243_1_,par1,2
p_70244_1_,par1,2
p_70244_3_,par3,2
p_70244_5_,par5,2
p_70244_7_,par7,2
p_70244_8_,par8,2
p_70265_1_,par1,2 p_70265_1_,par1,2
p_70266_1_,par1,2 p_70266_1_,par1,2
p_70269_1_,par1,2 p_70269_1_,par1,2
@@ -2010,7 +2001,6 @@ p_72874_1_,par1,2
p_72874_2_,par2,2 p_72874_2_,par2,2
p_72875_1_,par1AxisAlignedBB,2 p_72875_1_,par1AxisAlignedBB,2
p_72875_2_,par2Material,2 p_72875_2_,par2Material,2
p_72876_10_,par10,2
p_72876_1_,par1Entity,2 p_72876_1_,par1Entity,2
p_72876_2_,par2,2 p_72876_2_,par2,2
p_72876_4_,par4,2 p_72876_4_,par4,2
@@ -7056,6 +7046,29 @@ p_82869_1_,par1EntityPlayer,2
p_82870_1_,par1EntityPlayer,2 p_82870_1_,par1EntityPlayer,2
p_82870_2_,par2ItemStack,2 p_82870_2_,par2ItemStack,2
p_82877_1_,par1,2 p_82877_1_,par1,2
p_83010_1_,par1World,2
p_83010_2_,par2,2
p_83010_3_,par3,2
p_83010_4_,par4,2
p_83010_5_,par5,2
p_83011_1_,par1World,2
p_83011_2_,par2,2
p_83011_3_,par3,2
p_83011_4_,par4,2
p_83011_5_,par5,2
p_83018_1_,par1Block,2
p_83019_11_,par11,2
p_83019_1_,par1,2
p_83019_3_,par3,2
p_83019_5_,par5,2
p_83019_7_,par7,2
p_83019_9_,par9,2
p_83020_11_,par11,2
p_83020_1_,par1,2
p_83020_3_,par3,2
p_83020_5_,par5,2
p_83020_7_,par7,2
p_83020_9_,par9,2
p_accept_1_,par1File,2 p_accept_1_,par1File,2
p_accept_2_,par2Str,2 p_accept_2_,par2Str,2
p_actionPerformed_1_,par1ActionEvent,2 p_actionPerformed_1_,par1ActionEvent,2
@@ -9864,6 +9877,7 @@ p_i5109_1_,par1Vec3Pool,2
p_i5109_2_,par2,2 p_i5109_2_,par2,2
p_i5109_4_,par4,2 p_i5109_4_,par4,2
p_i5109_6_,par6,2 p_i5109_6_,par6,2
p_i6000_1_,par1CrashReport,2
p_implies_1_,par1Permission,2 p_implies_1_,par1Permission,2
p_init_1_,par1,2 p_init_1_,par1,2
p_init_2_,par2CipherParameters,2 p_init_2_,par2CipherParameters,2
1 param name side
41 p_70038_3_ par3 2
42 p_70038_5_ par5 2
43 p_70039_1_ par1NBTTagCompound 2
p_70041_1_ par1 2
p_70041_2_ par2 2
p_70041_3_ par3 2
p_70041_4_ par4 2
44 p_70048_1_ par1 2
45 p_70048_3_ par3 2
46 p_70048_5_ par5 2
128 p_70239_1_ par1 2
129 p_70240_1_ par1 2
130 p_70243_1_ par1 2
p_70244_1_ par1 2
p_70244_3_ par3 2
p_70244_5_ par5 2
p_70244_7_ par7 2
p_70244_8_ par8 2
131 p_70265_1_ par1 2
132 p_70266_1_ par1 2
133 p_70269_1_ par1 2
2001 p_72874_2_ par2 2
2002 p_72875_1_ par1AxisAlignedBB 2
2003 p_72875_2_ par2Material 2
p_72876_10_ par10 2
2004 p_72876_1_ par1Entity 2
2005 p_72876_2_ par2 2
2006 p_72876_4_ par4 2
7046 p_82870_1_ par1EntityPlayer 2
7047 p_82870_2_ par2ItemStack 2
7048 p_82877_1_ par1 2
7049 p_83010_1_ par1World 2
7050 p_83010_2_ par2 2
7051 p_83010_3_ par3 2
7052 p_83010_4_ par4 2
7053 p_83010_5_ par5 2
7054 p_83011_1_ par1World 2
7055 p_83011_2_ par2 2
7056 p_83011_3_ par3 2
7057 p_83011_4_ par4 2
7058 p_83011_5_ par5 2
7059 p_83018_1_ par1Block 2
7060 p_83019_11_ par11 2
7061 p_83019_1_ par1 2
7062 p_83019_3_ par3 2
7063 p_83019_5_ par5 2
7064 p_83019_7_ par7 2
7065 p_83019_9_ par9 2
7066 p_83020_11_ par11 2
7067 p_83020_1_ par1 2
7068 p_83020_3_ par3 2
7069 p_83020_5_ par5 2
7070 p_83020_7_ par7 2
7071 p_83020_9_ par9 2
7072 p_accept_1_ par1File 2
7073 p_accept_2_ par2Str 2
7074 p_actionPerformed_1_ par1ActionEvent 2
9877 p_i5109_2_ par2 2
9878 p_i5109_4_ par4 2
9879 p_i5109_6_ par6 2
9880 p_i6000_1_ par1CrashReport 2
9881 p_implies_1_ par1Permission 2
9882 p_init_1_ par1 2
9883 p_init_2_ par2CipherParameters 2
+3 -3
View File
@@ -1,4 +1,4 @@
[VERSION] [VERSION]
MCPVersion = 7.17 MCPVersion = 7.18
ClientVersion = 1.4 ClientVersion = 1.4.1
ServerVersion = 1.4 ServerVersion = 1.4.1
+4 -4
View File
@@ -61,8 +61,8 @@ def pre_decompile(mcp_dir, fml_dir):
with open(server_jar, 'rb') as fh: with open(server_jar, 'rb') as fh:
md5_s = md5(fh.read()).hexdigest() md5_s = md5(fh.read()).hexdigest()
clean_c = "32a654388b54d3e4bb29c1a46e7d6a12" clean_c = "542621a5298659dc65f383f35170fc4c"
clean_s = "99f84541e184979c5b0312e9afc56ce1" clean_s = "736ffcb0d9f36d47de96a6923ec82699"
if not md5_c == clean_c: if not md5_c == clean_c:
print 'Warning, Modified Client jar detected' print 'Warning, Modified Client jar detected'
@@ -386,9 +386,9 @@ def finish_setup_fml(fml_dir, mcp_dir):
from runtime.updatemcp import updatemcp from runtime.updatemcp import updatemcp
os.chdir(mcp_dir) os.chdir(mcp_dir)
updatenames(None, True) updatenames(None, True, False, False)
reset_logger() reset_logger()
updatemd5(None, True) updatemd5(None, True, False, False)
reset_logger() reset_logger()
os.chdir(fml_dir) os.chdir(fml_dir)
+12 -12
View File
@@ -1,15 +1,14 @@
>ot >ou
>iy >iZ
>xc >xD
>wz >xa
>ang >anh
>anl >anm
>jm
>ue
>agy
>jn >jn
<fn >uf
<hl >agz
>jo
<fo
<hm <hm
<hn <hn
<ho <ho
@@ -17,4 +16,5 @@
<hq <hq
<hr <hr
<hs <hs
<ht <ht
<hu
@@ -9,16 +9,3 @@
import java.util.Random; import java.util.Random;
public class BlockDispenser extends BlockContainer public class BlockDispenser extends BlockContainer
@@ -278,7 +280,11 @@
{
float var15 = 1.1F;
byte var16 = 6;
-
+ int modDispense = GameRegistry.tryDispense(p_72283_1_, p_72283_4_, p_72283_5_, p_72283_6_, p_72283_7_, p_72283_8_, p_72283_2_, p_72283_3_, p_72283_9_, p_72283_11_, p_72283_13_);
+ if (modDispense > -1)
+ {
+ return modDispense;
+ }
if (p_72283_2_.field_77993_c == Item.field_77704_l.field_77779_bT)
{
EntityArrow var28 = new EntityArrow(p_72283_1_, p_72283_9_, p_72283_11_, p_72283_13_);
@@ -7,10 +7,10 @@
import cpw.mods.fml.common.Side; import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly; import cpw.mods.fml.common.asm.SideOnly;
import java.io.File; import java.io.File;
@@ -39,6 +40,7 @@ @@ -40,6 +41,7 @@
this.func_71500_a("Java VM Version", new CallableJavaInfo2(this));
this.func_71500_a("Memory", new CallableMemoryInfo(this)); this.func_71500_a("Memory", new CallableMemoryInfo(this));
this.func_71500_a("JVM Flags", new CallableJVMFlags(this)); this.func_71500_a("JVM Flags", new CallableJVMFlags(this));
this.func_71500_a("AABB Pool Size", new CallableCrashMemoryReport(this));
+ FMLCommonHandler.instance().enhanceCrashReport(this); + FMLCommonHandler.instance().enhanceCrashReport(this);
} }
@@ -27,7 +27,7 @@
} }
public int func_82145_z() public int func_82145_z()
@@ -1697,4 +1702,9 @@ @@ -1700,4 +1705,9 @@
{ {
return this.func_82241_s(1); return this.func_82241_s(1);
} }
@@ -0,0 +1,12 @@
--- ../src-base/common/net/minecraft/src/IBossDisplayData.java
+++ ../src-work/common/net/minecraft/src/IBossDisplayData.java
@@ -1,9 +1,5 @@
package net.minecraft.src;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
-
-@SideOnly(Side.CLIENT)
public interface IBossDisplayData
{
int func_70667_aM();
@@ -1,6 +1,6 @@
--- ../src-base/common/net/minecraft/src/World.java --- ../src-base/common/net/minecraft/src/World.java
+++ ../src-work/common/net/minecraft/src/World.java +++ ../src-work/common/net/minecraft/src/World.java
@@ -3473,7 +3473,7 @@ @@ -3475,7 +3475,7 @@
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public double func_72919_O() public double func_72919_O()
{ {
@@ -31,7 +31,7 @@
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public abstract class Minecraft implements Runnable, IPlayerUsage public abstract class Minecraft implements Runnable, IPlayerUsage
@@ -311,7 +320,7 @@ @@ -312,7 +321,7 @@
this.func_71357_I(); this.func_71357_I();
this.field_71466_p = new FontRenderer(this.field_71474_y, "/font/default.png", this.field_71446_o, false); this.field_71466_p = new FontRenderer(this.field_71474_y, "/font/default.png", this.field_71446_o, false);
this.field_71464_q = new FontRenderer(this.field_71474_y, "/font/alternate.png", this.field_71446_o, false); this.field_71464_q = new FontRenderer(this.field_71474_y, "/font/alternate.png", this.field_71446_o, false);
@@ -40,7 +40,7 @@
if (this.field_71474_y.field_74363_ab != null) if (this.field_71474_y.field_74363_ab != null)
{ {
StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab); StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab);
@@ -356,6 +365,8 @@ @@ -357,6 +366,8 @@
GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d); GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o); this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
@@ -49,7 +49,7 @@
try try
{ {
this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this); this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this);
@@ -384,6 +395,7 @@ @@ -385,6 +396,7 @@
{ {
this.func_71352_k(); this.func_71352_k();
} }
@@ -57,7 +57,7 @@
} }
private void func_71357_I() throws LWJGLException private void func_71357_I() throws LWJGLException
@@ -742,9 +754,11 @@ @@ -743,9 +755,11 @@
if (!this.field_71454_w) if (!this.field_71454_w)
{ {
@@ -69,7 +69,7 @@
} }
GL11.glFlush(); GL11.glFlush();
@@ -1270,11 +1284,13 @@ @@ -1271,11 +1285,13 @@
public void func_71407_l() public void func_71407_l()
{ {
@@ -83,7 +83,7 @@
this.field_71424_I.func_76320_a("stats"); this.field_71424_I.func_76320_a("stats");
this.field_71413_E.func_77449_e(); this.field_71413_E.func_77449_e();
this.field_71424_I.func_76318_c("gui"); this.field_71424_I.func_76318_c("gui");
@@ -1654,6 +1670,7 @@ @@ -1672,6 +1688,7 @@
this.field_71453_ak.func_74428_b(); this.field_71453_ak.func_74428_b();
} }
@@ -91,7 +91,7 @@
this.field_71424_I.func_76319_b(); this.field_71424_I.func_76319_b();
this.field_71423_H = func_71386_F(); this.field_71423_H = func_71386_F();
} }
@@ -1908,6 +1925,12 @@ @@ -1926,6 +1943,12 @@
public static void main(String[] p_main_0_) public static void main(String[] p_main_0_)
{ {
@@ -1,9 +1,9 @@
--- ../src-base/minecraft/net/minecraft/src/RenderBlocks.java --- ../src-base/minecraft/net/minecraft/src/RenderBlocks.java
+++ ../src-work/minecraft/net/minecraft/src/RenderBlocks.java +++ ../src-work/minecraft/net/minecraft/src/RenderBlocks.java
@@ -134,7 +134,81 @@ @@ -184,7 +184,81 @@
{
int var5 = p_78612_1_.func_71857_b(); int var5 = p_78612_1_.func_71857_b();
p_78612_1_.func_71902_a(this.field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_); p_78612_1_.func_71902_a(this.field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_);
this.func_83018_a(p_78612_1_);
- return var5 == 0 ? this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 31 ? this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 4 ? this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 13 ? this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 1 ? this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 19 ? this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 23 ? this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 6 ? this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 2 ? this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 3 ? this.func_78590_h(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 5 ? this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 8 ? this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 7 ? this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 9 ? this.func_78586_a((BlockRail)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 10 ? this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 27 ? this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 11 ? this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 32 ? this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 12 ? this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 29 ? this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 30 ? this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 14 ? this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 15 ? this.func_78610_x(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 16 ? this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) : (var5 == 17 ? this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) : (var5 == 18 ? this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 20 ? this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 21 ? this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 24 ? this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 33 ? this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 35 ? this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 25 ? this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 26 ? this.func_78567_v(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 28 ? this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 34 ? this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : false)))))))))))))))))))))))))))))))))); - return var5 == 0 ? this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 31 ? this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 4 ? this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 13 ? this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 1 ? this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 19 ? this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 23 ? this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 6 ? this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 2 ? this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 3 ? this.func_78590_h(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 5 ? this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 8 ? this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 7 ? this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 9 ? this.func_78586_a((BlockRail)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 10 ? this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 27 ? this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 11 ? this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 32 ? this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 12 ? this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 29 ? this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 30 ? this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 14 ? this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 15 ? this.func_78610_x(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 16 ? this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) : (var5 == 17 ? this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) : (var5 == 18 ? this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 20 ? this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 21 ? this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 24 ? this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 33 ? this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 35 ? this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 25 ? this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 26 ? this.func_78567_v(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 28 ? this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 34 ? this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : false))))))))))))))))))))))))))))))))));
+ switch (var5) + switch (var5)
+ { + {
@@ -83,8 +83,8 @@
} }
public boolean func_78567_v(Block p_78567_1_, int p_78567_2_, int p_78567_3_, int p_78567_4_) public boolean func_78567_v(Block p_78567_1_, int p_78567_2_, int p_78567_3_, int p_78567_4_)
@@ -6427,6 +6501,10 @@ @@ -6478,6 +6552,10 @@
p_78600_1_.func_71905_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); this.func_83020_a(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
this.func_78595_a(); this.func_78595_a();
} }
+ else + else
@@ -94,7 +94,7 @@
} }
else else
{ {
@@ -6484,6 +6562,36 @@ @@ -6536,6 +6614,36 @@
public static boolean func_78597_b(int p_78597_0_) public static boolean func_78597_b(int p_78597_0_)
{ {