mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 13:09:59 +00:00
Finished update to MCP 7.2, MC 1.3.2 pre.
This commit is contained in:
1 parent
646a0b4fc4
commit
eef3303dfe
12 files changed
+166
-237
No files matched your search
@@ -177,14 +177,18 @@ public class AccessTransformer implements IClassTransformer
|
||||
{
|
||||
for (FieldNode n : (List<FieldNode>) classNode.fields)
|
||||
{
|
||||
if (n.name.equals(m.name))
|
||||
if (n.name.equals(m.name) || m.name.equals("*"))
|
||||
{
|
||||
n.access = getFixedAccess(n.access, m);
|
||||
if (DEBUG)
|
||||
{
|
||||
System.out.println(String.format("Field: %s.%s %s -> %s", name, m.name, toBinary(m.oldAccess), toBinary(m.newAccess)));
|
||||
System.out.println(String.format("Field: %s.%s %s -> %s", name, n.name, toBinary(m.oldAccess), toBinary(m.newAccess)));
|
||||
}
|
||||
|
||||
if (!m.name.equals("*"))
|
||||
{
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -192,14 +196,18 @@ public class AccessTransformer implements IClassTransformer
|
||||
{
|
||||
for (MethodNode n : (List<MethodNode>) classNode.methods)
|
||||
{
|
||||
if (n.name.equals(m.name) && n.desc.equals(m.desc))
|
||||
if ((n.name.equals(m.name) && n.desc.equals(m.desc)) || m.name.equals("*"))
|
||||
{
|
||||
n.access = getFixedAccess(n.access, m);
|
||||
if (DEBUG)
|
||||
{
|
||||
System.out.println(String.format("Method: %s.%s%s %s -> %s", name, m.name, m.desc, toBinary(m.oldAccess), toBinary(m.newAccess)));
|
||||
System.out.println(String.format("Method: %s.%s%s %s -> %s", name, n.name, n.desc, toBinary(m.oldAccess), toBinary(m.newAccess)));
|
||||
}
|
||||
|
||||
if (!m.name.equals("*"))
|
||||
{
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+38
-174
@@ -1,201 +1,65 @@
|
||||
#Main FML Access Transformer configuration file
|
||||
# TileEntity addMapping
|
||||
public ajh.a(Ljava/lang/Class;Ljava/lang/String;)V
|
||||
public aji.a(Ljava/lang/Class;Ljava/lang/String;)V
|
||||
# EntityList addMappings
|
||||
public jq.a(Ljava/lang/Class;Ljava/lang/String;I)V
|
||||
public jq.a(Ljava/lang/Class;Ljava/lang/String;III)V
|
||||
public jr.a(Ljava/lang/Class;Ljava/lang/String;I)V
|
||||
public jr.a(Ljava/lang/Class;Ljava/lang/String;III)V
|
||||
# EntityList nameToClassMap and idToClassMap
|
||||
public jq.b
|
||||
public jq.d
|
||||
public jr.b
|
||||
public jr.d
|
||||
# RenderManager renderers
|
||||
public avx.o
|
||||
public avy.o
|
||||
# RenderBlocks - everything
|
||||
public avf.A
|
||||
public avf.B
|
||||
public avf.C
|
||||
public avf.D
|
||||
public avf.E
|
||||
public avf.F
|
||||
public avf.G
|
||||
public avf.H
|
||||
public avf.I
|
||||
public avf.J
|
||||
public avf.K
|
||||
public avf.L
|
||||
public avf.M
|
||||
public avf.N
|
||||
public avf.S
|
||||
public avf.T
|
||||
public avf.U
|
||||
public avf.V
|
||||
public avf.W
|
||||
public avf.X
|
||||
public avf.Y
|
||||
public avf.Z
|
||||
public avf.a
|
||||
public avf.aA
|
||||
public avf.aB
|
||||
public avf.aC
|
||||
public avf.aD
|
||||
public avf.aE
|
||||
public avf.aF
|
||||
public avf.aG
|
||||
public avf.aH
|
||||
public avf.aI
|
||||
public avf.aJ
|
||||
public avf.aK
|
||||
public avf.aL
|
||||
public avf.aM
|
||||
public avf.aN
|
||||
public avf.aO
|
||||
public avf.aa
|
||||
public avf.ab
|
||||
public avf.ac
|
||||
public avf.ad
|
||||
public avf.ae
|
||||
public avf.af
|
||||
public avf.ag
|
||||
public avf.ah
|
||||
public avf.ai
|
||||
public avf.aj
|
||||
public avf.ak
|
||||
public avf.al
|
||||
public avf.am
|
||||
public avf.an
|
||||
public avf.ao
|
||||
public avf.ap
|
||||
public avf.aq
|
||||
public avf.ar
|
||||
public avf.as
|
||||
public avf.at
|
||||
public avf.au
|
||||
public avf.av
|
||||
public avf.aw
|
||||
public avf.ax
|
||||
public avf.ay
|
||||
public avf.az
|
||||
public avf.b
|
||||
public avf.c
|
||||
public avf.d
|
||||
public avf.e
|
||||
public avf.f
|
||||
public avf.g
|
||||
public avf.h
|
||||
public avf.i
|
||||
public avf.j
|
||||
public avf.k
|
||||
public avf.l
|
||||
public avf.m
|
||||
public avf.n
|
||||
public avf.o
|
||||
public avf.p
|
||||
public avf.q
|
||||
public avf.r
|
||||
public avf.s
|
||||
public avf.t
|
||||
public avf.u
|
||||
public avf.v
|
||||
public avf.w
|
||||
public avf.x
|
||||
public avf.y
|
||||
public avf.z
|
||||
public avf.a()V
|
||||
public avf.a(DDDDDDFD)V
|
||||
public avf.a(IIII)I
|
||||
public avf.a(IIILacn;)F
|
||||
public avf.a(Laex;III)Z
|
||||
public avf.a(Lafc;III)Z
|
||||
public avf.a(Lafg;III)Z
|
||||
public avf.a(Lafq;III)Z
|
||||
public avf.a(Lafv;III)Z
|
||||
public avf.a(Lafw;III)Z
|
||||
public avf.a(Lahg;III)Z
|
||||
public avf.a(Laie;III)Z
|
||||
public avf.a(Laif;DDDDD)V
|
||||
public avf.a(Laif;DDDI)V
|
||||
public avf.a(Laif;IDDD)V
|
||||
public avf.a(Laif;IDDDD)V
|
||||
public avf.a(Laif;IF)V
|
||||
public avf.a(Laif;IIDDDD)V
|
||||
public avf.a(Laif;III)V
|
||||
public avf.a(Laif;IIIFFF)Z
|
||||
public avf.a(Laif;IIII)V
|
||||
public avf.a(Laif;IIIZ)V
|
||||
public avf.a(Laif;Luo;IIII)V
|
||||
public avf.b(DDDDDDFD)V
|
||||
public avf.b(I)Z
|
||||
public avf.b(Laif;DDDI)V
|
||||
public avf.b(Laif;IDDD)V
|
||||
public avf.b(Laif;III)Z
|
||||
public avf.b(Laif;IIIZ)Z
|
||||
public avf.c(DDDDDDFD)V
|
||||
public avf.c(Laif;DDDI)V
|
||||
public avf.c(Laif;III)Z
|
||||
public avf.c(Laif;IIIFFF)Z
|
||||
public avf.c(Laif;IIIZ)Z
|
||||
public avf.d(Laif;DDDI)V
|
||||
public avf.d(Laif;III)V
|
||||
public avf.d(Laif;IIIFFF)Z
|
||||
public avf.e(Laif;DDDI)V
|
||||
public avf.e(Laif;III)Z
|
||||
public avf.f(Laif;DDDI)V
|
||||
public avf.f(Laif;III)Z
|
||||
public avf.g(Laif;III)Z
|
||||
public avf.h(Laif;III)Z
|
||||
public avf.i(Laif;III)Z
|
||||
public avf.j(Laif;III)Z
|
||||
public avf.k(Laif;III)Z
|
||||
public avf.l(Laif;III)Z
|
||||
public avf.m(Laif;III)Z
|
||||
public avf.n(Laif;III)Z
|
||||
public avf.o(Laif;III)Z
|
||||
public avf.p(Laif;III)Z
|
||||
public avf.q(Laif;III)Z
|
||||
public avf.r(Laif;III)Z
|
||||
public avf.s(Laif;III)Z
|
||||
public avf.t(Laif;III)Z
|
||||
public avf.u(Laif;III)Z
|
||||
public avf.v(Laif;III)Z
|
||||
public avf.w(Laif;III)Z
|
||||
public avf.x(Laif;III)Z
|
||||
public avg.*
|
||||
public avg.*()
|
||||
#RenderEngine - make TextureFX list public
|
||||
public ave.h
|
||||
public avf.h
|
||||
public avf.k # texturePack
|
||||
#RenderPlayer - make armorlist public and not final
|
||||
public-f awq.j
|
||||
public-f awr.j
|
||||
#StringTranslate - make the current table and language public
|
||||
public ak.b
|
||||
public ak.d
|
||||
# TileEntityRenderer - make the list of renderers public
|
||||
public axr.m
|
||||
public axs.m
|
||||
# CraftingManager - make the add recipe methods public
|
||||
public tc.a(Lri;[Ljava/lang/Object;)V
|
||||
public tc.b(Lri;[Ljava/lang/Object;)V
|
||||
public td.a(Lrj;[Ljava/lang/Object;)V
|
||||
public td.b(Lrj;[Ljava/lang/Object;)V
|
||||
# WeightedRandomItem - make the "probability" public
|
||||
public ir.a
|
||||
public is.a
|
||||
# ItemStack - make itemId final
|
||||
#public+f ri.c
|
||||
#public+f rj.c
|
||||
# StatBase - Make statName public, no server side getter
|
||||
public ho.a
|
||||
public hp.a
|
||||
# NetLoginHandler make the "complete connection" callback public so I can reset it during FML negotiation
|
||||
public gw.a(Lgw;Z)Z
|
||||
public gx.a(Lgx;Z)Z
|
||||
# NetLoginHandler userName field
|
||||
public gw.h
|
||||
public gx.h
|
||||
# EntityPlayerMP getNextWindowId
|
||||
public gt.bO()V
|
||||
public gt.cq
|
||||
public gu.bO()V
|
||||
public gu.cq
|
||||
# EntityAITaskEntry class -> public
|
||||
public kw
|
||||
public kx
|
||||
# EntityAITasks taskList
|
||||
public kv.a
|
||||
public kw.a
|
||||
# BlockChest isOcelotBlockingChest (a bounding box check actually)
|
||||
public afd.n(Luo;III)Z
|
||||
public afe.n(Lup;III)Z
|
||||
# EntityLiving tasks
|
||||
public jv.bg
|
||||
public jw.bg
|
||||
# EntityAIOcelotSit nearestSittableBlock and isblocksittable
|
||||
protected lh.a(Luo;III)Z
|
||||
protected lh.f()Z
|
||||
protected li.a(Lup;III)Z
|
||||
protected li.f()Z
|
||||
# CallableMinecraftVersion - sanity check the MC version
|
||||
public b
|
||||
public b.<init>(La;)V # constructor
|
||||
# RenderEngine
|
||||
public ave.k # texturePack
|
||||
# EntityAnimal
|
||||
public mn.d # inLove
|
||||
# RailLogic
|
||||
public ahi
|
||||
#ItemAxe
|
||||
public rf.<init>(ILri;)V
|
||||
#ItemPickaxe
|
||||
public rq.<init>(ILri;)V
|
||||
# WorldType
|
||||
public va.<init>(ILjava/lang/String;)V
|
||||
public va.<init>(ILjava/lang/String;I)V
|
||||
@@ -2,11 +2,11 @@
|
||||
# Only runs at runtime because it's not necessary at compile time
|
||||
# has deobf and obf mappings so it runs OK in mcp
|
||||
# entityplayer -> network/player
|
||||
of cpw/mods/fml/common/network/Player
|
||||
og cpw/mods/fml/common/network/Player
|
||||
net.minecraft.src.EntityPlayer cpw/mods/fml/common/network/Player
|
||||
# block -> blockproxy
|
||||
aif cpw/mods/fml/common/registry/BlockProxy
|
||||
aig cpw/mods/fml/common/registry/BlockProxy
|
||||
net.minecraft.src.Block cpw/mods/fml/common/registry/BlockProxy
|
||||
# item -> itemproxy
|
||||
rg cpw/mods/fml/common/registry/ItemProxy
|
||||
rh cpw/mods/fml/common/registry/ItemProxy
|
||||
net.minecraft.src.Item cpw/mods/fml/common/registry/ItemProxy
|
||||
Reference in new issue
Block a user