1.6.1
This commit is contained in:
Christian
parent
a82c90d7d6
commit
569b791b93
17 changed files with 22963 additions and 18353 deletions
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
class Commands(object):
|
||||
"""Contains the commands and initialisation for a full mcp run"""
|
||||
@@ -892,6 +894,8 @@
|
||||
@@ -918,6 +920,8 @@
|
||||
binlk = {CLIENT: self.binclient, SERVER: self.binserver}
|
||||
testlk = {CLIENT: self.testclient, SERVER: self.testserver}
|
||||
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
|
||||
return False
|
||||
return True
|
||||
@@ -1223,6 +1227,9 @@
|
||||
@@ -1249,6 +1253,9 @@
|
||||
pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
|
||||
pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
|
||||
pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
if not os.path.exists(pathbinlk[side]):
|
||||
os.makedirs(pathbinlk[side])
|
||||
@@ -1280,7 +1287,7 @@
|
||||
@@ -1306,7 +1313,7 @@
|
||||
raise
|
||||
|
||||
def startserver(self):
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
classpath = [os.path.join('..', p) for p in classpath]
|
||||
classpath = os.pathsep.join(classpath)
|
||||
os.chdir(self.dirjars)
|
||||
@@ -1288,7 +1295,7 @@
|
||||
@@ -1314,7 +1321,7 @@
|
||||
self.runmc(forkcmd)
|
||||
|
||||
def startclient(self):
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
classpath = [os.path.join('..', p) for p in classpath]
|
||||
classpath = os.pathsep.join(classpath)
|
||||
natives = os.path.join('..', self.dirnatives)
|
||||
@@ -1645,7 +1652,7 @@
|
||||
@@ -1671,7 +1678,7 @@
|
||||
self.runcmd(forkcmd)
|
||||
return True
|
||||
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
if not reobf:
|
||||
md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
|
||||
else:
|
||||
@@ -1660,6 +1667,9 @@
|
||||
@@ -1686,6 +1693,9 @@
|
||||
class_path = ''
|
||||
else:
|
||||
class_path += '/'
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
for class_file in fnmatch.filter(filelist, '*.class'):
|
||||
class_name = class_path + os.path.splitext(class_file)[0]
|
||||
bin_file = os.path.normpath(os.path.join(path, class_file))
|
||||
@@ -1832,6 +1842,9 @@
|
||||
@@ -1858,6 +1868,9 @@
|
||||
sys.exit(1)
|
||||
|
||||
for entry in newfiles:
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
if entry[3] == 'U':
|
||||
self.logger.info('Retrieving file from server : %s', entry[0])
|
||||
cur_file = os.path.normpath(entry[0])
|
||||
@@ -1852,6 +1865,9 @@
|
||||
@@ -1878,6 +1891,9 @@
|
||||
md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
|
||||
outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
|
||||
src = {CLIENT: self.srcclient, SERVER: self.srcserver}
|
||||
|
|
|
|||
|
|
@ -468,7 +468,7 @@ public class FMLCommonHandler
|
|||
MinecraftServer server = getMinecraftServerInstance();
|
||||
Loader.instance().serverStopped();
|
||||
// FORCE the internal server to stop: hello optifine workaround!
|
||||
ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, false, "field_71316_v", "u", "serverStopped");
|
||||
if (server!=null) ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, false, "field_71316_v", "u", "serverStopped");
|
||||
}
|
||||
|
||||
public String getModName()
|
||||
|
|
|
|||
|
|
@ -1,76 +1,76 @@
|
|||
#Main FML Access Transformer configuration file
|
||||
# TileEntity addMapping
|
||||
public ash.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
|
||||
public asi.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
|
||||
# EntityList addMappings
|
||||
public np.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
|
||||
public np.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
|
||||
public np.b #FD:EntityList/field_75625_b #nameToClassMap
|
||||
public np.c #FD:EntityList/field_75626_c #classToNameMap
|
||||
public np.d #FD:EntityList/field_75623_d #idToClassMap
|
||||
public nq.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
|
||||
public nq.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
|
||||
public nq.b #FD:EntityList/field_75625_b #nameToClassMap
|
||||
public nq.c #FD:EntityList/field_75626_c #classToNameMap
|
||||
public nq.d #FD:EntityList/field_75623_d #idToClassMap
|
||||
# RenderEngine
|
||||
#public bba.h #FD:RenderEngine/field_78367_h #textureList # -- MISSING MAPPING # -- MISSING MAPPING
|
||||
#public bge.g #FD:RenderEngine/field_78366_k #texturePack # -- MISSING MAPPING
|
||||
# RenderManager
|
||||
public bfx.q #FD:RenderManager/field_78729_o #renderers
|
||||
public bga.q #FD:RenderManager/field_78729_o #renderers
|
||||
# RenderBlocks - everything
|
||||
public bfd.* #FD:RenderBlocks/*
|
||||
public bfd.*() #MD:RenderBlocks/*
|
||||
public bfg.* #FD:RenderBlocks/*
|
||||
public bfg.*() #MD:RenderBlocks/*
|
||||
#RenderPlayer
|
||||
#public-f bht.h #FD:RenderPlayer/field_77110_j #armorlist # -- MISSING MAPPING
|
||||
#RenderBiped
|
||||
public-f bgg.l #FD:RenderBiped/field_82424_k #armorlist
|
||||
public-f bgj.l #FD:RenderBiped/field_82424_k #armorlist
|
||||
#StringTranslate
|
||||
#public bp.b #FD:StringTranslate/field_74815_b # -- MISSING MAPPING
|
||||
#public bp.e #FD:StringTranslate/field_74813_d # -- MISSING MAPPING
|
||||
# TileEntityRenderer
|
||||
public bip.m #FD:TileEntityRenderer/field_76966_m
|
||||
public bis.m #FD:TileEntityRenderer/field_76966_m
|
||||
# CraftingManager - make the add recipe methods public
|
||||
public zz.a(Lxy;[Ljava/lang/Object;)Laac; #MD:CraftingManager/func_92103_a
|
||||
public zz.b(Lxy;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
|
||||
public aaa.a(Lxz;[Ljava/lang/Object;)Laad; #MD:CraftingManager/func_92103_a
|
||||
public aaa.b(Lxz;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
|
||||
# WeightedRandomItem
|
||||
public mf.a #FD:WeightedRandomItem/field_76292_a #probability
|
||||
public mg.a #FD:WeightedRandomItem/field_76292_a #probability
|
||||
# ItemStack
|
||||
#public+f tv.c #FD:ItemStack/field_77993_c #itemId
|
||||
# StatBase
|
||||
public kq.a #FD:StatBase/field_75978_a #statName
|
||||
public kr.a #FD:StatBase/field_75978_a #statName
|
||||
# NetLoginHandler
|
||||
public ju.a(Lju;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
|
||||
public ju.g #FD:NetLoginHandler/field_72543_h #userName
|
||||
public jv.a(Ljv;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
|
||||
public jv.g #FD:NetLoginHandler/field_72543_h #userName
|
||||
# EntityPlayerMP getNextWindowId
|
||||
public jr.bJ()V #MD:EntityPlayerMP/func_71117_bO
|
||||
public jr.bX #FD:EntityPlayerMP/field_71139_cq
|
||||
public js.bJ()V #MD:EntityPlayerMP/func_71117_bO
|
||||
public js.bX #FD:EntityPlayerMP/field_71139_cq
|
||||
# EntityAITaskEntry
|
||||
public pq #CL:EntityAITaskEntry
|
||||
public pr #CL:EntityAITaskEntry
|
||||
# EntityAITasks
|
||||
public pp.a #FD:EntityAITasks/field_75782_a #taskList
|
||||
public pq.a #FD:EntityAITasks/field_75782_a #taskList
|
||||
# BlockChest
|
||||
public anc.m(Labq;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
|
||||
public and.m(Labr;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
|
||||
# EntityLiving
|
||||
#public ng.aU #FD:EntityLiving/field_70736_aM #carryoverDamage # -- MISSING MAPPING
|
||||
public oc.c #FD:EntityLiving/field_70714_bg #tasks
|
||||
public od.c #FD:EntityLiving/field_70714_bg #tasks
|
||||
#public ng.bG #FD:EntityLiving/field_70703_bu #isJumping # -- MISSING MAPPING
|
||||
# EntityAIOcelotSit
|
||||
protected qc.a(Labq;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
|
||||
protected qc.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
|
||||
protected qd.a(Labr;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
|
||||
protected qd.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
|
||||
# CallableMinecraftVersion - sanity check the MC version
|
||||
public c #CL:CallableMinecraftVersion
|
||||
public c.<init>(Lb;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
|
||||
# EntityAnimal
|
||||
public rl.bp #FD:EntityAnimal/field_70881_d #inLove
|
||||
public rm.bp #FD:EntityAnimal/field_70881_d #inLove
|
||||
# WorldType
|
||||
public aca.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
|
||||
public aca.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
|
||||
public acb.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
|
||||
public acb.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
|
||||
# ComponentVillage
|
||||
public aje #CL:ComponentVillage
|
||||
public ajf #CL:ComponentVillage
|
||||
# EntityVillager - minmax lists
|
||||
public tv.a(Labg;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
|
||||
public tv.b(Labg;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
|
||||
public tv.bB #FD:EntityVillager/field_70958_bB
|
||||
public tv.bC #FD:EntityVillager/field_70960_bC
|
||||
public tw.a(Labh;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
|
||||
public tw.b(Labh;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
|
||||
public tw.bB #FD:EntityVillager/field_70958_bB
|
||||
public tw.bC #FD:EntityVillager/field_70960_bC
|
||||
# GuiButtonMerchant
|
||||
public axn #CL:GuiButtonMerchant
|
||||
public axo #CL:GuiButtonMerchant
|
||||
|
||||
protected aun.a #FD:GuiYesNo/field_73942_a #guiScreen
|
||||
protected auo.a #FD:GuiYesNo/field_73942_a #guiScreen
|
||||
# Minecraft
|
||||
public atm.C #FD:Minecraft/field_71425_J #running
|
||||
public atm.M #FD:Minecraft/field_71446_o # textureManager
|
||||
public atn.C #FD:Minecraft/field_71425_J #running
|
||||
public atn.M #FD:Minecraft/field_71446_o # textureManager
|
||||
|
|
|
|||
|
|
@ -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
|
||||
tz cpw/mods/fml/common/network/Player
|
||||
ua cpw/mods/fml/common/network/Player
|
||||
net.minecraft.entity.player.EntityPlayer cpw/mods/fml/common/network/Player
|
||||
# block -> blockproxy
|
||||
aqr cpw/mods/fml/common/registry/BlockProxy
|
||||
aqs cpw/mods/fml/common/registry/BlockProxy
|
||||
net.minecraft.block.Block cpw/mods/fml/common/registry/BlockProxy
|
||||
# item -> itemproxy
|
||||
xw cpw/mods/fml/common/registry/ItemProxy
|
||||
xx cpw/mods/fml/common/registry/ItemProxy
|
||||
net.minecraft.item.Item cpw/mods/fml/common/registry/ItemProxy
|
||||
|
|
|
|||
4392
fml/conf/joined.exc
4392
fml/conf/joined.exc
File diff suppressed because it is too large
Load diff
36279
fml/conf/joined.srg
36279
fml/conf/joined.srg
File diff suppressed because it is too large
Load diff
|
|
@ -38,8 +38,8 @@ DirNatives = %(DirJars)s/bin/natives
|
|||
Client = %(DirJars)s/bin/minecraft.jar
|
||||
Server = %(DirJars)s/minecraft_server.jar
|
||||
LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
|
||||
MD5Client = 6a64a2136e3a3fe4d29b0a0df30b25fc
|
||||
MD5Server = 7c03305c8bf97a8e8f3cdb147fc90607
|
||||
MD5Client = 3c56fb4b77b1ca37dde69b5eb896fc4d
|
||||
MD5Server = ff8f81970a5955737c356b534d3aee96
|
||||
|
||||
[RETROGUARD]
|
||||
Location = %(DirRuntime)s/bin/retroguard.jar
|
||||
|
|
@ -127,8 +127,8 @@ LogFile = %(DirLogs)s/mcp.log
|
|||
LogFileErr = %(DirLogs)s/mcperr.log
|
||||
UpdateUrl =
|
||||
IgnoreUpdate = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
|
||||
RGIndex = 135000
|
||||
ParamIndex = 35000
|
||||
RGIndex = 140000
|
||||
ParamIndex = 40000
|
||||
|
||||
[ASTYLE]
|
||||
AstyleConfig = %(DirConf)s/astyle.cfg
|
||||
|
|
|
|||
|
|
@ -297,13 +297,15 @@ BackupList,net/minecraft/client/mco
|
|||
ExceptionMcoHttp,net/minecraft/client/mco
|
||||
ExceptionMcoService,net/minecraft/client/mco
|
||||
ExceptionRetryCall,net/minecraft/client/mco
|
||||
GuiScreenClientOutdated,net/minecraft/client/mco
|
||||
GuiScreenConfirmationType,net/minecraft/client/mco
|
||||
McoClient,net/minecraft/client/mco
|
||||
McoServer,net/minecraft/client/mco
|
||||
McoServerAddress,net/minecraft/client/mco
|
||||
McoServerList,net/minecraft/client/mco
|
||||
McoServerListEmptyAnon,net/minecraft/client/mco
|
||||
McoServerListUpdateThread,net/minecraft/client/mco
|
||||
McoServerListUpdateThreadComparer,net/minecraft/client/mco
|
||||
McoServerListUpdateTask,net/minecraft/client/mco
|
||||
McoServerListUpdateTaskComparator,net/minecraft/client/mco
|
||||
PendingInvite,net/minecraft/client/mco
|
||||
PendingInvitesList,net/minecraft/client/mco
|
||||
Request,net/minecraft/client/mco
|
||||
|
|
@ -405,10 +407,6 @@ EntitySnowShovelFX,net/minecraft/client/particle
|
|||
EntitySpellParticleFX,net/minecraft/client/particle
|
||||
EntitySplashFX,net/minecraft/client/particle
|
||||
EntitySuspendFX,net/minecraft/client/particle
|
||||
RenderCaveSpider,net/minecraft/client/renderer/entity
|
||||
RenderHorse,net/minecraft/client/renderer/entity
|
||||
RenderLeashKnot,net/minecraft/client/renderer/entity
|
||||
RendererLivingEntity,net/minecraft/client/renderer/entity
|
||||
ActiveRenderInfo,net/minecraft/client/renderer
|
||||
CallableMouseLocation,net/minecraft/client/renderer
|
||||
CallableParticlePositionInfo,net/minecraft/client/renderer
|
||||
|
|
@ -446,6 +444,7 @@ RenderBat,net/minecraft/client/renderer/entity
|
|||
RenderBiped,net/minecraft/client/renderer/entity
|
||||
RenderBlaze,net/minecraft/client/renderer/entity
|
||||
RenderBoat,net/minecraft/client/renderer/entity
|
||||
RenderCaveSpider,net/minecraft/client/renderer/entity
|
||||
RenderChicken,net/minecraft/client/renderer/entity
|
||||
RenderCow,net/minecraft/client/renderer/entity
|
||||
RenderCreeper,net/minecraft/client/renderer/entity
|
||||
|
|
@ -458,8 +457,10 @@ RenderFireball,net/minecraft/client/renderer/entity
|
|||
RenderFish,net/minecraft/client/renderer/entity
|
||||
RenderGhast,net/minecraft/client/renderer/entity
|
||||
RenderGiantZombie,net/minecraft/client/renderer/entity
|
||||
RenderHorse,net/minecraft/client/renderer/entity
|
||||
RenderIronGolem,net/minecraft/client/renderer/entity
|
||||
RenderItem,net/minecraft/client/renderer/entity
|
||||
RenderLeashKnot,net/minecraft/client/renderer/entity
|
||||
RenderLightningBolt,net/minecraft/client/renderer/entity
|
||||
RenderLiving,net/minecraft/client/renderer/entity
|
||||
RenderMagmaCube,net/minecraft/client/renderer/entity
|
||||
|
|
@ -486,6 +487,7 @@ RenderWither,net/minecraft/client/renderer/entity
|
|||
RenderWolf,net/minecraft/client/renderer/entity
|
||||
RenderXPOrb,net/minecraft/client/renderer/entity
|
||||
RenderZombie,net/minecraft/client/renderer/entity
|
||||
RendererLivingEntity,net/minecraft/client/renderer/entity
|
||||
AbstractTexture,net/minecraft/client/renderer/texture
|
||||
DynamicTexture,net/minecraft/client/renderer/texture
|
||||
IconRegister,net/minecraft/client/renderer/texture
|
||||
|
|
@ -522,7 +524,6 @@ DefaultResourcePack,net/minecraft/client/resources
|
|||
FallbackResourceManager,net/minecraft/client/resources
|
||||
FileResourcePack,net/minecraft/client/resources
|
||||
FolderResourcePack,net/minecraft/client/resources
|
||||
FolderResourcePackFilter,net/minecraft/client/resources
|
||||
FoliageColorReloadListener,net/minecraft/client/resources
|
||||
GrassColorReloadListener,net/minecraft/client/resources
|
||||
GuiScreenTemporaryResourcePackSelect,net/minecraft/client/resources
|
||||
|
|
@ -581,6 +582,7 @@ CommandHandler,net/minecraft/command
|
|||
CommandHelp,net/minecraft/command
|
||||
CommandKill,net/minecraft/command
|
||||
CommandNotFoundException,net/minecraft/command
|
||||
CommandPlaySound,net/minecraft/command
|
||||
CommandServerBan,net/minecraft/command
|
||||
CommandServerBanIp,net/minecraft/command
|
||||
CommandServerBanlist,net/minecraft/command
|
||||
|
|
@ -886,6 +888,7 @@ EntitySmallFireball,net/minecraft/entity/projectile
|
|||
EntitySnowball,net/minecraft/entity/projectile
|
||||
EntityThrowable,net/minecraft/entity/projectile
|
||||
EntityWitherSkull,net/minecraft/entity/projectile
|
||||
AnimalChest,net/minecraft/inventory
|
||||
Container,net/minecraft/inventory
|
||||
ContainerBeacon,net/minecraft/inventory
|
||||
ContainerBrewingStand,net/minecraft/inventory
|
||||
|
|
@ -894,6 +897,9 @@ ContainerDispenser,net/minecraft/inventory
|
|||
ContainerEnchantment,net/minecraft/inventory
|
||||
ContainerFurnace,net/minecraft/inventory
|
||||
ContainerHopper,net/minecraft/inventory
|
||||
ContainerHorseInventory,net/minecraft/inventory
|
||||
ContainerHorseInventorySlotArmor,net/minecraft/inventory
|
||||
ContainerHorseInventorySlotSaddle,net/minecraft/inventory
|
||||
ContainerMerchant,net/minecraft/inventory
|
||||
ContainerPlayer,net/minecraft/inventory
|
||||
ContainerRepair,net/minecraft/inventory
|
||||
|
|
@ -920,10 +926,6 @@ SlotEnchantment,net/minecraft/inventory
|
|||
SlotEnchantmentTable,net/minecraft/inventory
|
||||
SlotFurnace,net/minecraft/inventory
|
||||
SlotMerchantResult,net/minecraft/inventory
|
||||
AnimalChest,net/minecraft/inventory
|
||||
ContainerHorseInventory,net/minecraft/inventory
|
||||
ContainerHorseInventorySlotArmor,net/minecraft/inventory
|
||||
ContainerHorseInventorySlotSaddle,net/minecraft/inventory
|
||||
BehaviorDispenseArmor,net/minecraft/item
|
||||
BehaviorDispenseMinecart,net/minecraft/item
|
||||
EnumAction,net/minecraft/item
|
||||
|
|
|
|||
|
|
|
@ -4,14 +4,10 @@ p_100006_2_,par2Str,2
|
|||
p_100009_0_,par0,2
|
||||
p_100012_1_,par1,2
|
||||
p_100015_0_,par0KeyBinding,2
|
||||
p_101000_0_,par0GuiScreenOnlineServers,2
|
||||
p_101001_1_,par1,2
|
||||
p_101001_2_,par2,2
|
||||
p_101001_3_,par3,2
|
||||
p_101001_4_,par4,2
|
||||
p_101002_0_,par0GuiScreenOnlineServers,2
|
||||
p_101002_1_,par1McoServer,2
|
||||
p_101005_0_,par0GuiScreenOnlineServers,2
|
||||
p_101006_1_,par1,2
|
||||
p_101006_2_,par2,2
|
||||
p_101006_3_,par3,2
|
||||
|
|
@ -20,18 +16,6 @@ p_101008_1_,par1,2
|
|||
p_101008_2_,par2,2
|
||||
p_101008_3_,par3,2
|
||||
p_101008_4_,par4,2
|
||||
p_101009_0_,par0GuiScreenOnlineServers,2
|
||||
p_101009_1_,par1,2
|
||||
p_101009_2_,par2,2
|
||||
p_101009_3_,par3,2
|
||||
p_101009_4_,par4,2
|
||||
p_101011_0_,par0GuiScreenOnlineServers,2
|
||||
p_101011_1_,par1Str,2
|
||||
p_101012_0_,par0GuiScreenOnlineServers,2
|
||||
p_101012_1_,par1,2
|
||||
p_101012_2_,par2,2
|
||||
p_101012_3_,par3,2
|
||||
p_101012_4_,par4,2
|
||||
p_101015_1_,par1Str,2
|
||||
p_102007_1_,par1,2
|
||||
p_102007_2_,par2ItemStack,2
|
||||
|
|
@ -68,19 +52,12 @@ p_102027_4_,par4,2
|
|||
p_102027_5_,par5,2
|
||||
p_102027_6_,par6,2
|
||||
p_102027_7_,par7,2
|
||||
p_104030_0_,par0GuiScreenOnlineServers,2
|
||||
p_104030_1_,par1,2
|
||||
p_104030_2_,par2,2
|
||||
p_104030_3_,par3,2
|
||||
p_104030_4_,par4,2
|
||||
p_104030_5_,par5,2
|
||||
p_104031_0_,par0GuiScreenOnlineServers,2
|
||||
p_104031_1_,par1,2
|
||||
p_104031_2_,par2,2
|
||||
p_104031_3_,par3,2
|
||||
p_104031_4_,par4,2
|
||||
p_104032_0_,par0GuiScreenOnlineServers,2
|
||||
p_104038_0_,par0GuiScreenOnlineServers,2
|
||||
p_104039_1_,par1,2
|
||||
p_104039_2_,par2,2
|
||||
p_104039_3_,par3,2
|
||||
|
|
@ -223,7 +200,6 @@ p_110389_0_,par0GuiScreenMcoWorldTemplate,2
|
|||
p_110392_0_,par0GuiScreenMcoWorldTemplate,2
|
||||
p_110395_0_,par0GuiScreenMcoWorldTemplate,2
|
||||
p_110402_0_,par0GuiScreenOnlineServers,2
|
||||
p_110403_0_,par0GuiScreenOnlineServers,2
|
||||
p_110423_0_,par0,2
|
||||
p_110423_1_,par1,2
|
||||
p_110423_2_,par2,2
|
||||
|
|
@ -795,9 +771,6 @@ p_130104_0_,par0DataInput,2
|
|||
p_130104_1_,par1,2
|
||||
p_130107_1_,par1Str,2
|
||||
p_130109_1_,par1Str,2
|
||||
p_130113_1_,par1List,2
|
||||
p_130116_1_,par1McoServer,2
|
||||
p_130116_2_,par2McoServer,2
|
||||
p_130119_1_,par1,2
|
||||
p_130119_2_,par2,2
|
||||
p_130119_3_,par3,2
|
||||
|
|
@ -852,6 +825,59 @@ p_135066_3_,par3,2
|
|||
p_135066_4_,par4,2
|
||||
p_135072_0_,par0ContainerRepair,2
|
||||
p_135073_0_,par0ContainerRepair,2
|
||||
p_140008_0_,par0GuiScreenOnlineServers,2
|
||||
p_140008_1_,par1,2
|
||||
p_140009_1_,par1,2
|
||||
p_140010_0_,par0GuiScreenOnlineServers,2
|
||||
p_140011_0_,par0GuiScreenOnlineServers,2
|
||||
p_140011_1_,par1,2
|
||||
p_140013_0_,par0GuiScreenOnlineServers,2
|
||||
p_140014_0_,par0GuiScreenOnlineServers,2
|
||||
p_140015_0_,par0GuiScreenOnlineServers,2
|
||||
p_140017_0_,par0GuiScreenOnlineServers,2
|
||||
p_140020_0_,par0GuiScreenOnlineServers,2
|
||||
p_140020_1_,par1,2
|
||||
p_140020_2_,par2,2
|
||||
p_140020_3_,par3,2
|
||||
p_140020_4_,par4,2
|
||||
p_140022_0_,par0GuiScreenOnlineServers,2
|
||||
p_140023_0_,par0GuiScreenOnlineServers,2
|
||||
p_140024_0_,par0GuiScreenOnlineServers,2
|
||||
p_140024_1_,par1McoServer,2
|
||||
p_140025_0_,par0GuiScreenOnlineServers,2
|
||||
p_140026_0_,par0GuiScreenOnlineServers,2
|
||||
p_140026_1_,par1Str,2
|
||||
p_140027_0_,par0GuiScreenOnlineServers,2
|
||||
p_140027_1_,par1,2
|
||||
p_140028_0_,par0GuiScreenOnlineServers,2
|
||||
p_140030_1_,par1,2
|
||||
p_140031_0_,par0GuiScreenOnlineServers,2
|
||||
p_140031_1_,par1,2
|
||||
p_140031_2_,par2,2
|
||||
p_140031_3_,par3,2
|
||||
p_140031_4_,par4,2
|
||||
p_140031_5_,par5,2
|
||||
p_140032_1_,par1,2
|
||||
p_140033_0_,par0GuiScreenOnlineServers,2
|
||||
p_140034_0_,par0GuiScreenOnlineServers,2
|
||||
p_140035_0_,par0GuiScreenOnlineServers,2
|
||||
p_140035_1_,par1,2
|
||||
p_140035_2_,par2,2
|
||||
p_140035_3_,par3,2
|
||||
p_140035_4_,par4,2
|
||||
p_140036_0_,par0GuiScreenOnlineServers,2
|
||||
p_140036_1_,par1,2
|
||||
p_140037_0_,par0GuiScreenOnlineServers,2
|
||||
p_140038_0_,par0GuiScreenOnlineServers,2
|
||||
p_140039_0_,par0GuiScreenOnlineServers,2
|
||||
p_140041_0_,par0GuiScreenOnlineServers,2
|
||||
p_140055_1_,par1,2
|
||||
p_140057_0_,par0McoServerList,2
|
||||
p_140057_1_,par1,2
|
||||
p_140058_1_,par1McoServer,2
|
||||
p_140065_1_,par1List,2
|
||||
p_140068_1_,par1McoServer,2
|
||||
p_140068_2_,par2McoServer,2
|
||||
p_70000_1_,par1PlayerUsageSnooper,2
|
||||
p_70001_1_,par1PlayerUsageSnooper,2
|
||||
p_70003_1_,par1,2
|
||||
|
|
@ -8035,13 +8061,10 @@ p_96136_3_,par3,2
|
|||
p_96136_4_,par4FontRenderer,2
|
||||
p_96147_0_,par0GuiScreenResetWorld,2
|
||||
p_96148_0_,par0GuiScreenResetWorld,2
|
||||
p_96159_1_,par1,2
|
||||
p_96161_0_,par0GuiScreenOnlineServers,2
|
||||
p_96165_1_,par1Str,2
|
||||
p_96165_2_,par2,2
|
||||
p_96165_3_,par3,2
|
||||
p_96174_1_,par1McoServer,2
|
||||
p_96177_0_,par0GuiScreenOnlineServers,2
|
||||
p_96209_1_,par1Str,2
|
||||
p_96210_1_,par1Str,2
|
||||
p_96246_0_,par0GuiScreenCreateOnlineWorld,2
|
||||
|
|
@ -8331,23 +8354,10 @@ p_98054_1_,par1,2
|
|||
p_98055_1_,par1,2
|
||||
p_98062_1_,par1,2
|
||||
p_98063_1_,par1,2
|
||||
p_98072_0_,par0GuiScreenOnlineServers,2
|
||||
p_98074_0_,par0GuiScreenOnlineServers,2
|
||||
p_98075_0_,par0GuiScreenOnlineServers,2
|
||||
p_98076_0_,par0GuiScreenOnlineServers,2
|
||||
p_98078_0_,par0GuiScreenOnlineServers,2
|
||||
p_98078_1_,par1,2
|
||||
p_98079_0_,par0GuiScreenOnlineServers,2
|
||||
p_98081_0_,par0GuiScreenOnlineServers,2
|
||||
p_98081_1_,par1,2
|
||||
p_98084_0_,par0GuiScreenOnlineServers,2
|
||||
p_98086_1_,par1,2
|
||||
p_98087_0_,par0GuiScreenOnlineServers,2
|
||||
p_98089_0_,par0GuiScreenOnlineServers,2
|
||||
p_98089_1_,par1,2
|
||||
p_98091_0_,par0GuiScreenOnlineServers,2
|
||||
p_98092_0_,par0GuiScreenOnlineServers,2
|
||||
p_98094_0_,par0GuiScreenOnlineServers,2
|
||||
p_98096_0_,par0GuiConnecting,2
|
||||
p_98097_0_,par0GuiConnecting,2
|
||||
p_98144_0_,par0MobSpawnerBaseLogic,2
|
||||
|
|
@ -8692,11 +8702,6 @@ p_i1109_3_,par3McoServer,2
|
|||
p_i1110_1_,par1GuiScreen,2
|
||||
p_i1110_2_,par2GuiScreenConfigureWorld,2
|
||||
p_i1110_3_,par3McoServer,2
|
||||
p_i1111_1_,par1GuiScreen,2
|
||||
p_i1111_2_,par2Str,2
|
||||
p_i1111_3_,par3Str,2
|
||||
p_i1111_4_,par4Str,2
|
||||
p_i1111_5_,par5,2
|
||||
p_i1112_1_,par1Minecraft,2
|
||||
p_i1112_2_,par2GuiScreen,2
|
||||
p_i1112_3_,par3TaskLongRunning,2
|
||||
|
|
@ -8737,14 +8742,6 @@ p_i1126_1_,par1GuiScreenPendingInvitation,2
|
|||
p_i1127_1_,par1GuiScreenPendingInvitation,2
|
||||
p_i1128_1_,par1GuiScreenPendingInvitation,2
|
||||
p_i1129_1_,par1GuiScreen,2
|
||||
p_i1130_1_,par1McoServerListUpdateThread,2
|
||||
p_i1130_2_,par2Str,2
|
||||
p_i1131_1_,par1McoServerListUpdateThread,2
|
||||
p_i1131_2_,par2Str,2
|
||||
p_i1131_3_,par3McoServerListEmptyAnon,2
|
||||
p_i1132_1_,par1McoServerList,2
|
||||
p_i1133_1_,par1McoServerList,2
|
||||
p_i1133_2_,par2McoServerListEmptyAnon,2
|
||||
p_i1134_1_,par1GuiScreenResetWorld,2
|
||||
p_i1134_2_,par2,2
|
||||
p_i1134_4_,par4Str,2
|
||||
|
|
@ -11637,17 +11634,38 @@ p_i2309_3_,par3Str,2
|
|||
p_i2310_1_,par1Str,2
|
||||
p_i2311_1_,par1Str,2
|
||||
p_i2312_1_,par1Str,2
|
||||
p_i2313_1_,par1DedicatedServer,2
|
||||
p_i2314_1_,par1DedicatedServer,2
|
||||
p_i2315_1_,par1DedicatedServer,2
|
||||
p_i2316_1_,par1MinecraftServerGui,2
|
||||
p_i2316_2_,par2JTextField,2
|
||||
p_i2317_1_,par1MinecraftServerGui,2
|
||||
p_i2318_1_,par1MinecraftServer,2
|
||||
p_i2319_1_,par1MinecraftServer,2
|
||||
p_i2320_1_,par1StatsComponent,2
|
||||
p_i2321_1_,par1JTextArea,2
|
||||
p_i2322_1_,par1TextAreaLogHandler,2
|
||||
p_i2323_1_,par1GuiScreen,2
|
||||
p_i2324_1_,par1Str,2
|
||||
p_i2324_2_,par2,2
|
||||
p_i2324_3_,par3Str,2
|
||||
p_i2324_4_,par4,2
|
||||
p_i2325_1_,par1GuiScreen,2
|
||||
p_i2325_2_,par2GuiScreenConfirmationType,2
|
||||
p_i2325_3_,par3Str,2
|
||||
p_i2325_4_,par4Str,2
|
||||
p_i2325_5_,par5,2
|
||||
p_i2326_1_,par1McoServerListUpdateTask,2
|
||||
p_i2326_2_,par2Str,2
|
||||
p_i2327_1_,par1McoServerListUpdateTask,2
|
||||
p_i2327_2_,par2Str,2
|
||||
p_i2327_3_,par3McoServerListEmptyAnon,2
|
||||
p_i2328_1_,par1McoServerList,2
|
||||
p_i2329_1_,par1McoServerList,2
|
||||
p_i2329_2_,par2McoServerListEmptyAnon,2
|
||||
p_i2330_1_,par1,2
|
||||
p_i2330_2_,par2Str,2
|
||||
p_i2330_3_,par3,2
|
||||
p_i2331_1_,par1DedicatedServer,2
|
||||
p_i2332_1_,par1DedicatedServer,2
|
||||
p_i2333_1_,par1DedicatedServer,2
|
||||
p_i2334_1_,par1MinecraftServerGui,2
|
||||
p_i2334_2_,par2JTextField,2
|
||||
p_i2335_1_,par1MinecraftServerGui,2
|
||||
p_i2336_1_,par1MinecraftServer,2
|
||||
p_i2337_1_,par1MinecraftServer,2
|
||||
p_i2338_1_,par1StatsComponent,2
|
||||
p_i2339_1_,par1JTextArea,2
|
||||
p_i2340_1_,par1TextAreaLogHandler,2
|
||||
p_main_0_,par0ArrayOfStr,2
|
||||
p_openConnection_1_,par1URL,2
|
||||
p_paint_1_,par1Graphics,2
|
||||
|
|
|
|||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
|
||||
--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java Sun Jun 30 12:35:15 2013
|
||||
+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java Sun Jun 30 12:57:28 2013
|
||||
--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java Sun Jun 30 21:44:00 2013
|
||||
+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java Sun Jun 30 21:45:42 2013
|
||||
@@ -21,9 +21,14 @@
|
||||
|
||||
public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
|
||||
|
|
@ -29,8 +29,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraf
|
|||
}
|
||||
}
|
||||
diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
|
||||
--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java Sun Jun 30 12:35:16 2013
|
||||
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Sun Jun 30 12:58:25 2013
|
||||
--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java Sun Jun 30 21:44:00 2013
|
||||
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Sun Jun 30 21:45:42 2013
|
||||
@@ -11,6 +11,10 @@
|
||||
|
||||
public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
|
||||
|
|
@ -43,8 +43,8 @@ diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minec
|
|||
if(this.field_74885_f != 2 && this.field_74885_f != 3) {
|
||||
this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
|
||||
diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
|
||||
--- minecraft\net\minecraft\src\DedicatedServer.java Sun Jun 30 12:35:16 2013
|
||||
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java Sun Jun 30 12:59:50 2013
|
||||
--- minecraft\net\minecraft\src\DedicatedServer.java Sun Jun 30 21:44:01 2013
|
||||
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java Sun Jun 30 21:45:42 2013
|
||||
@@ -207,7 +207,7 @@
|
||||
System.exit(0);
|
||||
}
|
||||
|
|
@ -55,8 +55,8 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
|
|||
this.func_71333_ah();
|
||||
}
|
||||
diff -r -U 3 minecraft\net\minecraft\src\EntityDragon.java minecraft_patched\net\minecraft\src\EntityDragon.java
|
||||
--- minecraft\net\minecraft\src\EntityDragon.java Sun Jun 30 12:35:16 2013
|
||||
+++ minecraft_patched\net\minecraft\src\EntityDragon.java Sun Jun 30 13:01:34 2013
|
||||
--- minecraft\net\minecraft\src\EntityDragon.java Sun Jun 30 21:44:01 2013
|
||||
+++ minecraft_patched\net\minecraft\src\EntityDragon.java Sun Jun 30 21:45:42 2013
|
||||
@@ -551,4 +551,14 @@
|
||||
protected float func_70599_aP() {
|
||||
return 5.0F;
|
||||
|
|
@ -73,8 +73,8 @@ diff -r -U 3 minecraft\net\minecraft\src\EntityDragon.java minecraft_patched\net
|
|||
+ }
|
||||
}
|
||||
diff -r -U 3 minecraft\net\minecraft\src\EntityWither.java minecraft_patched\net\minecraft\src\EntityWither.java
|
||||
--- minecraft\net\minecraft\src\EntityWither.java Sun Jun 30 12:35:16 2013
|
||||
+++ minecraft_patched\net\minecraft\src\EntityWither.java Sun Jun 30 13:02:20 2013
|
||||
--- minecraft\net\minecraft\src\EntityWither.java Sun Jun 30 21:44:02 2013
|
||||
+++ minecraft_patched\net\minecraft\src\EntityWither.java Sun Jun 30 21:45:42 2013
|
||||
@@ -458,4 +458,13 @@
|
||||
this.field_70154_o = null;
|
||||
}
|
||||
|
|
@ -90,8 +90,8 @@ diff -r -U 3 minecraft\net\minecraft\src\EntityWither.java minecraft_patched\net
|
|||
+ }
|
||||
}
|
||||
diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java
|
||||
--- minecraft\net\minecraft\src\EnumChatFormatting.java Sun Jun 30 12:35:16 2013
|
||||
+++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java Sun Jun 30 13:02:35 2013
|
||||
--- minecraft\net\minecraft\src\EnumChatFormatting.java Sun Jun 30 21:44:02 2013
|
||||
+++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java Sun Jun 30 21:45:42 2013
|
||||
@@ -38,7 +38,7 @@
|
||||
private final String field_96304_B;
|
||||
|
||||
|
|
@ -102,8 +102,8 @@ diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patch
|
|||
|
||||
private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_4_) {
|
||||
diff -r -U 3 minecraft\net\minecraft\src\FileResourcePack.java minecraft_patched\net\minecraft\src\FileResourcePack.java
|
||||
--- minecraft\net\minecraft\src\FileResourcePack.java Sun Jun 30 12:35:17 2013
|
||||
+++ minecraft_patched\net\minecraft\src\FileResourcePack.java Sun Jun 30 13:04:31 2013
|
||||
--- minecraft\net\minecraft\src\FileResourcePack.java Sun Jun 30 21:44:02 2013
|
||||
+++ minecraft_patched\net\minecraft\src\FileResourcePack.java Sun Jun 30 21:45:42 2013
|
||||
@@ -84,12 +84,18 @@
|
||||
|
||||
protected void finalize() {
|
||||
|
|
@ -123,9 +123,21 @@ diff -r -U 3 minecraft\net\minecraft\src\FileResourcePack.java minecraft_patched
|
|||
this.field_110600_d = null;
|
||||
}
|
||||
|
||||
diff -r -U 3 minecraft\net\minecraft\src\FolderResourcePack.java minecraft_patched\net\minecraft\src\FolderResourcePack.java
|
||||
--- minecraft\net\minecraft\src\FolderResourcePack.java Sun Jun 30 21:44:02 2013
|
||||
+++ minecraft_patched\net\minecraft\src\FolderResourcePack.java Sun Jun 30 21:46:52 2013
|
||||
@@ -29,7 +29,7 @@
|
||||
HashSet var1 = Sets.newHashSet();
|
||||
File var2 = new File(this.field_110597_b, "assets/");
|
||||
if(var2.isDirectory()) {
|
||||
- File[] var3 = var2.listFiles(DirectoryFileFilter.DIRECTORY);
|
||||
+ File[] var3 = var2.listFiles((java.io.FileFilter)DirectoryFileFilter.DIRECTORY);
|
||||
int var4 = var3.length;
|
||||
|
||||
for(int var5 = 0; var5 < var4; ++var5) {
|
||||
diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
|
||||
--- minecraft\net\minecraft\src\FontRenderer.java Sun Jun 30 12:35:17 2013
|
||||
+++ minecraft_patched\net\minecraft\src\FontRenderer.java Sun Jun 30 13:05:19 2013
|
||||
--- minecraft\net\minecraft\src\FontRenderer.java Sun Jun 30 21:44:02 2013
|
||||
+++ minecraft_patched\net\minecraft\src\FontRenderer.java Sun Jun 30 21:45:42 2013
|
||||
@@ -625,8 +625,6 @@
|
||||
case 10:
|
||||
--var5;
|
||||
|
|
@ -145,8 +157,8 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
|
|||
var4 += this.func_78263_a(var8);
|
||||
if(var7) {
|
||||
diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
|
||||
--- minecraft\net\minecraft\src\IntegratedServer.java Sun Jun 30 12:35:17 2013
|
||||
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java Sun Jun 30 13:05:37 2013
|
||||
--- minecraft\net\minecraft\src\IntegratedServer.java Sun Jun 30 21:44:02 2013
|
||||
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java Sun Jun 30 21:45:42 2013
|
||||
@@ -103,7 +103,7 @@
|
||||
return true;
|
||||
}
|
||||
|
|
@ -157,8 +169,8 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
|
|||
this.field_71348_o = this.field_71347_n.func_71752_f();
|
||||
if(!var1 && this.field_71348_o) {
|
||||
diff -r -U 3 minecraft\net\minecraft\src\Minecraft.java minecraft_patched\net\minecraft\src\Minecraft.java
|
||||
--- minecraft\net\minecraft\src\Minecraft.java Sun Jun 30 12:35:17 2013
|
||||
+++ minecraft_patched\net\minecraft\src\Minecraft.java Sun Jun 30 13:28:05 2013
|
||||
--- minecraft\net\minecraft\src\Minecraft.java Sun Jun 30 21:44:05 2013
|
||||
+++ minecraft_patched\net\minecraft\src\Minecraft.java Sun Jun 30 21:45:42 2013
|
||||
@@ -599,8 +599,8 @@
|
||||
return;
|
||||
}
|
||||
|
|
@ -208,8 +220,8 @@ diff -r -U 3 minecraft\net\minecraft\src\Minecraft.java minecraft_patched\net\mi
|
|||
}
|
||||
|
||||
diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched\net\minecraft\src\RConThreadClient.java
|
||||
--- minecraft\net\minecraft\src\RConThreadClient.java Sun Jun 30 12:35:18 2013
|
||||
+++ minecraft_patched\net\minecraft\src\RConThreadClient.java Sun Jun 30 13:07:31 2013
|
||||
--- minecraft\net\minecraft\src\RConThreadClient.java Sun Jun 30 21:44:05 2013
|
||||
+++ minecraft_patched\net\minecraft\src\RConThreadClient.java Sun Jun 30 21:45:42 2013
|
||||
@@ -32,8 +32,8 @@
|
||||
}
|
||||
|
||||
|
|
@ -249,8 +261,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched
|
|||
|
||||
private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException {
|
||||
diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java
|
||||
--- minecraft\net\minecraft\src\RenderBlocks.java Sun Jun 30 12:35:18 2013
|
||||
+++ minecraft_patched\net\minecraft\src\RenderBlocks.java Sun Jun 30 13:09:31 2013
|
||||
--- minecraft\net\minecraft\src\RenderBlocks.java Sun Jun 30 21:44:05 2013
|
||||
+++ minecraft_patched\net\minecraft\src\RenderBlocks.java Sun Jun 30 21:45:42 2013
|
||||
@@ -1960,16 +1960,16 @@
|
||||
float var25 = (float)(p_78589_2_ + 1);
|
||||
float var26 = (float)(p_78589_4_ + 0);
|
||||
|
|
@ -282,8 +294,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net
|
|||
var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94212_f(), (double)var8.func_94206_g());
|
||||
var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94209_e(), (double)var8.func_94206_g());
|
||||
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
|
||||
--- minecraft\net\minecraft\src\RenderGlobal.java Sun Jun 30 12:35:18 2013
|
||||
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Sun Jun 30 13:09:31 2013
|
||||
--- minecraft\net\minecraft\src\RenderGlobal.java Sun Jun 30 21:44:06 2013
|
||||
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Sun Jun 30 21:45:42 2013
|
||||
@@ -1435,7 +1435,7 @@
|
||||
double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
|
||||
double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
|
||||
|
|
@ -294,8 +306,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
|
|||
this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
|
||||
} else if(p_72726_1_.equals("largeexplode")) {
|
||||
diff -r -U 3 minecraft\net\minecraft\src\SoundPoolURLConnection.java minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java
|
||||
--- minecraft\net\minecraft\src\SoundPoolURLConnection.java Sun Jun 30 12:35:18 2013
|
||||
+++ minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java Sun Jun 30 13:10:50 2013
|
||||
--- minecraft\net\minecraft\src\SoundPoolURLConnection.java Sun Jun 30 21:44:06 2013
|
||||
+++ minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java Sun Jun 30 21:45:42 2013
|
||||
@@ -22,7 +22,11 @@
|
||||
public void connect() {}
|
||||
|
||||
|
|
@ -309,8 +321,8 @@ diff -r -U 3 minecraft\net\minecraft\src\SoundPoolURLConnection.java minecraft_p
|
|||
|
||||
// $FF: synthetic method
|
||||
diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
|
||||
--- minecraft\net\minecraft\src\TcpMasterThread.java Sun Jun 30 12:35:19 2013
|
||||
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java Sun Jun 30 13:10:50 2013
|
||||
--- minecraft\net\minecraft\src\TcpMasterThread.java Sun Jun 30 21:44:06 2013
|
||||
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java Sun Jun 30 21:45:42 2013
|
||||
@@ -11,6 +11,7 @@
|
||||
this.field_74504_a = p_i1395_1_;
|
||||
}
|
||||
|
|
@ -320,8 +332,8 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\
|
|||
try {
|
||||
Thread.sleep(5000L);
|
||||
diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
|
||||
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Sun Jun 30 12:35:19 2013
|
||||
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Sun Jun 30 13:11:10 2013
|
||||
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Sun Jun 30 21:44:06 2013
|
||||
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Sun Jun 30 21:45:42 2013
|
||||
@@ -20,6 +20,7 @@
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java
|
||||
--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java Sun Jun 30 12:36:32 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java Sun Jun 30 12:48:42 2013
|
||||
--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java Sun Jun 30 21:45:24 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java Sun Jun 30 21:45:41 2013
|
||||
@@ -21,9 +21,14 @@
|
||||
|
||||
public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
|
||||
|
|
@ -30,8 +30,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java m
|
|||
}
|
||||
}
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
|
||||
--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java Sun Jun 30 12:36:32 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Sun Jun 30 12:41:20 2013
|
||||
--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java Sun Jun 30 21:45:25 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Sun Jun 30 21:45:41 2013
|
||||
@@ -11,6 +11,10 @@
|
||||
|
||||
public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
|
||||
|
|
@ -44,8 +44,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.jav
|
|||
if(this.field_74885_f != 2 && this.field_74885_f != 3) {
|
||||
this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
|
||||
--- minecraft_server\net\minecraft\src\DedicatedServer.java Sun Jun 30 12:36:32 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java Sun Jun 30 12:41:48 2013
|
||||
--- minecraft_server\net\minecraft\src\DedicatedServer.java Sun Jun 30 21:45:25 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java Sun Jun 30 21:45:41 2013
|
||||
@@ -208,7 +208,7 @@
|
||||
System.exit(0);
|
||||
}
|
||||
|
|
@ -56,8 +56,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
|
|||
this.func_71333_ah();
|
||||
}
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java
|
||||
--- minecraft_server\net\minecraft\src\EnumChatFormatting.java Sun Jun 30 12:36:33 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java Sun Jun 30 12:42:08 2013
|
||||
--- minecraft_server\net\minecraft\src\EnumChatFormatting.java Sun Jun 30 21:45:26 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java Sun Jun 30 21:45:41 2013
|
||||
@@ -38,7 +38,7 @@
|
||||
private final String field_96304_B;
|
||||
|
||||
|
|
@ -68,8 +68,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraf
|
|||
|
||||
private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_4_) {
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_server_patched\net\minecraft\src\MemoryConnection.java
|
||||
--- minecraft_server\net\minecraft\src\MemoryConnection.java Sun Jun 30 12:36:33 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java Sun Jun 30 12:46:26 2013
|
||||
--- minecraft_server\net\minecraft\src\MemoryConnection.java Sun Jun 30 21:45:26 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java Sun Jun 30 21:45:41 2013
|
||||
@@ -11,13 +11,18 @@
|
||||
public class MemoryConnection implements INetworkManager {
|
||||
|
||||
|
|
@ -91,8 +91,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_
|
|||
public void func_74425_a(NetHandler p_74425_1_) {
|
||||
this.field_74440_d = p_74425_1_;
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
|
||||
--- minecraft_server\net\minecraft\src\RConThreadClient.java Sun Jun 30 12:36:33 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java Sun Jun 30 12:51:57 2013
|
||||
--- minecraft_server\net\minecraft\src\RConThreadClient.java Sun Jun 30 21:45:26 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java Sun Jun 30 21:45:41 2013
|
||||
@@ -32,8 +32,8 @@
|
||||
}
|
||||
|
||||
|
|
@ -132,8 +132,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_
|
|||
|
||||
private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException {
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
|
||||
--- minecraft_server\net\minecraft\src\TcpMasterThread.java Sun Jun 30 12:36:34 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java Sun Jun 30 12:52:29 2013
|
||||
--- minecraft_server\net\minecraft\src\TcpMasterThread.java Sun Jun 30 21:45:27 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java Sun Jun 30 21:45:41 2013
|
||||
@@ -11,6 +11,7 @@
|
||||
this.field_74504_a = p_i1395_1_;
|
||||
}
|
||||
|
|
@ -143,8 +143,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_s
|
|||
try {
|
||||
Thread.sleep(5000L);
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
|
||||
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java Sun Jun 30 12:36:34 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Sun Jun 30 12:52:53 2013
|
||||
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java Sun Jun 30 21:45:27 2013
|
||||
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Sun Jun 30 21:45:41 2013
|
||||
@@ -20,6 +20,7 @@
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[VERSION]
|
||||
MCPVersion = 8.01
|
||||
ClientVersion = 1.6
|
||||
ServerVersion = 1.6
|
||||
MCPVersion = 8.02
|
||||
ClientVersion = 1.6.1
|
||||
ServerVersion = 1.6.1
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ def read_mc_versions(fml_dir, version=None, work_dir=None):
|
|||
mc_info['server_url'] = '%s/minecraft_server.%s.jar' % (base_url, version)
|
||||
if not work_dir is None:
|
||||
version_dir = os.path.join(work_dir, 'versions', version)
|
||||
mc_info['natives_dir'] = os.path.join(work_dir, 'libraries', 'natives')
|
||||
mc_info['natives_dir'] = os.path.join(version_dir, '%s-natives' % version)
|
||||
mc_info['library_dir'] = os.path.join(work_dir, 'libraries')
|
||||
mc_info['client_file'] = os.path.join(version_dir, '%s.jar' % version)
|
||||
mc_info['json_file'] = os.path.join(version_dir, '%s.json' % version)
|
||||
|
|
@ -272,7 +272,7 @@ def file_backup(file, md5=None):
|
|||
|
||||
if os.path.isfile(src):
|
||||
if not get_md5(src) == md5 and not md5 is None:
|
||||
print 'Modified %s detected, removing' % os.path.basename(src_jar)
|
||||
print 'Modified %s detected, removing' % os.path.basename(src)
|
||||
os.remove(src)
|
||||
else:
|
||||
shutil.copy(src, bck)
|
||||
|
|
@ -1016,8 +1016,8 @@ def decompile_minecraft(fml_dir, mcp_dir, disable_at=False, disable_merge=False,
|
|||
Commands.applyss = applyss_shunt
|
||||
Commands.checkjars = checkjars_shunt
|
||||
#decompile -d -n -r
|
||||
# Conf JAD CSV -r -d -a -n -p -o -l -g -c -s --rg --workDir
|
||||
decompile(None, False, False, True, True, False, True, False, False, False, False, not disable_client, enable_server, False, 'none')
|
||||
# Conf JAD CSV -r -d -a -n -p -o -l -g -c -s --rg --workDir --json(None=compute) --nocopy
|
||||
decompile(None, False, False, True, True, False, True, False, False, False, False, not disable_client, enable_server, False, os.path.join(mcp_dir,'jars'), None, True)
|
||||
reset_logger()
|
||||
os.chdir(fml_dir)
|
||||
post_decompile(mcp_dir, fml_dir)
|
||||
|
|
@ -1034,7 +1034,7 @@ def decompile_minecraft(fml_dir, mcp_dir, disable_at=False, disable_merge=False,
|
|||
cleanup_source(src_dir)
|
||||
|
||||
os.chdir(mcp_dir)
|
||||
commands = Commands(verify=True)
|
||||
commands = Commands(verify=True,workdir=os.path.join(mcp_dir,'jars'))
|
||||
|
||||
if not disable_client:
|
||||
updatemd5_side(mcp_dir, commands, CLIENT)
|
||||
|
|
|
|||
125
fml/jsons/1.6.1-dev.json
Normal file
125
fml/jsons/1.6.1-dev.json
Normal file
|
|
@ -0,0 +1,125 @@
|
|||
{
|
||||
"id": "FML{version}",
|
||||
"time": "{timestamp}",
|
||||
"releaseTime": "{timestamp}",
|
||||
"type": "release",
|
||||
"processArguments": "username_session_version",
|
||||
"minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
|
||||
"minimumLauncherVersion": 2,
|
||||
"libraries": [
|
||||
{
|
||||
"name": "net.minecraft:launchwrapper:1.3",
|
||||
"comment" : "Important for FML, we add this"
|
||||
},
|
||||
{
|
||||
"name": "org.ow2.asm:asm-all:4.1",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2",
|
||||
"comment" : "Important for FML, we add this"
|
||||
},
|
||||
{
|
||||
"name": "net.sf.jopt-simple:jopt-simple:4.5",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2"
|
||||
},
|
||||
{
|
||||
"name": "lzma:lzma:0.0.1"
|
||||
},
|
||||
{
|
||||
"name": "com.paulscode:codecjorbis:20101023"
|
||||
},
|
||||
{
|
||||
"name": "com.paulscode:codecwav:20101023"
|
||||
},
|
||||
{
|
||||
"name": "com.paulscode:libraryjavasound:20101123"
|
||||
},
|
||||
{
|
||||
"name": "com.paulscode:librarylwjglopenal:20100824"
|
||||
},
|
||||
{
|
||||
"name": "com.paulscode:soundsystem:20120107"
|
||||
},
|
||||
{
|
||||
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2"
|
||||
},
|
||||
{
|
||||
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2"
|
||||
},
|
||||
{
|
||||
"name": "argo:argo:2.25_fixed"
|
||||
},
|
||||
{
|
||||
"name": "net.sourceforge.argo:argo:2.25",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2",
|
||||
"comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
|
||||
},
|
||||
{
|
||||
"name": "org.bouncycastle:bcprov-jdk15on:1.47",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2"
|
||||
},
|
||||
{
|
||||
"name": "com.google.guava:guava:14.0",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2"
|
||||
},
|
||||
{
|
||||
"name": "org.apache.commons:commons-lang3:3.1",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2"
|
||||
},
|
||||
{
|
||||
"name": "commons-io:commons-io:2.4",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2"
|
||||
},
|
||||
{
|
||||
"name": "net.java.jinput:jinput:2.0.5",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2"
|
||||
},
|
||||
{
|
||||
"name": "net.java.jutils:jutils:1.0.0",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2"
|
||||
},
|
||||
{
|
||||
"name": "com.google.code.gson:gson:2.2.2",
|
||||
"children" : ["sources"],
|
||||
"url" : "http://repo.maven.apache.org/maven2"
|
||||
},
|
||||
{
|
||||
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
|
||||
"natives": {
|
||||
"linux": "natives-linux",
|
||||
"windows": "natives-windows",
|
||||
"osx": "natives-osx"
|
||||
},
|
||||
"extract": {
|
||||
"exclude": [
|
||||
"META-INF/"
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "net.java.jinput:jinput-platform:2.0.5",
|
||||
"natives": {
|
||||
"linux": "natives-linux",
|
||||
"windows": "natives-windows",
|
||||
"osx": "natives-osx"
|
||||
},
|
||||
"extract": {
|
||||
"exclude": [
|
||||
"META-INF/"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"mainClass": "net.minecraft.client.main.Main"
|
||||
}
|
||||
93
fml/jsons/1.6.1-rel.json
Normal file
93
fml/jsons/1.6.1-rel.json
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
{
|
||||
"id": "FML{version}",
|
||||
"time": "{timestamp}",
|
||||
"releaseTime": "{timestamp}",
|
||||
"type": "release",
|
||||
"processArguments": "username_session_version",
|
||||
"minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
|
||||
"minimumLauncherVersion": 2,
|
||||
"libraries": [
|
||||
{
|
||||
"name": "cpw.mods:fml:{version}",
|
||||
"devdl" : "false"
|
||||
},
|
||||
{
|
||||
"name": "net.minecraft:launchwrapper:1.3"
|
||||
},
|
||||
{
|
||||
"name": "net.sf.jopt-simple:jopt-simple:4.5"
|
||||
},
|
||||
{
|
||||
"name": "com.paulscode:codecjorbis:20101023"
|
||||
},
|
||||
{
|
||||
"name": "com.paulscode:codecwav:20101023"
|
||||
},
|
||||
{
|
||||
"name": "com.paulscode:libraryjavasound:20101123"
|
||||
},
|
||||
{
|
||||
"name": "com.paulscode:librarylwjglopenal:20100824"
|
||||
},
|
||||
{
|
||||
"name": "com.paulscode:soundsystem:20120107"
|
||||
},
|
||||
{
|
||||
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0"
|
||||
},
|
||||
{
|
||||
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0"
|
||||
},
|
||||
{
|
||||
"name": "argo:argo:2.25_fixed"
|
||||
},
|
||||
{
|
||||
"name": "org.bouncycastle:bcprov-jdk15on:1.47"
|
||||
},
|
||||
{
|
||||
"name": "com.google.guava:guava:14.0"
|
||||
},
|
||||
{
|
||||
"name": "org.apache.commons:commons-lang3:3.1"
|
||||
},
|
||||
{
|
||||
"name": "commons-io:commons-io:2.4"
|
||||
},
|
||||
{
|
||||
"name": "net.java.jinput:jinput:2.0.5"
|
||||
},
|
||||
{
|
||||
"name": "net.java.jutils:jutils:1.0.0"
|
||||
},
|
||||
{
|
||||
"name": "com.google.code.gson:gson:2.2.2"
|
||||
},
|
||||
{
|
||||
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
|
||||
"natives": {
|
||||
"linux": "natives-linux",
|
||||
"windows": "natives-windows",
|
||||
"osx": "natives-osx"
|
||||
},
|
||||
"extract": {
|
||||
"exclude": [
|
||||
"META-INF/"
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "net.java.jinput:jinput-platform:2.0.5",
|
||||
"natives": {
|
||||
"linux": "natives-linux",
|
||||
"windows": "natives-windows",
|
||||
"osx": "natives-osx"
|
||||
},
|
||||
"extract": {
|
||||
"exclude": [
|
||||
"META-INF/"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"mainClass": "net.minecraft.client.main.Main"
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
[default]
|
||||
current_ver = 1.6
|
||||
current_ver = 1.6.1
|
||||
base_url = http://s3.amazonaws.com/MinecraftDownload/
|
||||
libraries = lwjgl.jar lwjgl_util.jar jinput.jar
|
||||
natives = windows_natives.jar macosx_natives.jar linux_natives.jar
|
||||
|
|
@ -100,3 +100,10 @@ server_md5 = 7c03305c8bf97a8e8f3cdb147fc90607
|
|||
mcp_ver = 8.01
|
||||
mcp_url =
|
||||
mcp_md5 = 39da81bbb4d73b3f5e2d1f8f5682cdb9
|
||||
|
||||
[1.6.1]
|
||||
client_md5 = 3c56fb4b77b1ca37dde69b5eb896fc4d
|
||||
server_md5 = ff8f81970a5955737c356b534d3aee96
|
||||
mcp_ver = 8.02
|
||||
mcp_url =
|
||||
mcp_md5 = 39da81bbb4d73b3f5e2d1f8f5682cdb9
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
+import java.util.List;
|
||||
import java.util.Random;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
@@ -23,6 +26,9 @@
|
||||
import net.minecraft.client.mco.ExceptionMcoService;
|
||||
@@ -26,6 +29,9 @@
|
||||
import org.apache.commons.io.Charsets;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.util.glu.Project;
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class GuiMainMenu extends GuiScreen
|
||||
@@ -52,6 +58,8 @@
|
||||
@@ -55,6 +61,8 @@
|
||||
private ResourceLocation field_110351_G;
|
||||
private GuiButton field_130023_H;
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
public GuiMainMenu()
|
||||
{
|
||||
BufferedReader bufferedreader = null;
|
||||
@@ -203,13 +211,22 @@
|
||||
@@ -206,13 +214,22 @@
|
||||
private void func_130022_h()
|
||||
{
|
||||
this.field_130023_H.field_73748_h = true;
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
this.field_130023_H.field_73748_h = false;
|
||||
}
|
||||
|
||||
@@ -256,6 +273,11 @@
|
||||
@@ -259,6 +276,11 @@
|
||||
if (p_73875_1_.field_73741_f == 4)
|
||||
{
|
||||
this.field_73882_e.func_71400_g();
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
}
|
||||
|
||||
if (p_73875_1_.field_73741_f == 11)
|
||||
@@ -492,7 +514,16 @@
|
||||
@@ -520,7 +542,16 @@
|
||||
s = s + " Demo";
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue