1.6.1 Update
This commit is contained in:
LexManos
parent
fa965e5f7c
commit
ab1ddd99b6
|
|
@ -1,6 +1,6 @@
|
|||
package net.minecraftforge.client.event;
|
||||
|
||||
import net.minecraft.client.render.entity.RendererLivingEntity;
|
||||
import net.minecraft.client.renderer.entity.RendererLivingEntity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraftforge.event.Cancelable;
|
||||
import net.minecraftforge.event.Event;
|
||||
|
|
|
|||
|
|
@ -1,162 +1,162 @@
|
|||
#Main Forge Access Transformer configuration file
|
||||
# Tessellator
|
||||
public-f bfc.a #FD:Tessellator/field_78398_a #instance
|
||||
public bfc.u #FD:Tessellator/field_78409_u #drawMode
|
||||
public bfc.v #FD:Tessellator/field_78408_v #xOffset
|
||||
public bfc.w #FD:Tessellator/field_78407_w #yOffset
|
||||
public bfc.x #FD:Tessellator/field_78417_x #zOffset
|
||||
public bfc.z #FD:Tessellator/field_78415_z #isDrawing
|
||||
public-f bff.a #FD:Tessellator/field_78398_a #instance
|
||||
public bff.u #FD:Tessellator/field_78409_u #drawMode
|
||||
public bff.v #FD:Tessellator/field_78408_v #xOffset
|
||||
public bff.w #FD:Tessellator/field_78407_w #yOffset
|
||||
public bff.x #FD:Tessellator/field_78417_x #zOffset
|
||||
public bff.z #FD:Tessellator/field_78415_z #isDrawing
|
||||
# ItemPickaxe
|
||||
public yh.<init>(ILxx;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f yh.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst
|
||||
public yi.<init>(ILxy;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f yi.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst
|
||||
# ItemAxe
|
||||
public xu.<init>(ILxx;)V #MD:ItemAxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f xu.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst
|
||||
public xv.<init>(ILxy;)V #MD:ItemAxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f xv.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst
|
||||
# ItemSpade
|
||||
public ys.<init>(ILxx;)V #MD:ItemSpade/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f ys.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst
|
||||
public yt.<init>(ILxy;)V #MD:ItemSpade/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
|
||||
public+f yt.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst
|
||||
# ItemTool
|
||||
public xd.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial
|
||||
public xd.d #FD:ItemTool/field_77865_bY #damageVsEntity
|
||||
public xe.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial
|
||||
public xe.d #FD:ItemTool/field_77865_bY #damageVsEntity
|
||||
# EntityEnderman
|
||||
public tc.br #FD:EntityEnderman/field_70827_d #carriableBlocks
|
||||
public td.br #FD:EntityEnderman/field_70827_d #carriableBlocks
|
||||
# RenderEngine
|
||||
# -- MISSING MAPPING public bge.f(Ljava/lang/String;)I #MD:RenderEngine/func_78341_b #getTexture
|
||||
# -- MISSING MAPPING public bge.i #FD:RenderEngine/field_94154_l #terrainTextureMap
|
||||
# -- MISSING MAPPING public bge.j #FD:RenderEngine/field_94155_m #itemTextureMap
|
||||
# RenderGlobal
|
||||
public bex.k #FD:RenderGlobal/field_72769_h #theWorld
|
||||
public bex.l #FD:RenderGlobal/field_72770_i #renderEngine
|
||||
public bex.t #FD:RenderGlobal/field_72777_q #mc
|
||||
public bex.u #FD:RenderGlobal/field_72776_r #globalRenderBlocks
|
||||
public bex.H #FD:RenderGlobal/field_72738_E #damagedBlocks
|
||||
public bfa.k #FD:RenderGlobal/field_72769_h #theWorld
|
||||
public bfa.l #FD:RenderGlobal/field_72770_i #renderEngine
|
||||
public bfa.t #FD:RenderGlobal/field_72777_q #mc
|
||||
public bfa.u #FD:RenderGlobal/field_72776_r #globalRenderBlocks
|
||||
public bfa.H #FD:RenderGlobal/field_72738_E #damagedBlocks
|
||||
# SoundManager
|
||||
public bla.b #FD:SoundManager/field_77381_a #sndSystem
|
||||
public bla.d #FD:SoundManager/field_77379_b #soundPoolSounds
|
||||
public bla.e #FD:SoundManager/field_77380_c #soundPoolStreaming
|
||||
public bla.f #FD:SoundManager/field_77377_d #soundPoolMusic
|
||||
public blc.b #FD:SoundManager/field_77381_a #sndSystem
|
||||
public blc.d #FD:SoundManager/field_77379_b #soundPoolSounds
|
||||
public blc.e #FD:SoundManager/field_77380_c #soundPoolStreaming
|
||||
public blc.f #FD:SoundManager/field_77377_d #soundPoolMusic
|
||||
# EntityMinecart
|
||||
protected sp.* #FD:EntityMinecart/* # All private -> protected
|
||||
protected sq.* #FD:EntityMinecart/* # All private -> protected
|
||||
# -- MISSING MAPPING public py.h()Z #MD:EntityMinecart/func_70490_h #isMinecartPowered
|
||||
# Block
|
||||
public aqr.<init>(ILaju;)V #MD:Block/<init>(ILnet/minecraft/src/Material;) #Constructor
|
||||
public aqr.<init>(IILaju;)V #MD:Block/<init>(IILnet/minecraft/src/Material;) #Constructor
|
||||
public aqr.cH #FD:Block/field_72029_cc #blockResistance
|
||||
public aqr.cG #FD:Block/field_71989_cb #blockHardness
|
||||
public aqs.<init>(ILajv;)V #MD:Block/<init>(ILnet/minecraft/src/Material;) #Constructor
|
||||
public aqs.<init>(IILajv;)V #MD:Block/<init>(IILnet/minecraft/src/Material;) #Constructor
|
||||
public aqs.cH #FD:Block/field_72029_cc #blockResistance
|
||||
public aqs.cG #FD:Block/field_71989_cb #blockHardness
|
||||
# -- MISSING MAPPING public amq.r()Lamq; #MD:Block/func_71912_p #setRequiresSelfNotify
|
||||
public aqr.a(Laqv;)Laqr; #MD:Block/func_71884_a #setStepSound
|
||||
public aqr.b(F)Laqr; #MD:Block/func_71894_b #setResistance
|
||||
public aqr.c(F)Laqr; #MD:Block/func_71848_c #setHardness
|
||||
public aqr.k(I)Laqr; #MD:Block/func_71868_h #setLightOpacity
|
||||
public aqr.a(F)Laqr; #MD:Block/func_71900_a #setLightValue
|
||||
public aqr.r()Laqr; #MD:Block/func_71875_q #setBlockUnbreakable
|
||||
public aqr.b(Z)Laqr; #MD:Block/func_71907_b #setTickRandomly
|
||||
public aqr.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds
|
||||
public aqs.a(Laqw;)Laqs; #MD:Block/func_71884_a #setStepSound
|
||||
public aqs.b(F)Laqs; #MD:Block/func_71894_b #setResistance
|
||||
public aqs.c(F)Laqs; #MD:Block/func_71848_c #setHardness
|
||||
public aqs.k(I)Laqs; #MD:Block/func_71868_h #setLightOpacity
|
||||
public aqs.a(F)Laqs; #MD:Block/func_71900_a #setLightValue
|
||||
public aqs.r()Laqs; #MD:Block/func_71875_q #setBlockUnbreakable
|
||||
public aqs.b(Z)Laqs; #MD:Block/func_71907_b #setTickRandomly
|
||||
public aqs.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds
|
||||
# NetServerHandler
|
||||
public jw.f #FD:NetServerHandler/field_72572_g #playerInAirTime
|
||||
public jx.f #FD:NetServerHandler/field_72572_g #playerInAirTime
|
||||
# TileEntity
|
||||
public ash.k #FD:TileEntity/field_70331_k #worldObj
|
||||
public asi.k #FD:TileEntity/field_70331_k #worldObj
|
||||
# BlockLeavesBase
|
||||
public aqz.d #FD:BlockLeavesBase/field_72131_c #graphicsLevel
|
||||
public ara.d #FD:BlockLeavesBase/field_72131_c #graphicsLevel
|
||||
# Item
|
||||
public xw.<init>(I)V #MD:Item/<init>(I) #Constructor
|
||||
public xw.e(I)Lxw; #MD:Item/func_77656_e #setMaxDamage
|
||||
public-f xw.h(Lxy;)Lmo; #MD:Item/func_77650_f #getIconIndex
|
||||
public xw.c(Ljava/lang/String;)Lxw; #MD:Item/func_77631_c #setPotionEffect
|
||||
public xx.<init>(I)V #MD:Item/<init>(I) #Constructor
|
||||
public xx.e(I)Lxx; #MD:Item/func_77656_e #setMaxDamage
|
||||
public-f xx.h(Lxz;)Lmp; #MD:Item/func_77650_f #getIconIndex
|
||||
public xx.c(Ljava/lang/String;)Lxx; #MD:Item/func_77631_c #setPotionEffect
|
||||
# RailLogic
|
||||
public amr #CL:BlockBaseRailLogic
|
||||
public amr.a()I #MD:BlockBaseRailLogic/func_94505_a #getNAdjacentTiles
|
||||
public ams #CL:BlockBaseRailLogic
|
||||
public ams.a()I #MD:BlockBaseRailLogic/func_94505_a #getNAdjacentTiles
|
||||
# EntityPlayer
|
||||
public tz.a(Lso;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld
|
||||
public tz.i()V #MD:EntityPlayer/func_71053_j #closeScreen
|
||||
public tz.b #FD:EntityPlayer/field_71076_b #sleepTimer
|
||||
public ua.a(Lsp;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld
|
||||
public ua.i()V #MD:EntityPlayer/func_71053_j #closeScreen
|
||||
public ua.b #FD:EntityPlayer/field_71076_b #sleepTimer
|
||||
# EntityPlayerMP
|
||||
public bcu.a(Lso;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
|
||||
public bcx.a(Lsp;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
|
||||
# World Gen Chests Related
|
||||
public mg.* #FD:WeightedRandomChestContent/* #all
|
||||
public jo.T #FD:WorldServer/field_73069_S #bonusChestContent
|
||||
public agb.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents
|
||||
public ahf.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple
|
||||
public ahg.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents
|
||||
public ahg.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents
|
||||
public ahq.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents
|
||||
public ahu.b #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents
|
||||
public ahz.c #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents
|
||||
public aja.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents
|
||||
public mh.* #FD:WeightedRandomChestContent/* #all
|
||||
public jp.T #FD:WorldServer/field_73069_S #bonusChestContent
|
||||
public agc.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents
|
||||
public ahg.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple
|
||||
public ahh.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents
|
||||
public ahh.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents
|
||||
public ahr.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents
|
||||
public ahv.b #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents
|
||||
public aia.c #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents
|
||||
public ajb.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents
|
||||
# AnvilChunkLoader.chunkSaveLocation
|
||||
public ady.d #FD:AnvilChunkLoader/field_75825_d
|
||||
public adz.d #FD:AnvilChunkLoader/field_75825_d
|
||||
# ChunkProviderServer.currentChunkLoader
|
||||
public jn.e #FD:ChunkProviderServer/field_73247_e
|
||||
public jo.e #FD:ChunkProviderServer/field_73247_e
|
||||
# PlayerManager
|
||||
public jl.a(IIZ)Ljm; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher
|
||||
public jm.a(IIZ)Ljn; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher
|
||||
# PlayerInstance
|
||||
public jm #CL:PlayerInstance
|
||||
public jn #CL:PlayerInstance
|
||||
# World
|
||||
public-f abq.A #FD:World/field_72982_D #villageCollectionObj
|
||||
public abq.G #FD:World/field_72993_I #activeChunkSet
|
||||
public-f abr.A #FD:World/field_72982_D #villageCollectionObj
|
||||
public abr.G #FD:World/field_72993_I #activeChunkSet
|
||||
# EntityLiving
|
||||
public oc.b #FD:EntityLiving/field_70728_aV #experienceValue
|
||||
public od.b #FD:EntityLiving/field_70728_aV #experienceValue
|
||||
# -- MISSING MAPPING public ng.bt #FD:EntityLiving/field_94063_bt #combatTracker
|
||||
public oc.d #FD:EntityLiving/field_70715_bh #targetTasks
|
||||
public od.d #FD:EntityLiving/field_70715_bh #targetTasks
|
||||
# GuiFlatPresets
|
||||
public avp.a(Ljava/lang/String;ILack;Ljava/util/List;[Lafx;)V #MD:GuiFlatPresets/func_82294_a
|
||||
public avp.a(Ljava/lang/String;ILack;[Lafx;)V #MD:GuiFlatPresets/func_82297_a
|
||||
public avq.a(Ljava/lang/String;ILacl;Ljava/util/List;[Lafy;)V #MD:GuiFlatPresets/func_82294_a
|
||||
public avq.a(Ljava/lang/String;ILacl;[Lafy;)V #MD:GuiFlatPresets/func_82297_a
|
||||
# BiomeGenBase
|
||||
public ack.*() #MD:BiomeGenBase/* #Everything protected->public
|
||||
public acl.*() #MD:BiomeGenBase/* #Everything protected->public
|
||||
# MapGenVillage
|
||||
public-f aio.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes
|
||||
public-f aip.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes
|
||||
# ShapedRecipes
|
||||
public+f aac.d #FD:ShapedRecipes/field_77574_d #recipeItems
|
||||
public+f aac.b #FD:ShapedRecipes/field_77576_b #recipeWidth
|
||||
public+f aac.c #FD:ShapedRecipes/field_77577_c #recipeHeight
|
||||
public+f aad.d #FD:ShapedRecipes/field_77574_d #recipeItems
|
||||
public+f aad.b #FD:ShapedRecipes/field_77576_b #recipeWidth
|
||||
public+f aad.c #FD:ShapedRecipes/field_77577_c #recipeHeight
|
||||
# ShapelessRecipes
|
||||
public aad.b #FD:ShapelessRecipes/field_77579_b #recipeItems
|
||||
public aae.b #FD:ShapelessRecipes/field_77579_b #recipeItems
|
||||
# GuiContainer
|
||||
protected awo.a(Lvy;)V #MD:GuiContainer/func_74192_a #drawSlotInventory
|
||||
protected awp.a(Lvz;)V #MD:GuiContainer/func_74192_a #drawSlotInventory
|
||||
# ContainerPlayer
|
||||
protected vp.h #FD:ContainerPlayer/field_82862_h #player
|
||||
protected vq.h #FD:ContainerPlayer/field_82862_h #player
|
||||
# BlockButton
|
||||
protected amx.n(Labq;III)V #MD:BlockButton/func_82535_o #checkActivation
|
||||
protected-f amx.a #FD:BlockButton/field_82537_a #sensible
|
||||
protected amy.n(Labr;III)V #MD:BlockButton/func_82535_o #checkActivation
|
||||
protected-f amy.a #FD:BlockButton/field_82537_a #sensible
|
||||
# BiomeDecorator
|
||||
public aco.* #FD:BiomeDecorator/* # All private -> protected
|
||||
public acp.* #FD:BiomeDecorator/* # All private -> protected
|
||||
# CreativeTabs
|
||||
public-f wq.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final
|
||||
public-f wr.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final
|
||||
# Packet
|
||||
public ew.a(IZZLjava/lang/Class;)V #MD:Packet/func_73285_a #addIdClassMapping
|
||||
public ex.a(IZZLjava/lang/Class;)V #MD:Packet/func_73285_a #addIdClassMapping
|
||||
# SaveHandler
|
||||
public ali.b()Ljava/io/File; #MD:SaveHandler/func_75765_b
|
||||
public alj.b()Ljava/io/File; #MD:SaveHandler/func_75765_b
|
||||
# World stuff
|
||||
public abq.b(Lnj;)V #MD:World/func_72847_b #releaseEntitySkin
|
||||
public abq.m #FD:World/field_73003_n #prevRainingStrength
|
||||
public abq.n #FD:World/field_73004_o #rainingStrength
|
||||
public abq.p #FD:World/field_73017_q #thunderingStrength
|
||||
public abq.o #FD:World/field_73018_p #prevThunderingStrength
|
||||
public abr.b(Lnk;)V #MD:World/func_72847_b #releaseEntitySkin
|
||||
public abr.m #FD:World/field_73003_n #prevRainingStrength
|
||||
public abr.n #FD:World/field_73004_o #rainingStrength
|
||||
public abr.p #FD:World/field_73017_q #thunderingStrength
|
||||
public abr.o #FD:World/field_73018_p #prevThunderingStrength
|
||||
#WorldClient
|
||||
public bcr.b(Lnj;)V #MD:WorldClient/func_72847_b #releaseEntitySkin
|
||||
public bcu.b(Lnk;)V #MD:WorldClient/func_72847_b #releaseEntitySkin
|
||||
#WorldServer
|
||||
public jo.b(Lnj;)V #MD:WorldServer/func_72847_b #releaseEntitySkin
|
||||
public jo.N #FD:WorldServer/field_73068_P #allPlayersSleeping
|
||||
public jp.b(Lnk;)V #MD:WorldServer/func_72847_b #releaseEntitySkin
|
||||
public jp.N #FD:WorldServer/field_73068_P #allPlayersSleeping
|
||||
#TextureMap
|
||||
public bhw.g #FD:TextureMap/field_94255_a
|
||||
public bhz.g #FD:TextureMap/field_94255_a
|
||||
# -- MISSING MAPPING public bir.b #FD:TextureMap/field_94253_b
|
||||
public bhw.h #FD:TextureMap/field_94254_c
|
||||
public bhz.h #FD:TextureMap/field_94254_c
|
||||
# -- MISSING MAPPING public bir.d #FD:TextureMap/field_94251_d
|
||||
#Potion
|
||||
public ne.b(II)Lne; #MD:Potion/func_76399_b #setIconIndex
|
||||
public nf.b(II)Lnf; #MD:Potion/func_76399_b #setIconIndex
|
||||
#PotionHelper
|
||||
public zj.m #FD:PotionHelper/field_77927_l #potionRequirements
|
||||
public zj.n #FD:PotionHelper/field_77928_m #potionAmplifiers
|
||||
public zk.m #FD:PotionHelper/field_77927_l #potionRequirements
|
||||
public zk.n #FD:PotionHelper/field_77928_m #potionAmplifiers
|
||||
#PotionEffect
|
||||
public nf.b #FD:PotionEffect/field_76460_b #duration
|
||||
public ng.b #FD:PotionEffect/field_76460_b #duration
|
||||
#BlockFluid
|
||||
protected aou.a #FD:BlockFluid/field_94425_a #theIcon
|
||||
protected aov.a #FD:BlockFluid/field_94425_a #theIcon
|
||||
#GuiIngame
|
||||
protected auz.* #FD:GuiIngame/* # All private -> protected
|
||||
protected auz.*() #MD:GuiIngame/* # All private -> protected
|
||||
protected ava.* #FD:GuiIngame/* # All private -> protected
|
||||
protected ava.*() #MD:GuiIngame/* # All private -> protected
|
||||
#ItemStack
|
||||
default xy.f #FD:ItemStack/field_77991_e # make default access for itemDamage
|
||||
default xz.f #FD:ItemStack/field_77991_e # make default access for itemDamage
|
||||
#GuiSlot
|
||||
protected avw.b(IIII)V #MD:GuiSlot/func_77206_b #overlayBackground
|
||||
protected avx.b(IIII)V #MD:GuiSlot/func_77206_b #overlayBackground
|
||||
#EntityPlayer
|
||||
public tz.bu #FD:EntityPlayer/field_71092_bJ #username
|
||||
public ua.bu #FD:EntityPlayer/field_71092_bJ #username
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
if (this.serverName != null)
|
||||
{
|
||||
@@ -1292,7 +1300,7 @@
|
||||
@@ -1296,7 +1304,7 @@
|
||||
|
||||
if (this.thePlayer.canCurrentToolHarvestBlock(j, k, l))
|
||||
{
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
this.thePlayer.swingItem();
|
||||
}
|
||||
}
|
||||
@@ -1358,7 +1366,8 @@
|
||||
@@ -1362,7 +1370,8 @@
|
||||
{
|
||||
int j1 = itemstack != null ? itemstack.stackSize : 0;
|
||||
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
{
|
||||
flag = false;
|
||||
this.thePlayer.swingItem();
|
||||
@@ -1384,7 +1393,8 @@
|
||||
@@ -1388,7 +1397,8 @@
|
||||
{
|
||||
ItemStack itemstack1 = this.thePlayer.inventory.getCurrentItem();
|
||||
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
{
|
||||
this.entityRenderer.itemRenderer.resetEquippedProgress2();
|
||||
}
|
||||
@@ -2032,6 +2042,11 @@
|
||||
@@ -2036,6 +2046,11 @@
|
||||
{
|
||||
this.statFileWriter.syncStats();
|
||||
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
if (par1WorldClient == null)
|
||||
{
|
||||
NetClientHandler netclienthandler = this.getNetHandler();
|
||||
@@ -2049,6 +2064,18 @@
|
||||
@@ -2053,6 +2068,18 @@
|
||||
if (this.theIntegratedServer != null)
|
||||
{
|
||||
this.theIntegratedServer.initiateShutdown();
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
}
|
||||
|
||||
this.theIntegratedServer = null;
|
||||
@@ -2219,103 +2246,12 @@
|
||||
@@ -2223,103 +2250,12 @@
|
||||
if (this.objectMouseOver != null)
|
||||
{
|
||||
boolean flag = this.thePlayer.capabilities.isCreativeMode;
|
||||
|
|
@ -201,7 +201,7 @@
|
|||
|
||||
if (flag)
|
||||
{
|
||||
@@ -2397,11 +2333,18 @@
|
||||
@@ -2401,11 +2337,18 @@
|
||||
par1PlayerUsageSnooper.addData("gl_max_texture_size", Integer.valueOf(getGLMaximumTextureSize()));
|
||||
}
|
||||
|
||||
|
|
@ -220,7 +220,7 @@
|
|||
for (int i = 16384; i > 0; i >>= 1)
|
||||
{
|
||||
GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null);
|
||||
@@ -2409,6 +2352,7 @@
|
||||
@@ -2413,6 +2356,7 @@
|
||||
|
||||
if (j != 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
--- ../src_base/minecraft/net/minecraft/client/renderer/RenderEngine.java
|
||||
+++ ../src_work/minecraft/net/minecraft/client/renderer/RenderEngine.java
|
||||
@@ -28,6 +28,8 @@
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
+import net.minecraftforge.client.ForgeHooksClient;
|
||||
+
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class RenderEngine
|
||||
{
|
||||
@@ -186,6 +188,7 @@
|
||||
|
||||
try
|
||||
{
|
||||
+ ForgeHooksClient.onTextureLoadPre(par1Str);
|
||||
int i = GLAllocation.generateTextureNames();
|
||||
TextureFXManager.instance().bindTextureToName(par1Str, i);
|
||||
boolean flag = par1Str.startsWith("%blur%");
|
||||
@@ -216,6 +219,7 @@
|
||||
}
|
||||
|
||||
this.textureMap.put(s1, Integer.valueOf(i));
|
||||
+ ForgeHooksClient.onTextureLoad(par1Str, texturePack.getSelectedTexturePack());
|
||||
return i;
|
||||
}
|
||||
catch (Exception exception)
|
||||
@@ -417,6 +421,7 @@
|
||||
{
|
||||
this.textureMapBlocks.updateAnimations();
|
||||
this.textureMapItems.updateAnimations();
|
||||
+ this.resetBoundTexture(); //Forge: BugFix, Animations don't use our bindTexture, and thus don't change the cached texture.
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -515,6 +520,7 @@
|
||||
{
|
||||
this.textureMapBlocks.refreshTextures();
|
||||
this.textureMapItems.refreshTextures();
|
||||
+ this.resetBoundTexture(); //Forge: BugFix, Animations don't use our bindTexture, and thus don't change the cached texture.
|
||||
}
|
||||
|
||||
public Icon getMissingIcon(int par1)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderManager.java
|
||||
+++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderManager.java
|
||||
@@ -227,12 +227,14 @@
|
||||
@@ -224,12 +224,14 @@
|
||||
|
||||
if (par4EntityLivingBase.isPlayerSleeping())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
|
||||
+++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
|
||||
@@ -22,7 +22,16 @@
|
||||
@@ -21,7 +21,16 @@
|
||||
import net.minecraft.scoreboard.ScoreObjective;
|
||||
import net.minecraft.scoreboard.Scoreboard;
|
||||
import net.minecraft.util.MathHelper;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class RenderPlayer extends RendererLivingEntity
|
||||
@@ -44,6 +53,13 @@
|
||||
@@ -43,6 +52,13 @@
|
||||
{
|
||||
ItemStack itemstack = par1AbstractClientPlayer.inventory.armorItemInSlot(3 - par2);
|
||||
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
if (itemstack != null)
|
||||
{
|
||||
Item item = itemstack.getItem();
|
||||
@@ -51,7 +67,7 @@
|
||||
@@ -50,7 +66,7 @@
|
||||
if (item instanceof ItemArmor)
|
||||
{
|
||||
ItemArmor itemarmor = (ItemArmor)item;
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
ModelBiped modelbiped = par2 == 2 ? this.modelArmor : this.modelArmorChestplate;
|
||||
modelbiped.bipedHead.showModel = par2 == 0;
|
||||
modelbiped.bipedHeadwear.showModel = par2 == 0;
|
||||
@@ -60,15 +76,17 @@
|
||||
@@ -59,15 +75,17 @@
|
||||
modelbiped.bipedLeftArm.showModel = par2 == 1;
|
||||
modelbiped.bipedRightLeg.showModel = par2 == 2 || par2 == 3;
|
||||
modelbiped.bipedLeftLeg.showModel = par2 == 2 || par2 == 3;
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
float f2 = (float)(j >> 16 & 255) / 255.0F;
|
||||
float f3 = (float)(j >> 8 & 255) / 255.0F;
|
||||
float f4 = (float)(j & 255) / 255.0F;
|
||||
@@ -106,7 +124,7 @@
|
||||
@@ -105,7 +123,7 @@
|
||||
|
||||
if (item instanceof ItemArmor)
|
||||
{
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
float f1 = 1.0F;
|
||||
GL11.glColor3f(f1, f1, f1);
|
||||
}
|
||||
@@ -115,6 +133,7 @@
|
||||
@@ -114,6 +132,7 @@
|
||||
|
||||
public void func_110819_a(AbstractClientPlayer par1AbstractClientPlayer, double par2, double par4, double par6, float par8, float par9)
|
||||
{
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
float f2 = 1.0F;
|
||||
GL11.glColor3f(f2, f2, f2);
|
||||
ItemStack itemstack = par1AbstractClientPlayer.inventory.getCurrentItem();
|
||||
@@ -146,6 +165,7 @@
|
||||
@@ -145,6 +164,7 @@
|
||||
this.modelArmorChestplate.aimedBow = this.modelArmor.aimedBow = this.modelBipedMain.aimedBow = false;
|
||||
this.modelArmorChestplate.isSneak = this.modelArmor.isSneak = this.modelBipedMain.isSneak = false;
|
||||
this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = 0;
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
}
|
||||
|
||||
protected ResourceLocation func_110817_a(AbstractClientPlayer par1AbstractClientPlayer)
|
||||
@@ -155,21 +175,30 @@
|
||||
@@ -154,21 +174,30 @@
|
||||
|
||||
protected void func_110820_a(AbstractClientPlayer par1AbstractClientPlayer, float par2)
|
||||
{
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
{
|
||||
f2 = 0.625F;
|
||||
GL11.glTranslatef(0.0F, -0.25F, 0.0F);
|
||||
@@ -221,6 +250,7 @@
|
||||
@@ -220,6 +249,7 @@
|
||||
boolean flag = par1AbstractClientPlayer.func_110310_o().func_110557_a();
|
||||
boolean flag1 = !par1AbstractClientPlayer.isInvisible();
|
||||
boolean flag2 = !par1AbstractClientPlayer.getHideCape();
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
float f6;
|
||||
|
||||
if (flag && flag1 && flag2)
|
||||
@@ -272,7 +302,7 @@
|
||||
@@ -271,7 +301,7 @@
|
||||
|
||||
ItemStack itemstack1 = par1AbstractClientPlayer.inventory.getCurrentItem();
|
||||
|
||||
|
|
@ -138,7 +138,7 @@
|
|||
{
|
||||
GL11.glPushMatrix();
|
||||
this.modelBipedMain.bipedRightArm.postRender(0.0625F);
|
||||
@@ -292,7 +322,11 @@
|
||||
@@ -291,7 +321,11 @@
|
||||
|
||||
float f11;
|
||||
|
||||
|
|
@ -151,7 +151,7 @@
|
|||
{
|
||||
f11 = 0.5F;
|
||||
GL11.glTranslatef(0.0F, 0.1875F, -0.3125F);
|
||||
@@ -349,7 +383,7 @@
|
||||
@@ -348,7 +382,7 @@
|
||||
|
||||
if (itemstack1.getItem().requiresMultipleRenderPasses())
|
||||
{
|
||||
|
|
@ -160,7 +160,7 @@
|
|||
{
|
||||
int k = itemstack1.getItem().getColorFromItemStack(itemstack1, j);
|
||||
f13 = (float)(k >> 16 & 255) / 255.0F;
|
||||
@@ -371,6 +405,7 @@
|
||||
@@ -370,6 +404,7 @@
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- ../src_base/minecraft/net/minecraft/client/render/entity/RendererLivingEntity.java
|
||||
+++ ../src_work/minecraft/net/minecraft/client/render/entity/RendererLivingEntity.java
|
||||
@@ -18,6 +18,9 @@
|
||||
--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java
|
||||
+++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java
|
||||
@@ -17,6 +17,9 @@
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.projectile.EntityArrow;
|
||||
import net.minecraft.util.MathHelper;
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
@@ -29,6 +32,9 @@
|
||||
@@ -28,6 +31,9 @@
|
||||
|
||||
/** The model to be used during the render passes. */
|
||||
protected ModelBase renderPassModel;
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
public RendererLivingEntity(ModelBase par1ModelBase, float par2)
|
||||
{
|
||||
@@ -440,12 +446,13 @@
|
||||
@@ -439,12 +445,13 @@
|
||||
|
||||
protected void func_130008_a(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6)
|
||||
{
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
if (d3 < (double)(f2 * f2))
|
||||
{
|
||||
@@ -489,6 +496,7 @@
|
||||
@@ -488,6 +495,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
--- ../src_base/minecraft/net/minecraft/server/gui/GuiStatsComponent.java
|
||||
+++ ../src_work/minecraft/net/minecraft/server/gui/GuiStatsComponent.java
|
||||
@@ -10,6 +10,8 @@
|
||||
import javax.swing.Timer;
|
||||
import net.minecraft.network.TcpConnection;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
+import net.minecraft.world.WorldServer;
|
||||
+import net.minecraftforge.common.DimensionManager;
|
||||
|
||||
@SideOnly(Side.SERVER)
|
||||
public class GuiStatsComponent extends JComponent
|
||||
@@ -43,6 +45,7 @@
|
||||
*/
|
||||
private void updateStats()
|
||||
{
|
||||
+ this.displayStrings = new String[5 + DimensionManager.getIDs().length];
|
||||
long i = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
|
||||
System.gc();
|
||||
this.displayStrings[0] = "Memory use: " + i / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)";
|
||||
@@ -53,15 +56,18 @@
|
||||
|
||||
if (this.field_79017_e.worldServers != null)
|
||||
{
|
||||
- for (int j = 0; j < this.field_79017_e.worldServers.length; ++j)
|
||||
+ int j = 0;
|
||||
+ for (Integer id : DimensionManager.getIDs())
|
||||
{
|
||||
- this.displayStrings[5 + j] = "Lvl " + j + " tick: " + field_79020_a.format(this.calcArrayAverage(this.field_79017_e.timeOfLastDimensionTick[j]) * 1.0E-6D) + " ms";
|
||||
+ this.displayStrings[5 + j] = "Lvl " + id + " tick: " + field_79020_a.format(this.calcArrayAverage(this.field_79017_e.worldTickTimes.get(id)) * 1.0E-6D) + " ms";
|
||||
|
||||
- if (this.field_79017_e.worldServers[j] != null && this.field_79017_e.worldServers[j].theChunkProviderServer != null)
|
||||
+ WorldServer world = DimensionManager.getWorld(id);
|
||||
+ if (world != null && world.theChunkProviderServer != null)
|
||||
{
|
||||
- this.displayStrings[5 + j] = this.displayStrings[5 + j] + ", " + this.field_79017_e.worldServers[j].theChunkProviderServer.makeString();
|
||||
- this.displayStrings[5 + j] = this.displayStrings[5 + j] + ", Vec3: " + this.field_79017_e.worldServers[j].getWorldVec3Pool().func_82590_d() + " / " + this.field_79017_e.worldServers[j].getWorldVec3Pool().getPoolSize();
|
||||
+ this.displayStrings[5 + j] = this.displayStrings[5 + j] + ", " + world.theChunkProviderServer.makeString();
|
||||
+ this.displayStrings[5 + j] = this.displayStrings[5 + j] + ", Vec3: " + world.getWorldVec3Pool().func_82590_d() + " / " + world.getWorldVec3Pool().getPoolSize();
|
||||
}
|
||||
+ j++;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue