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

Update to MC 1.4.1 and Forge 6.0.0

Browse source
This commit is contained in:
LexManos 2012-10-23 16:04:58 -07:00
parent 717b80781b
commit 043f570ff9
11 changed files with 195 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
common/forge_at.cfg
View file

@ -1,83 +1,84 @@
#Main Forge Access Transformer configuration file
# RailLogic.getNAdjacentTracks
public akg.a(Lakg;)I # RailLogic/func_73650_a
public akh.a(Lakh;)I # RailLogic/func_73650_a
# Tessellator
public aza.u # drawMode
public aza.v # xOffset
public aza.w # yOffset
public aza.x # zOffset
public-f aza.a # instance remove final
public aza.z # isDrawing
public-f azb.a # Tessellator/field_78398_a instance
public azb.u # Tessellator/field_78409_u drawMode
public azb.v # Tessellator/field_78408_v xOffset
public azb.w # Tessellator/field_78407_w yOffset
public azb.x # Tessellator/field_78417_xzOffset
public azb.z # Tessellator/field_78415_z isDrawing
# ItemPickaxe
public ub.<init>()V # constructor
public+f ub.c # ItemPickaxe/field_77867_c blocksEffectiveAgainst
public uc.<init>(ILtu;)V # constructor
public+f uc.c # ItemPickaxe/field_77867_c blocksEffectiveAgainst
# ItemAxe
public tq.<init>()V # constructor
public+f tq.c # ItemAxe/field_77868_c blocksEffectiveAgainst
public tr.<init>(ILtu;)V # constructor
public+f tr.c # ItemAxe/field_77868_c blocksEffectiveAgainst
# ItemSpade
public+f um.c # ItemSpade/field_77866_c blocksEffectiveAgainst
public un.<init>(ILtu;)V # constructor
public+f un.c # ItemSpade/field_77866_c blocksEffectiveAgainst
# ItemTool
public tc.a # ItemTool/field_77864_a efficiencyOnProperMaterial
public tc.ck # ItemTool/field_77865_bY damageVsEntity
public td.a # ItemTool/field_77864_a efficiencyOnProperMaterial
public td.ck # ItemTool/field_77865_bY damageVsEntity
# EntityEnderman
public pl.d # EntityEnderman/field_70827_d carriableBlocks
public pm.d # EntityEnderman/field_70827_d carriableBlocks
# RenderGlobal
public ayx.h # RenderGlobal/field_72769_h theWorld
public ayx.i # RenderGlobal/field_72770_i renderEngine
public ayx.q # RenderGlobal/field_72777_q mc
public ayx.r # RenderGlobal/field_72776_r globalRenderBlocks
public atx.E # RenderGlobal/field_72738_E damagedBlocks
public ayy.h # RenderGlobal/field_72769_h theWorld
public ayy.i # RenderGlobal/field_72770_i renderEngine
public ayy.q # RenderGlobal/field_72777_q mc
public ayy.r # RenderGlobal/field_72776_r globalRenderBlocks
public aty.E # RenderGlobal/field_72738_E damagedBlocks
# SoundManager
public bcw.a # SoundManager/field_77381_a sndSystem
public bcw.b # SoundManager/field_77379_b soundPoolSounds
public bcw.c # SoundManager/field_77380_c soundPoolStreaming
public bcw.d # SoundManager/field_77377_d soundPoolMusic
public bcx.a # SoundManager/field_77381_a sndSystem
public bcx.b # SoundManager/field_77379_b soundPoolSounds
public bcx.c # SoundManager/field_77380_c soundPoolStreaming
public bcx.d # SoundManager/field_77377_d soundPoolMusic
# EntityMinecart
protected pg.* # All private -> protected
public pg.h()Z # EntityMinecart/func_70490_h isMinecartPowered
protected ph.* # All private -> protected
public ph.h()Z # EntityMinecart/func_70490_h isMinecartPowered
# Block
public ale.<init>(ILaff;)V #Constructor
public ale.<init>(IILaff;)V #Constructor
public ale.p()Lale; # setRequiresSelfNotify
public ale.a(Lali;)Lale; # setStepSound
public ale.b(F)Lale; # setResistance
public ale.c(F)Lale; # setHardness
public ale.h(I)Lale; # setLightOpacity
public ale.a(F)Lale; # setLightValue
public ale.q()Lale; # setBlockUnbreakable
public ale.b(Z)Lale; # setTickRandomly
public alf.<init>(ILafg;)V #Constructor
public alf.<init>(IILafg;)V #Constructor
public alf.r()Lalf; # Block/func_71912_p setRequiresSelfNotify
public alf.a(Lalj;)Lalf; # Block/func_71884_a setStepSound
public alf.b(F)Lalf; # Block/func_71894_b setResistance
public alf.c(F)Lalf; # Block/func_71848_c setHardness
public alf.h(I)Lalf; # Block/func_71868_h setLightOpacity
public alf.a(F)Lalf; # Block/func_71900_a setLightValue
public alf.s()Lalf; # Block/func_71875_q setBlockUnbreakable
public alf.b(Z)Lalf; # Block/func_71907_b setTickRandomly
# NetServerHandler
public il.g # NetServerHandler/field_72572_g playerInAirTime
public im.g # NetServerHandler/field_72572_g playerInAirTime
# TileEntity
public aml.k # TileEntity/field_70331_k worldObj
public amm.k # TileEntity/field_70331_k worldObj
# BlockLeavesBase
public alm.c # BlockLeavesBase/field_72131_c graphicsLevel
public aln.c # BlockLeavesBase/field_72131_c graphicsLevel
# Item
public ts.e(I)Lts; # Item/func_77656_e setMaxDamage
public-f ts.f(Ltu;)I # Item/func_77650_f getIconIndex
public tt.e(I)Ltt; # Item/func_77656_e setMaxDamage
public-f tt.f(Ltv;)I # Item/func_77650_f getIconIndex
# RailLogic
public akg
public akg.a(Lakg;)I # RailLogic/func_73650_a getNAdjacentTiles
public akh
public akh.a(Lakh;)I # RailLogic/func_73650_a getNAdjacentTiles
# EntityPlayer
public qf.a(Lpf;)V # EntityPlayer/func_71012_a joinEntityItemWithWorld
public qf.i()V # EntityPlayer/func_71053_j closeScreen
public qg.a(Lpg;)V # EntityPlayer/func_71012_a joinEntityItemWithWorld
public qg.i()V # EntityPlayer/func_71053_j closeScreen
# EntityPlayerMP
public axb.a(Lpf;)V # EntityClientPlayerMP/func_71012_a joinEntityItemWithWorld
public axc.a(Lpg;)V # EntityClientPlayerMP/func_71012_a joinEntityItemWithWorld
# World Gen Chests Related
public id.S # WorldServer/field_73069_S bonusChestContent
public abp.a # StructureMineshaftPieces/field_78818_a mineshaftChestContents
public act.i # ComponentScatteredFeatureDesertPyramid/field_74941_i itemsToGenerateInTemple
public acu.l # ComponentScatteredFeatureJunglePyramid/field_74943_l junglePyramidsChestContents
public acu.m # ComponentScatteredFeatureJunglePyramid/field_74944_m junglePyramidsDispenserContents
public ade.a # ComponentStrongholdChestCorridor/field_75003_a strongholdChestContents
public adi.b # ComponentStrongholdLibrary/field_75007_b strongholdLibraryChestContents
public adn.c # ComponentStrongholdRoomCrossing/field_75014_c strongholdCorridorChestContents
public ael.a # ComponentVillageHouse2/field_74918_a villageBlacksmithChestContents
public ie.S # WorldServer/field_73069_S bonusChestContent
public abq.a # StructureMineshaftPieces/field_78818_a mineshaftChestContents
public acu.i # ComponentScatteredFeatureDesertPyramid/field_74941_i itemsToGenerateInTemple
public acv.l # ComponentScatteredFeatureJunglePyramid/field_74943_l junglePyramidsChestContents
public acv.m # ComponentScatteredFeatureJunglePyramid/field_74944_m junglePyramidsDispenserContents
public adf.a # ComponentStrongholdChestCorridor/field_75003_a strongholdChestContents
public adj.b # ComponentStrongholdLibrary/field_75007_b strongholdLibraryChestContents
public ado.c # ComponentStrongholdRoomCrossing/field_75014_c strongholdCorridorChestContents
public aem.a # ComponentVillageHouse2/field_74918_a villageBlacksmithChestContents
# AnvilChunkLoader.chunkSaveLocation
default zm.d # AnvilChunkLoader/field_75825_d
default zn.d # AnvilChunkLoader/field_75825_d
# ChunkProviderServer.currentChunkLoader
default ic.e # ChunkProviderServer/field_73247_e
default id.e # ChunkProviderServer/field_73247_e
# PlayerManager
default ia.a(IIZ)Lib; # PlayerManager/func_72690_a getOrCreateChunkWatcher
default ib.a(IIZ)Lic; # PlayerManager/func_72690_a getOrCreateChunkWatcher
# World
public-f xd.C # net/minecraft/src/World/field_72982_D villageCollectionObj
public-f xe.C # net/minecraft/src/World/field_72982_D villageCollectionObj

2
common/net/minecraftforge/common/ForgeVersion.java
View file

@ -8,7 +8,7 @@ package net.minecraftforge.common;
public class ForgeVersion
{
//This number is incremented every Minecraft version, and never reset
public static final int majorVersion = 5;
public static final int majorVersion = 6;
//This number is incremented every official release, and reset every Minecraft version
public static final int minorVersion = 0;
//This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version

15
eclipse/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
View file

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="ChooseWorkspaceDialogSettings">
<item value="346" key="DIALOG_Y_ORIGIN"/>
<item value="658" key="DIALOG_X_ORIGIN"/>
</section>
<section name="WORKBENCH_SETTINGS">
<list key="ENABLED_TRANSFERS">
</list>
</section>
<section name="ExternalProjectImportWizard">
<item value="false" key="WizardProjectsImportPage.STORE_ARCHIVE_SELECTED"/>
<item value="false" key="WizardProjectsImportPage.STORE_COPY_PROJECT_ID"/>
</section>
</section>

BIN
fml-src-4.0.5.408.zip → fml-src-4.1.1.411.zip
View file

Binary file not shown.

4
patches/common/net/minecraft/src/Block.java.patch
View file

@ -93,7 +93,7 @@
}
}
}
@@ -997,7 +1003,7 @@
@@ -1027,7 +1033,7 @@
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
par2EntityPlayer.addExhaustion(0.025F);
@ -102,7 +102,7 @@
{
ItemStack var8 = this.createStackedBlock(par6);
@@ -1267,4 +1273,831 @@
@@ -1297,4 +1303,831 @@
canBlockGrass[0] = true;
StatList.initBreakableStats();
}

49
patches/common/net/minecraft/src/EntityLiving.java.patch
View file

@ -11,7 +11,7 @@
public abstract class EntityLiving extends Entity
{
@@ -336,6 +340,7 @@
@@ -337,6 +341,7 @@
public void setAttackTarget(EntityLiving par1EntityLiving)
{
this.attackTarget = par1EntityLiving;
@ -19,7 +19,7 @@
}
public boolean isExplosiveMob(Class par1Class)
@@ -419,6 +424,7 @@
@@ -420,6 +425,7 @@
{
this.entityLivingToAttack = par1EntityLiving;
this.revengeTimer = this.entityLivingToAttack != null ? 60 : 0;
@ -27,7 +27,7 @@
}
protected void entityInit()
@@ -707,6 +713,11 @@
@@ -708,6 +714,11 @@
*/
public void onUpdate()
{
@ -39,7 +39,7 @@
super.onUpdate();
if (!this.worldObj.isRemote)
@@ -888,6 +899,11 @@
@@ -889,6 +900,11 @@
*/
public boolean attackEntityFrom(DamageSource par1DamageSource, int par2)
{
@ -51,20 +51,19 @@
if (this.worldObj.isRemote)
{
return false;
@@ -1092,6 +1108,12 @@
*/
protected void damageEntity(DamageSource par1DamageSource, int par2)
@@ -1095,6 +1111,11 @@
{
+ par2 = ForgeHooks.onLivingHurt(this, par1DamageSource, par2);
+ if (par2 <= 0)
+ {
+ return;
+ }
+
par2 = this.applyArmorCalculations(par1DamageSource, par2);
par2 = this.applyPotionDamageCalculations(par1DamageSource, par2);
this.health -= par2;
@@ -1155,6 +1177,11 @@
if (!this.field_83001_bt)
{
+ par2 = ForgeHooks.onLivingHurt(this, par1DamageSource, par2);
+ if (par2 <= 0)
+ {
+ return;
+ }
par2 = this.applyArmorCalculations(par1DamageSource, par2);
par2 = this.applyPotionDamageCalculations(par1DamageSource, par2);
this.health -= par2;
@@ -1159,6 +1180,11 @@
*/
public void onDeath(DamageSource par1DamageSource)
{
@ -76,7 +75,7 @@
Entity var2 = par1DamageSource.getEntity();
if (this.scoreValue >= 0 && var2 != null)
@@ -1177,6 +1204,10 @@
@@ -1181,6 +1207,10 @@
{
var3 = EnchantmentHelper.getLootingModifier((EntityLiving)var2);
}
@ -87,7 +86,7 @@
if (!this.isChild() && this.worldObj.func_82736_K().func_82766_b("doMobLoot"))
{
@@ -1185,7 +1216,7 @@
@@ -1189,7 +1219,7 @@
if (this.recentlyHit > 0)
{
@ -96,7 +95,7 @@
if (var4 < 5)
{
@@ -1193,6 +1224,16 @@
@@ -1197,6 +1227,16 @@
}
}
}
@ -113,7 +112,7 @@
}
this.worldObj.setEntityState(this, (byte)3);
@@ -1236,6 +1277,12 @@
@@ -1240,6 +1280,12 @@
*/
protected void fall(float par1)
{
@ -126,7 +125,7 @@
super.fall(par1);
int var2 = MathHelper.ceiling_float_int(par1 - 3.0F);
@@ -1423,7 +1470,7 @@
@@ -1427,7 +1473,7 @@
int var2 = MathHelper.floor_double(this.boundingBox.minY);
int var3 = MathHelper.floor_double(this.posZ);
int var4 = this.worldObj.getBlockId(var1, var2, var3);
@ -135,7 +134,7 @@
}
/**
@@ -1828,6 +1875,7 @@
@@ -1835,6 +1881,7 @@
}
this.isAirBorne = true;
@ -143,7 +142,7 @@
}
/**
@@ -2355,8 +2403,6 @@
@@ -2362,8 +2409,6 @@
return this.getCreatureAttribute() == EnumCreatureAttribute.UNDEAD;
}
@ -152,7 +151,7 @@
/**
* input is the potion id to remove from the current active potion effects
*/
@@ -2774,4 +2820,30 @@
@@ -2781,4 +2826,30 @@
{
return false;
}

63
patches/common/net/minecraft/src/EntityPlayer.java.patch
View file

@ -141,32 +141,31 @@
}
/**
@@ -978,12 +1032,23 @@
*/
protected void damageEntity(DamageSource par1DamageSource, int par2)
@@ -980,12 +1034,22 @@
{
+ LivingHurtEvent event = new LivingHurtEvent(this, par1DamageSource, par2);
+ if (MinecraftForge.EVENT_BUS.post(event) || event.ammount == 0)
+ {
+ return;
+ }
+ par2 = event.ammount;
+
if (!par1DamageSource.isUnblockable() && this.isBlocking())
if (!this.field_83001_bt)
{
par2 = 1 + par2 >> 1;
}
+ par2 = ForgeHooks.onLivingHurt(this, par1DamageSource, par2);
+ if (par2 <= 0)
+ {
+ return;
+ }
+
if (!par1DamageSource.isUnblockable() && this.isBlocking())
{
par2 = 1 + par2 >> 1;
}
- par2 = this.applyArmorCalculations(par1DamageSource, par2);
+ par2 = ArmorProperties.ApplyArmor(this, inventory.armorInventory, par1DamageSource, par2);
+ if (par2 <= 0)
+ {
+ return;
+ }
par2 = this.applyPotionDamageCalculations(par1DamageSource, par2);
this.addExhaustion(par1DamageSource.getHungerDamage());
this.health -= par2;
@@ -1020,6 +1085,10 @@
- par2 = this.applyArmorCalculations(par1DamageSource, par2);
+ par2 = ArmorProperties.ApplyArmor(this, inventory.armorInventory, par1DamageSource, par2);
+ if (par2 <= 0)
+ {
+ return;
+ }
par2 = this.applyPotionDamageCalculations(par1DamageSource, par2);
this.addExhaustion(par1DamageSource.getHungerDamage());
this.health -= par2;
@@ -1023,6 +1087,10 @@
public boolean interactWith(Entity par1Entity)
{
@ -177,7 +176,7 @@
if (par1Entity.interact(this))
{
return true;
@@ -1063,7 +1132,9 @@
@@ -1066,7 +1134,9 @@
*/
public void destroyCurrentEquippedItem()
{
@ -187,7 +186,7 @@
}
/**
@@ -1080,6 +1151,15 @@
@@ -1083,6 +1153,15 @@
*/
public void attackTargetEntityWithCurrentItem(Entity par1Entity)
{
@ -203,7 +202,7 @@
if (par1Entity.canAttackWithItem())
{
int var2 = this.inventory.getDamageVsEntity(par1Entity);
@@ -1223,6 +1303,12 @@
@@ -1226,6 +1305,12 @@
*/
public EnumStatus sleepInBedAt(int par1, int par2, int par3)
{
@ -216,7 +215,7 @@
if (!this.worldObj.isRemote)
{
if (this.isPlayerSleeping() || !this.isEntityAlive())
@@ -1262,6 +1348,11 @@
@@ -1265,6 +1350,11 @@
{
int var9 = this.worldObj.getBlockMetadata(par1, par2, par3);
int var5 = BlockBed.getDirection(var9);
@ -228,7 +227,7 @@
float var10 = 0.5F;
float var7 = 0.5F;
@@ -1332,10 +1423,12 @@
@@ -1335,10 +1425,12 @@
ChunkCoordinates var4 = this.playerLocation;
ChunkCoordinates var5 = this.playerLocation;
@ -245,7 +244,7 @@
if (var5 == null)
{
@@ -1372,7 +1465,9 @@
@@ -1375,7 +1467,9 @@
*/
private boolean isInBed()
{
@ -256,7 +255,7 @@
}
/**
@@ -1387,13 +1482,16 @@
@@ -1390,13 +1484,16 @@
var3.loadChunk(par1ChunkCoordinates.posX - 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4);
var3.loadChunk(par1ChunkCoordinates.posX + 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4);
@ -275,7 +274,7 @@
return var4;
}
}
@@ -1407,8 +1505,11 @@
@@ -1410,8 +1507,11 @@
{
if (this.playerLocation != null)
{
@ -289,7 +288,7 @@
switch (var2)
{
@@ -1728,6 +1829,7 @@
@@ -1731,6 +1831,7 @@
return 101;
}
}

108
patches/common/net/minecraft/src/World.java.patch
View file

@ -1,6 +1,6 @@
--- ../src_base/common/net/minecraft/src/World.java
+++ ../src_work/common/net/minecraft/src/World.java
@@ -10,8 +10,27 @@
@@ -11,8 +11,27 @@
import java.util.Random;
import java.util.Set;
@ -28,7 +28,7 @@
/**
* boolean; if true updates scheduled by scheduleBlockUpdate happen immediately
*/
@@ -134,6 +153,11 @@
@@ -136,6 +155,11 @@
*/
public BiomeGenBase getBiomeGenForCoords(int par1, int par2)
{
@ -40,7 +40,7 @@
if (this.blockExists(par1, 0, par2))
{
Chunk var3 = this.getChunkFromBlockCoords(par1, par2);
@@ -163,7 +187,15 @@
@@ -165,7 +189,15 @@
this.theProfiler = par5Profiler;
this.worldInfo = new WorldInfo(par4WorldSettings, par2Str);
this.provider = par3WorldProvider;
@ -57,7 +57,7 @@
VillageCollection var6 = (VillageCollection)this.mapStorage.loadData(VillageCollection.class, "villages");
if (var6 == null)
@@ -177,7 +209,7 @@
@@ -179,7 +211,7 @@
this.villageCollectionObj.func_82566_a(this);
}
@ -66,7 +66,7 @@
this.chunkProvider = this.createChunkProvider();
this.calculateInitialSkylight();
this.calculateInitialWeather();
@@ -191,7 +223,7 @@
@@ -193,7 +225,7 @@
this.isRemote = false;
this.saveHandler = par1ISaveHandler;
this.theProfiler = par5Profiler;
@ -75,7 +75,7 @@
this.worldInfo = par1ISaveHandler.loadWorldInfo();
if (par4WorldProvider != null)
@@ -242,6 +274,19 @@
@@ -244,6 +276,19 @@
this.calculateInitialWeather();
}
@ -95,7 +95,7 @@
/**
* Creates the chunk provider for this world. Called in the constructor. Retrieves provider from worldProvider?
*/
@@ -296,7 +341,8 @@
@@ -298,7 +343,8 @@
*/
public boolean isAirBlock(int par1, int par2, int par3)
{
@ -105,7 +105,7 @@
}
/**
@@ -305,7 +351,8 @@
@@ -307,7 +353,8 @@
public boolean blockHasTileEntity(int par1, int par2, int par3)
{
int var4 = this.getBlockId(par1, par2, par3);
@ -115,7 +115,7 @@
}
/**
@@ -1027,7 +1074,7 @@
@@ -1029,7 +1076,7 @@
*/
public boolean isDaytime()
{
@ -124,7 +124,7 @@
}
/**
@@ -1059,7 +1106,7 @@
@@ -1061,7 +1108,7 @@
int var12 = this.getBlockMetadata(var8, var9, var10);
Block var13 = Block.blocksList[var11];
@ -133,7 +133,7 @@
{
MovingObjectPosition var14 = var13.collisionRayTrace(this, var8, var9, var10, par1Vec3, par2Vec3);
@@ -1259,6 +1306,12 @@
@@ -1261,6 +1308,12 @@
*/
public void playSoundAtEntity(Entity par1Entity, String par2Str, float par3, float par4)
{
@ -146,7 +146,7 @@
if (par1Entity != null && par2Str != null)
{
Iterator var5 = this.worldAccesses.iterator();
@@ -1357,6 +1410,11 @@
@@ -1359,6 +1412,11 @@
EntityPlayer var5 = (EntityPlayer)par1Entity;
this.playerEntities.add(var5);
this.updateAllPlayersSleepingFlag();
@ -158,7 +158,7 @@
}
this.getChunkFromChunkCoords(var2, var3).addEntity(par1Entity);
@@ -1608,6 +1666,12 @@
@@ -1610,6 +1668,12 @@
* Calculates the color for the skybox
*/
public Vec3 getSkyColor(Entity par1Entity, float par2)
@ -171,7 +171,7 @@
{
float var3 = this.getCelestialAngle(par2);
float var4 = MathHelper.cos(var3 * (float)Math.PI * 2.0F) * 2.0F + 0.5F;
@@ -1703,6 +1767,12 @@
@@ -1705,6 +1769,12 @@
@SideOnly(Side.CLIENT)
public Vec3 drawClouds(float par1)
{
@ -184,7 +184,7 @@
float var2 = this.getCelestialAngle(par1);
float var3 = MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.5F;
@@ -1781,7 +1851,7 @@
@@ -1783,7 +1853,7 @@
{
int var5 = var3.getBlockID(par1, var4, par2);
@ -193,7 +193,7 @@
{
return var4 + 1;
}
@@ -1796,6 +1866,12 @@
@@ -1798,6 +1868,12 @@
* How bright are stars in the sky
*/
public float getStarBrightness(float par1)
@ -206,7 +206,7 @@
{
float var2 = this.getCelestialAngle(par1);
float var3 = 1.0F - (MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.25F);
@@ -1940,7 +2016,7 @@
@@ -1942,7 +2018,7 @@
if (var8 != null)
{
@ -215,7 +215,7 @@
}
}
}
@@ -1950,6 +2026,10 @@
@@ -1952,6 +2028,10 @@
if (!this.entityRemoval.isEmpty())
{
@ -226,7 +226,7 @@
this.loadedTileEntityList.removeAll(this.entityRemoval);
this.entityRemoval.clear();
}
@@ -1970,7 +2050,9 @@
@@ -1972,7 +2052,9 @@
{
this.loadedTileEntityList.add(var9);
}
@ -237,7 +237,7 @@
if (this.chunkExists(var9.xCoord >> 4, var9.zCoord >> 4))
{
Chunk var10 = this.getChunkFromChunkCoords(var9.xCoord >> 4, var9.zCoord >> 4);
@@ -1980,8 +2062,6 @@
@@ -1982,8 +2064,6 @@
var10.setChunkBlockTileEntity(var9.xCoord & 15, var9.yCoord, var9.zCoord & 15, var9);
}
}
@ -246,7 +246,7 @@
}
}
@@ -1994,13 +2074,13 @@
@@ -1996,13 +2076,13 @@
public void addTileEntity(Collection par1Collection)
{
@ -267,7 +267,7 @@
}
}
@@ -2020,9 +2100,17 @@
@@ -2022,9 +2102,17 @@
{
int var3 = MathHelper.floor_double(par1Entity.posX);
int var4 = MathHelper.floor_double(par1Entity.posZ);
@ -288,7 +288,7 @@
{
par1Entity.lastTickPosX = par1Entity.posX;
par1Entity.lastTickPosY = par1Entity.posY;
@@ -2257,6 +2345,14 @@
@@ -2259,6 +2347,14 @@
{
return true;
}
@ -303,7 +303,7 @@
}
}
}
@@ -2564,25 +2660,21 @@
@@ -2566,25 +2662,21 @@
*/
public void setBlockTileEntity(int par1, int par2, int par3, TileEntity par4TileEntity)
{
@ -344,7 +344,7 @@
}
}
@@ -2591,27 +2683,10 @@
@@ -2593,27 +2685,10 @@
*/
public void removeBlockTileEntity(int par1, int par2, int par3)
{
@ -376,7 +376,7 @@
}
}
@@ -2637,7 +2712,8 @@
@@ -2639,7 +2714,8 @@
*/
public boolean isBlockNormalCube(int par1, int par2, int par3)
{
@ -386,7 +386,7 @@
}
/**
@@ -2645,8 +2721,7 @@
@@ -2647,8 +2723,7 @@
*/
public boolean doesBlockHaveSolidTopSurface(int par1, int par2, int par3)
{
@ -396,7 +396,7 @@
}
/**
@@ -2662,7 +2737,7 @@
@@ -2664,7 +2739,7 @@
if (var5 != null && !var5.isEmpty())
{
Block var6 = Block.blocksList[this.getBlockId(par1, par2, par3)];
@ -405,7 +405,7 @@
}
else
{
@@ -2693,8 +2768,7 @@
@@ -2695,8 +2770,7 @@
*/
public void setAllowedSpawnTypes(boolean par1, boolean par2)
{
@ -415,7 +415,7 @@
}
/**
@@ -2710,6 +2784,11 @@
@@ -2712,6 +2786,11 @@
*/
private void calculateInitialWeather()
{
@ -427,7 +427,7 @@
if (this.worldInfo.isRaining())
{
this.rainingStrength = 1.0F;
@@ -2725,6 +2804,11 @@
@@ -2727,6 +2806,11 @@
* Updates all weather states.
*/
protected void updateWeather()
@ -439,7 +439,7 @@
{
if (!this.provider.hasNoSky)
{
@@ -2827,12 +2911,14 @@
@@ -2829,12 +2913,14 @@
public void toggleRain()
{
@ -455,7 +455,7 @@
this.theProfiler.startSection("buildList");
int var1;
EntityPlayer var2;
@@ -2939,6 +3025,11 @@
@@ -2941,6 +3027,11 @@
*/
public boolean canBlockFreeze(int par1, int par2, int par3, boolean par4)
{
@ -467,7 +467,7 @@
BiomeGenBase var5 = this.getBiomeGenForCoords(par1, par3);
float var6 = var5.getFloatTemperature();
@@ -2996,6 +3087,11 @@
@@ -2998,6 +3089,11 @@
* Tests whether or not snow can be placed at a given location
*/
public boolean canSnowAt(int par1, int par2, int par3)
@ -479,7 +479,7 @@
{
BiomeGenBase var4 = this.getBiomeGenForCoords(par1, par3);
float var5 = var4.getFloatTemperature();
@@ -3089,7 +3185,7 @@
@@ -3091,7 +3187,7 @@
private int computeBlockLightValue(int par1, int par2, int par3, int par4, int par5, int par6)
{
@ -488,7 +488,7 @@
int var8 = this.getSavedLightValue(EnumSkyBlock.Block, par2 - 1, par3, par4) - par6;
int var9 = this.getSavedLightValue(EnumSkyBlock.Block, par2 + 1, par3, par4) - par6;
int var10 = this.getSavedLightValue(EnumSkyBlock.Block, par2, par3 - 1, par4) - par6;
@@ -3224,7 +3320,7 @@
@@ -3226,7 +3322,7 @@
int var21 = var24 + (var18 / 2 + 1) % 3 / 2 * var19;
int var22 = var12 + (var18 / 2 + 2) % 3 / 2 * var19;
var14 = this.getSavedLightValue(par1EnumSkyBlock, var20, var21, var22);
@ -497,7 +497,7 @@
if (var23 == 0)
{
@@ -3255,7 +3351,7 @@
@@ -3257,7 +3353,7 @@
var12 = (var9 >> 12 & 63) - 32 + par4;
var13 = this.getSavedLightValue(par1EnumSkyBlock, var10, var24, var12);
var14 = this.getBlockId(var10, var24, var12);
@ -506,7 +506,7 @@
if (var15 == 0)
{
@@ -3357,10 +3453,10 @@
@@ -3359,10 +3455,10 @@
public List getEntitiesWithinAABBExcludingEntity(Entity par1Entity, AxisAlignedBB par2AxisAlignedBB)
{
this.entitiesWithinAABBExcludingEntity.clear();
@ -521,7 +521,7 @@
for (int var7 = var3; var7 <= var4; ++var7)
{
@@ -3386,10 +3482,10 @@
@@ -3388,10 +3484,10 @@
public List func_82733_a(Class par1Class, AxisAlignedBB par2AxisAlignedBB, IEntitySelector par3IEntitySelector)
{
@ -536,7 +536,7 @@
ArrayList var8 = new ArrayList();
for (int var9 = var4; var9 <= var5; ++var9)
@@ -3483,11 +3579,14 @@
@@ -3485,11 +3581,14 @@
*/
public void addLoadedEntities(List par1List)
{
@ -554,7 +554,7 @@
}
}
@@ -3521,6 +3620,11 @@
@@ -3523,6 +3622,11 @@
else
{
if (var9 != null && (var9 == Block.waterMoving || var9 == Block.waterStill || var9 == Block.lavaMoving || var9 == Block.lavaStill || var9 == Block.fire || var9.blockMaterial.isGroundCover()))
@ -566,7 +566,7 @@
{
var9 = null;
}
@@ -3738,7 +3842,7 @@
@@ -3740,7 +3844,7 @@
*/
public long getSeed()
{
@ -575,7 +575,7 @@
}
public long func_82737_E()
@@ -3748,7 +3852,7 @@
@@ -3750,7 +3854,7 @@
public long getWorldTime()
{
@ -584,7 +584,7 @@
}
/**
@@ -3756,7 +3860,7 @@
@@ -3758,7 +3862,7 @@
*/
public void setWorldTime(long par1)
{
@ -593,7 +593,7 @@
}
/**
@@ -3764,13 +3868,13 @@
@@ -3766,13 +3870,13 @@
*/
public ChunkCoordinates getSpawnPoint()
{
@ -609,7 +609,7 @@
}
@SideOnly(Side.CLIENT)
@@ -3794,7 +3898,10 @@
@@ -3796,7 +3900,10 @@
if (!this.loadedEntityList.contains(par1Entity))
{
@ -621,7 +621,7 @@
}
}
@@ -3802,6 +3909,11 @@
@@ -3804,6 +3911,11 @@
* Called when checking if a certain block can be mined or not. The 'spawn safe zone' check is located here.
*/
public boolean canMineBlock(EntityPlayer par1EntityPlayer, int par2, int par3, int par4)
@ -633,7 +633,7 @@
{
return true;
}
@@ -3919,8 +4031,7 @@
@@ -3921,8 +4033,7 @@
*/
public boolean isBlockHighHumidity(int par1, int par2, int par3)
{
@ -643,7 +643,7 @@
}
/**
@@ -3982,7 +4093,7 @@
@@ -3984,7 +4095,7 @@
*/
public int getHeight()
{
@ -652,7 +652,7 @@
}
/**
@@ -3990,7 +4101,7 @@
@@ -3992,7 +4103,7 @@
*/
public int getActualHeight()
{
@ -661,7 +661,7 @@
}
public IUpdatePlayerListBox func_82735_a(EntityMinecart par1EntityMinecart)
@@ -4033,7 +4144,7 @@
@@ -4035,7 +4146,7 @@
*/
public double getHorizon()
{
@ -670,9 +670,9 @@
}
/**
@@ -4066,4 +4177,75 @@
{
return this.field_82741_K;
@@ -4074,4 +4185,75 @@
this.field_83016_L.setTimeInMillis(System.currentTimeMillis());
return this.field_83016_L;
}
+
+ /**

10
patches/minecraft/net/minecraft/client/Minecraft.java.patch
View file

@ -10,7 +10,7 @@
import org.lwjgl.LWJGLException;
import org.lwjgl.Sys;
@@ -1251,7 +1254,7 @@
@@ -1252,7 +1255,7 @@
if (this.thePlayer.func_82246_f(var3, var4, var5))
{
@ -19,7 +19,7 @@
this.thePlayer.swingItem();
}
}
@@ -1317,7 +1320,8 @@
@@ -1318,7 +1321,8 @@
{
int var8 = var3 != null ? var3.stackSize : 0;
@ -29,7 +29,7 @@
{
var2 = false;
this.thePlayer.swingItem();
@@ -1343,7 +1347,8 @@
@@ -1344,7 +1348,8 @@
{
ItemStack var9 = this.thePlayer.inventory.getCurrentItem();
@ -39,7 +39,7 @@
{
this.entityRenderer.itemRenderer.func_78445_c();
}
@@ -1941,6 +1946,18 @@
@@ -1959,6 +1964,18 @@
if (this.theIntegratedServer != null)
{
this.theIntegratedServer.initiateShutdown();
@ -58,7 +58,7 @@
}
this.theIntegratedServer = null;
@@ -2250,95 +2267,12 @@
@@ -2268,95 +2285,12 @@
if (this.objectMouseOver != null)
{
boolean var1 = this.thePlayer.capabilities.isCreativeMode;

2
patches/minecraft/net/minecraft/src/EffectRenderer.java.patch
View file

@ -132,7 +132,7 @@
}
}
@@ -215,12 +267,60 @@
var8 = (double)par1 + var6.maxX + (double)var7;
var8 = (double)par1 + var6.func_83007_w() + (double)var7;
}
- this.addEffect((new EntityDiggingFX(this.worldObj, var8, var10, var12, 0.0D, 0.0D, 0.0D, var6, par4, this.worldObj.getBlockMetadata(par1, par2, par3))).func_70596_a(par1, par2, par3).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F));

34
patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
View file

@ -9,7 +9,7 @@
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@@ -505,9 +507,8 @@
@@ -553,9 +555,8 @@
public boolean renderBlockBed(Block par1Block, int par2, int par3, int par4)
{
Tessellator var5 = Tessellator.instance;
@ -21,7 +21,7 @@
float var9 = 0.5F;
float var10 = 1.0F;
float var11 = 0.8F;
@@ -516,6 +517,7 @@
@@ -564,6 +565,7 @@
var5.setBrightness(var25);
var5.setColorOpaque_F(var9, var9, var9);
int var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 0);
@ -29,7 +29,7 @@
int var28 = (var27 & 15) << 4;
int var29 = var27 & 240;
double var30 = (double)((float)var28 / 256.0F);
@@ -534,6 +536,7 @@
@@ -582,6 +584,7 @@
var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4));
var5.setColorOpaque_F(var10, var10, var10);
var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 1);
@ -37,7 +37,7 @@
var28 = (var27 & 15) << 4;
var29 = var27 & 240;
var30 = (double)((float)var28 / 256.0F);
@@ -2246,7 +2249,7 @@
@@ -2294,7 +2297,7 @@
double var28;
double var30;
@ -46,7 +46,7 @@
{
float var36 = 0.2F;
float var19 = 0.0625F;
@@ -2266,7 +2269,7 @@
@@ -2314,7 +2317,7 @@
var9 = var20;
}
@ -55,7 +55,7 @@
{
var5.addVertexWithUV((double)((float)par2 + var36), (double)((float)par3 + var17 + var19), (double)(par4 + 1), var11, var13);
var5.addVertexWithUV((double)(par2 + 0), (double)((float)(par3 + 0) + var19), (double)(par4 + 1), var11, var15);
@@ -2278,7 +2281,7 @@
@@ -2326,7 +2329,7 @@
var5.addVertexWithUV((double)((float)par2 + var36), (double)((float)par3 + var17 + var19), (double)(par4 + 1), var11, var13);
}
@ -64,7 +64,7 @@
{
var5.addVertexWithUV((double)((float)(par2 + 1) - var36), (double)((float)par3 + var17 + var19), (double)(par4 + 0), var9, var13);
var5.addVertexWithUV((double)(par2 + 1 - 0), (double)((float)(par3 + 0) + var19), (double)(par4 + 0), var9, var15);
@@ -2290,7 +2293,7 @@
@@ -2338,7 +2341,7 @@
var5.addVertexWithUV((double)((float)(par2 + 1) - var36), (double)((float)par3 + var17 + var19), (double)(par4 + 0), var9, var13);
}
@ -73,7 +73,7 @@
{
var5.addVertexWithUV((double)(par2 + 0), (double)((float)par3 + var17 + var19), (double)((float)par4 + var36), var11, var13);
var5.addVertexWithUV((double)(par2 + 0), (double)((float)(par3 + 0) + var19), (double)(par4 + 0), var11, var15);
@@ -2302,7 +2305,7 @@
@@ -2350,7 +2353,7 @@
var5.addVertexWithUV((double)(par2 + 0), (double)((float)par3 + var17 + var19), (double)((float)par4 + var36), var11, var13);
}
@ -82,7 +82,7 @@
{
var5.addVertexWithUV((double)(par2 + 1), (double)((float)par3 + var17 + var19), (double)((float)(par4 + 1) - var36), var9, var13);
var5.addVertexWithUV((double)(par2 + 1), (double)((float)(par3 + 0) + var19), (double)(par4 + 1 - 0), var9, var15);
@@ -2314,7 +2317,7 @@
@@ -2362,7 +2365,7 @@
var5.addVertexWithUV((double)(par2 + 1), (double)((float)par3 + var17 + var19), (double)((float)(par4 + 1) - var36), var9, var13);
}
@ -91,7 +91,7 @@
{
var20 = (double)par2 + 0.5D + 0.5D;
var22 = (double)par2 + 0.5D - 0.5D;
@@ -4502,7 +4505,7 @@
@@ -4550,7 +4553,7 @@
var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 2);
this.renderEastFace(par1Block, (double)par2, (double)par3, (double)par4, var27);
@ -100,7 +100,7 @@
{
this.colorRedTopLeft *= par5;
this.colorRedBottomLeft *= par5;
@@ -4625,7 +4628,7 @@
@@ -4673,7 +4676,7 @@
var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3);
this.renderWestFace(par1Block, (double)par2, (double)par3, (double)par4, par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3));
@ -109,7 +109,7 @@
{
this.colorRedTopLeft *= par5;
this.colorRedBottomLeft *= par5;
@@ -4748,7 +4751,7 @@
@@ -4796,7 +4799,7 @@
var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 4);
this.renderNorthFace(par1Block, (double)par2, (double)par3, (double)par4, var27);
@ -118,7 +118,7 @@
{
this.colorRedTopLeft *= par5;
this.colorRedBottomLeft *= par5;
@@ -4871,7 +4874,7 @@
@@ -4919,7 +4922,7 @@
var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 5);
this.renderSouthFace(par1Block, (double)par2, (double)par3, (double)par4, var27);
@ -127,7 +127,7 @@
{
this.colorRedTopLeft *= par5;
this.colorRedBottomLeft *= par5;
@@ -4983,7 +4986,7 @@
@@ -5031,7 +5034,7 @@
var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 2);
this.renderEastFace(par1Block, (double)par2, (double)par3, (double)par4, var28);
@ -136,7 +136,7 @@
{
var8.setColorOpaque_F(var18 * par5, var21 * par6, var24 * par7);
this.renderEastFace(par1Block, (double)par2, (double)par3, (double)par4, 38);
@@ -4999,7 +5002,7 @@
@@ -5047,7 +5050,7 @@
var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3);
this.renderWestFace(par1Block, (double)par2, (double)par3, (double)par4, var28);
@ -145,7 +145,7 @@
{
var8.setColorOpaque_F(var18 * par5, var21 * par6, var24 * par7);
this.renderWestFace(par1Block, (double)par2, (double)par3, (double)par4, 38);
@@ -5015,7 +5018,7 @@
@@ -5063,7 +5066,7 @@
var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 4);
this.renderNorthFace(par1Block, (double)par2, (double)par3, (double)par4, var28);
@ -154,7 +154,7 @@
{
var8.setColorOpaque_F(var19 * par5, var22 * par6, var25 * par7);
this.renderNorthFace(par1Block, (double)par2, (double)par3, (double)par4, 38);
@@ -5031,7 +5034,7 @@
@@ -5079,7 +5082,7 @@
var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 5);
this.renderSouthFace(par1Block, (double)par2, (double)par3, (double)par4, var28);