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

Fix a newly missing AT. Remove all CL_ references. OBFID is gone.

This commit is contained in:
cpw 2015-11-13 00:09:34 -05:00
parent ce40f91fb0
commit a26c4017b1
306 changed files with 1132 additions and 1138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
patches/minecraft/net/minecraft/block/Block.java.patch
View File

@ -12,9 +12,9 @@
private CreativeTabs displayOnCreativeTab;
public static final Block.SoundType soundTypeStone = new Block.SoundType("stone", 1.0F, 1.0F);
public static final Block.SoundType soundTypeWood = new Block.SoundType("wood", 1.0F, 1.0F);
@@ -124,6 +125,9 @@
@@ -119,6 +120,9 @@
private IBlockState defaultBlockState;
private String unlocalizedName;
private static final String __OBFID = "CL_00000199";
+ public final net.minecraftforge.fml.common.registry.RegistryDelegate<Block> delegate =
+ ((net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry)blockRegistry).getDelegate(this, Block.class);
@ -22,7 +22,7 @@
public static int getIdFromBlock(Block blockIn)
{
return blockRegistry.getIDForObject(blockIn);
@@ -137,7 +141,8 @@
@@ -132,7 +136,8 @@
public static Block getBlockById(int id)
{
@ -32,7 +32,7 @@
}
public static IBlockState getStateById(int id)
@@ -308,7 +313,7 @@
@@ -303,7 +308,7 @@
public boolean isReplaceable(World worldIn, BlockPos pos)
{
@ -41,7 +41,7 @@
}
public Block setHardness(float hardness)
@@ -345,9 +350,10 @@
@@ -340,9 +345,10 @@
return this.needsRandomTick;
}
@ -53,7 +53,7 @@
}
public final void setBlockBounds(float minX, float minY, float minZ, float maxX, float maxY, float maxZ)
@@ -364,13 +370,13 @@
@@ -359,13 +365,13 @@
public int getMixedBrightnessForBlock(IBlockAccess worldIn, BlockPos pos)
{
Block block = worldIn.getBlockState(pos).getBlock();
@ -69,7 +69,7 @@
}
else
{
@@ -458,6 +464,10 @@
@@ -453,6 +459,10 @@
public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
{
@ -80,7 +80,7 @@
}
public int quantityDropped(Random random)
@@ -472,8 +482,7 @@
@@ -467,8 +477,7 @@
public float getPlayerRelativeBlockHardness(EntityPlayer playerIn, World worldIn, BlockPos pos)
{
@ -90,7 +90,7 @@
}
public final void dropBlockAsItem(World worldIn, BlockPos pos, IBlockState state, int forture)
@@ -483,20 +492,16 @@
@@ -478,20 +487,16 @@
public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
{
@ -116,7 +116,7 @@
}
}
}
@@ -504,8 +509,13 @@
@@ -499,8 +504,13 @@
public static void spawnAsEntity(World worldIn, BlockPos pos, ItemStack stack)
{
@ -131,7 +131,7 @@
float f = 0.5F;
double d0 = (double)(worldIn.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
double d1 = (double)(worldIn.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
@@ -692,7 +702,7 @@
@@ -687,7 +697,7 @@
public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
{
@ -140,7 +140,7 @@
}
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
@@ -804,25 +814,35 @@
@@ -799,25 +809,35 @@
player.triggerAchievement(StatList.mineBlockStatArray[getIdFromBlock(this)]);
player.addExhaustion(0.025F);
@ -179,7 +179,7 @@
}
protected ItemStack createStackedBlock(IBlockState state)
@@ -1015,6 +1035,1029 @@
@@ -1010,6 +1030,1029 @@
return "Block{" + blockRegistry.getNameForObject(this) + "}";
}

10
patches/minecraft/net/minecraft/block/BlockBush.java.patch
View File

@ -7,9 +7,9 @@
-public class BlockBush extends Block
+public class BlockBush extends Block implements net.minecraftforge.common.IPlantable
{
private static final String __OBFID = "CL_00000208";
@@ -38,7 +38,7 @@
protected BlockBush()
{
@@ -36,7 +36,7 @@
public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
{
@ -18,7 +18,7 @@
}
protected boolean canPlaceBlockOn(Block ground)
@@ -68,7 +68,10 @@
@@ -66,7 +66,10 @@
public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state)
{
@ -30,7 +30,7 @@
}
public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
@@ -91,4 +94,33 @@
@@ -89,4 +92,33 @@
{
return EnumWorldBlockLayer.CUTOUT;
}

2
patches/minecraft/net/minecraft/block/BlockButton.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockButton.java
+++ ../src-work/minecraft/net/minecraft/block/BlockButton.java
@@ -75,8 +75,7 @@
@@ -74,8 +74,7 @@
protected static boolean func_181088_a(World p_181088_0_, BlockPos p_181088_1_, EnumFacing p_181088_2_)
{

6
patches/minecraft/net/minecraft/block/BlockCactus.java.patch
View File

@ -8,8 +8,8 @@
+public class BlockCactus extends Block implements net.minecraftforge.common.IPlantable
{
public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 15);
private static final String __OBFID = "CL_00000210";
@@ -110,7 +110,7 @@
@@ -109,7 +109,7 @@
}
Block block = worldIn.getBlockState(pos.down()).getBlock();
@ -18,7 +18,7 @@
}
public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
@@ -138,4 +138,16 @@
@@ -137,4 +137,16 @@
{
return new BlockState(this, new IProperty[] {AGE});
}

2
patches/minecraft/net/minecraft/block/BlockChest.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockChest.java
+++ ../src-work/minecraft/net/minecraft/block/BlockChest.java
@@ -528,7 +528,7 @@
@@ -527,7 +527,7 @@
private boolean isBelowSolidBlock(World worldIn, BlockPos pos)
{

4
patches/minecraft/net/minecraft/block/BlockCocoa.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockCocoa.java
+++ ../src-work/minecraft/net/minecraft/block/BlockCocoa.java
@@ -138,6 +138,13 @@
@@ -137,6 +137,13 @@
public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
{
@ -14,7 +14,7 @@
int i = ((Integer)state.getValue(AGE)).intValue();
int j = 1;
@@ -148,8 +155,9 @@
@@ -147,8 +154,9 @@
for (int k = 0; k < j; ++k)
{

8
patches/minecraft/net/minecraft/block/BlockCrops.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
+++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
@@ -82,11 +82,11 @@
@@ -81,11 +81,11 @@
float f1 = 0.0F;
IBlockState iblockstate = worldIn.getBlockState(blockpos.add(i, 0, j));
@ -14,7 +14,7 @@
{
f1 = 3.0F;
}
@@ -127,7 +127,7 @@
@@ -126,7 +126,7 @@
public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state)
{
@ -23,7 +23,7 @@
}
protected Item getSeed()
@@ -143,24 +143,6 @@
@@ -142,24 +142,6 @@
public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
{
super.dropBlockAsItemWithChance(worldIn, pos, state, chance, 0);
@ -48,7 +48,7 @@
}
public Item getItemDropped(IBlockState state, Random rand, int fortune)
@@ -203,4 +185,26 @@
@@ -202,4 +184,26 @@
{
return new BlockState(this, new IProperty[] {AGE});
}

6
patches/minecraft/net/minecraft/block/BlockDeadBush.java.patch
View File

@ -7,9 +7,9 @@
-public class BlockDeadBush extends BlockBush
+public class BlockDeadBush extends BlockBush implements net.minecraftforge.common.IShearable
{
private static final String __OBFID = "CL_00000224";
@@ -47,14 +47,15 @@
protected BlockDeadBush()
{
@@ -45,14 +45,15 @@
public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
{

4
patches/minecraft/net/minecraft/block/BlockDoor.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockDoor.java
+++ ../src-work/minecraft/net/minecraft/block/BlockDoor.java
@@ -155,7 +155,7 @@
@@ -154,7 +154,7 @@
{
if (this.blockMaterial == Material.iron)
{
@ -9,7 +9,7 @@
}
else
{
@@ -273,7 +273,7 @@
@@ -272,7 +272,7 @@
public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
{

10
patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch
View File

@ -9,7 +9,7 @@
{
public static final PropertyEnum<BlockDoublePlant.EnumPlantType> VARIANT = PropertyEnum.<BlockDoublePlant.EnumPlantType>create("variant", BlockDoublePlant.EnumPlantType.class);
public static final PropertyEnum<BlockDoublePlant.EnumBlockHalf> HALF = PropertyEnum.<BlockDoublePlant.EnumBlockHalf>create("half", BlockDoublePlant.EnumBlockHalf.class);
@@ -91,6 +91,8 @@
@@ -90,6 +90,8 @@
Block block = (Block)(flag ? this : worldIn.getBlockState(blockpos).getBlock());
Block block1 = (Block)(flag ? worldIn.getBlockState(blockpos1).getBlock() : this);
@ -18,7 +18,7 @@
if (block == this)
{
worldIn.setBlockState(blockpos, Blocks.air.getDefaultState(), 2);
@@ -99,17 +101,13 @@
@@ -98,17 +100,13 @@
if (block1 == this)
{
worldIn.setBlockState(blockpos1, Blocks.air.getDefaultState(), 3);
@ -37,7 +37,7 @@
if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER)
{
return worldIn.getBlockState(pos.down()).getBlock() == this;
@@ -159,7 +157,6 @@
@@ -158,7 +156,6 @@
public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
{
@ -45,7 +45,7 @@
{
super.harvestBlock(worldIn, player, pos, state, te);
}
@@ -222,8 +219,6 @@
@@ -221,8 +218,6 @@
else
{
player.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
@ -54,7 +54,7 @@
return true;
}
}
@@ -294,6 +289,32 @@
@@ -293,6 +288,32 @@
return Block.EnumOffsetType.XZ;
}

2
patches/minecraft/net/minecraft/block/BlockFalling.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockFalling.java
+++ ../src-work/minecraft/net/minecraft/block/BlockFalling.java
@@ -87,6 +87,7 @@
@@ -86,6 +86,7 @@
public static boolean canFallInto(World worldIn, BlockPos pos)
{

2
patches/minecraft/net/minecraft/block/BlockFarmland.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
+++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
@@ -90,7 +90,7 @@
@@ -89,7 +89,7 @@
private boolean hasCrops(World worldIn, BlockPos pos)
{
Block block = worldIn.getBlockState(pos.up()).getBlock();

30
patches/minecraft/net/minecraft/block/BlockFire.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockFire.java
+++ ../src-work/minecraft/net/minecraft/block/BlockFire.java
@@ -42,18 +42,24 @@
@@ -41,18 +41,24 @@
int j = pos.getY();
int k = pos.getZ();
@ -28,7 +28,7 @@
}
else
{
@@ -109,6 +115,7 @@
@@ -108,6 +114,7 @@
public void setFireInfo(Block blockIn, int encouragement, int flammability)
{
@ -36,7 +36,7 @@
this.encouragements.put(blockIn, Integer.valueOf(encouragement));
this.flammabilities.put(blockIn, Integer.valueOf(flammability));
}
@@ -148,13 +155,8 @@
@@ -147,13 +154,8 @@
}
Block block = worldIn.getBlockState(pos.down()).getBlock();
@ -51,7 +51,7 @@
if (!flag && worldIn.isRaining() && this.canDie(worldIn, pos))
{
worldIn.setBlockToAir(pos);
@@ -183,7 +185,7 @@
@@ -182,7 +184,7 @@
return;
}
@ -60,7 +60,7 @@
{
worldIn.setBlockToAir(pos);
return;
@@ -198,12 +200,12 @@
@@ -197,12 +199,12 @@
j = -50;
}
@ -79,7 +79,7 @@
for (int k = -1; k <= 1; ++k)
{
@@ -262,22 +264,30 @@
@@ -261,22 +263,30 @@
return false;
}
@ -111,7 +111,7 @@
if (random.nextInt(chance) < i)
{
IBlockState iblockstate = worldIn.getBlockState(pos);
@@ -309,7 +319,7 @@
@@ -308,7 +318,7 @@
{
for (EnumFacing enumfacing : EnumFacing.values())
{
@ -120,7 +120,7 @@
{
return true;
}
@@ -330,7 +340,7 @@
@@ -329,7 +339,7 @@
for (EnumFacing enumfacing : EnumFacing.values())
{
@ -129,7 +129,7 @@
}
return i;
@@ -342,9 +352,10 @@
@@ -341,9 +351,10 @@
return false;
}
@ -141,7 +141,7 @@
}
public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
@@ -383,9 +394,9 @@
@@ -382,9 +393,9 @@
worldIn.playSound((double)((float)pos.getX() + 0.5F), (double)((float)pos.getY() + 0.5F), (double)((float)pos.getZ() + 0.5F), "fire.fire", 1.0F + rand.nextFloat(), rand.nextFloat() * 0.7F + 0.3F, false);
}
@ -153,7 +153,7 @@
{
for (int j = 0; j < 2; ++j)
{
@@ -396,7 +407,7 @@
@@ -395,7 +406,7 @@
}
}
@ -162,7 +162,7 @@
{
for (int k = 0; k < 2; ++k)
{
@@ -407,7 +418,7 @@
@@ -406,7 +417,7 @@
}
}
@ -171,7 +171,7 @@
{
for (int l = 0; l < 2; ++l)
{
@@ -418,7 +429,7 @@
@@ -417,7 +428,7 @@
}
}
@ -180,7 +180,7 @@
{
for (int i1 = 0; i1 < 2; ++i1)
{
@@ -429,7 +440,7 @@
@@ -428,7 +439,7 @@
}
}
@ -189,7 +189,7 @@
{
for (int j1 = 0; j1 < 2; ++j1)
{
@@ -477,4 +488,19 @@
@@ -476,4 +487,19 @@
{
return new BlockState(this, new IProperty[] {AGE, NORTH, EAST, SOUTH, WEST, UPPER, FLIP, ALT});
}

4
patches/minecraft/net/minecraft/block/BlockFlowerPot.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockFlowerPot.java
+++ ../src-work/minecraft/net/minecraft/block/BlockFlowerPot.java
@@ -170,13 +170,6 @@
@@ -169,13 +169,6 @@
public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
{
@ -14,7 +14,7 @@
super.breakBlock(worldIn, pos, state);
}
@@ -396,6 +389,31 @@
@@ -395,6 +388,31 @@
return EnumWorldBlockLayer.CUTOUT;
}

6
patches/minecraft/net/minecraft/block/BlockGrass.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockGrass.java
+++ ../src-work/minecraft/net/minecraft/block/BlockGrass.java
@@ -59,7 +59,7 @@
@@ -58,7 +58,7 @@
{
if (!worldIn.isRemote)
{
@ -9,7 +9,7 @@
{
worldIn.setBlockState(pos, Blocks.dirt.getDefaultState());
}
@@ -73,7 +73,7 @@
@@ -72,7 +72,7 @@
Block block = worldIn.getBlockState(blockpos.up()).getBlock();
IBlockState iblockstate = worldIn.getBlockState(blockpos);
@ -18,7 +18,7 @@
{
worldIn.setBlockState(blockpos, Blocks.grass.getDefaultState());
}
@@ -111,7 +111,7 @@
@@ -110,7 +110,7 @@
{
if (j >= i / 16)
{

2
patches/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockHugeMushroom.java
+++ ../src-work/minecraft/net/minecraft/block/BlockHugeMushroom.java
@@ -80,6 +80,20 @@
@@ -79,6 +79,20 @@
return new BlockState(this, new IProperty[] {VARIANT});
}

4
patches/minecraft/net/minecraft/block/BlockIce.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockIce.java
+++ ../src-work/minecraft/net/minecraft/block/BlockIce.java
@@ -40,14 +40,17 @@
@@ -38,14 +38,17 @@
player.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
player.addExhaustion(0.025F);
@ -23,7 +23,7 @@
}
else
{
@@ -58,7 +61,9 @@
@@ -56,7 +59,9 @@
}
int i = EnchantmentHelper.getFortuneModifier(player);

6
patches/minecraft/net/minecraft/block/BlockLadder.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockLadder.java
+++ ../src-work/minecraft/net/minecraft/block/BlockLadder.java
@@ -79,7 +79,10 @@
@@ -78,7 +78,10 @@
public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
{
@ -12,7 +12,7 @@
}
public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
@@ -117,7 +120,7 @@
@@ -116,7 +119,7 @@
protected boolean canBlockStay(World worldIn, BlockPos pos, EnumFacing facing)
{
@ -21,7 +21,7 @@
}
public IBlockState getStateFromMeta(int meta)
@@ -147,4 +150,6 @@
@@ -146,4 +149,6 @@
{
return new BlockState(this, new IProperty[] {FACING});
}

8
patches/minecraft/net/minecraft/block/BlockLeaves.java.patch
View File

@ -9,7 +9,7 @@
{
public static final PropertyBool DECAYABLE = PropertyBool.create("decayable");
public static final PropertyBool CHECK_DECAY = PropertyBool.create("check_decay");
@@ -76,9 +76,9 @@
@@ -75,9 +75,9 @@
BlockPos blockpos = pos.add(j1, k1, l1);
IBlockState iblockstate = worldIn.getBlockState(blockpos);
@ -21,7 +21,7 @@
}
}
}
@@ -118,9 +118,9 @@
@@ -117,9 +117,9 @@
{
Block block = worldIn.getBlockState(blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2)).getBlock();
@ -33,7 +33,7 @@
{
this.surroundings[(i2 + l1) * k1 + (j2 + l1) * j1 + k2 + l1] = -2;
}
@@ -227,40 +227,7 @@
@@ -226,40 +226,7 @@
public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
{
@ -75,7 +75,7 @@
}
protected void dropApple(World worldIn, BlockPos pos, IBlockState state, int chance)
@@ -297,4 +264,48 @@
@@ -296,4 +263,48 @@
}
public abstract BlockPlanks.EnumType getWoodType(int meta);

2
patches/minecraft/net/minecraft/block/BlockLever.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockLever.java
+++ ../src-work/minecraft/net/minecraft/block/BlockLever.java
@@ -238,6 +238,12 @@
@@ -237,6 +237,12 @@
return new BlockState(this, new IProperty[] {FACING, POWERED});
}

4
patches/minecraft/net/minecraft/block/BlockLog.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockLog.java
+++ ../src-work/minecraft/net/minecraft/block/BlockLog.java
@@ -34,9 +34,9 @@
@@ -33,9 +33,9 @@
{
IBlockState iblockstate = worldIn.getBlockState(blockpos);
@ -12,7 +12,7 @@
}
}
}
@@ -47,6 +47,9 @@
@@ -46,6 +46,9 @@
return super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer).withProperty(LOG_AXIS, BlockLog.EnumAxis.fromFacingAxis(facing.getAxis()));
}

2
patches/minecraft/net/minecraft/block/BlockMobSpawner.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockMobSpawner.java
+++ ../src-work/minecraft/net/minecraft/block/BlockMobSpawner.java
@@ -39,10 +39,14 @@
@@ -37,10 +37,14 @@
public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
{
super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);

2
patches/minecraft/net/minecraft/block/BlockMushroom.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockMushroom.java
+++ ../src-work/minecraft/net/minecraft/block/BlockMushroom.java
@@ -73,7 +73,7 @@
@@ -71,7 +71,7 @@
if (pos.getY() >= 0 && pos.getY() < 256)
{
IBlockState iblockstate = worldIn.getBlockState(pos.down());

4
patches/minecraft/net/minecraft/block/BlockMycelium.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockMycelium.java
+++ ../src-work/minecraft/net/minecraft/block/BlockMycelium.java
@@ -40,7 +40,7 @@
@@ -39,7 +39,7 @@
{
if (!worldIn.isRemote)
{
@ -9,7 +9,7 @@
{
worldIn.setBlockState(pos, Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT));
}
@@ -54,7 +54,7 @@
@@ -53,7 +53,7 @@
IBlockState iblockstate = worldIn.getBlockState(blockpos);
Block block = worldIn.getBlockState(blockpos.up()).getBlock();

6
patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java
+++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java
@@ -39,7 +39,7 @@
@@ -38,7 +38,7 @@
public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state)
{
@ -9,7 +9,7 @@
}
public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
@@ -55,9 +55,11 @@
@@ -54,9 +54,11 @@
super.updateTick(worldIn, pos, state, rand);
}
@ -22,7 +22,7 @@
{
int i = 1;
@@ -108,4 +110,24 @@
@@ -107,4 +109,24 @@
{
return new BlockState(this, new IProperty[] {AGE});
}

2
patches/minecraft/net/minecraft/block/BlockNewLeaf.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockNewLeaf.java
+++ ../src-work/minecraft/net/minecraft/block/BlockNewLeaf.java
@@ -101,14 +101,15 @@
@@ -99,14 +99,15 @@
public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
{

4
patches/minecraft/net/minecraft/block/BlockNote.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockNote.java
+++ ../src-work/minecraft/net/minecraft/block/BlockNote.java
@@ -59,7 +59,9 @@
@@ -58,7 +58,9 @@
if (tileentity instanceof TileEntityNote)
{
TileEntityNote tileentitynote = (TileEntityNote)tileentity;
@ -10,7 +10,7 @@
tileentitynote.triggerNote(worldIn, pos);
playerIn.triggerAchievement(StatList.field_181735_S);
}
@@ -99,6 +101,10 @@
@@ -98,6 +100,10 @@
public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam)
{

2
patches/minecraft/net/minecraft/block/BlockOldLeaf.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockOldLeaf.java
+++ ../src-work/minecraft/net/minecraft/block/BlockOldLeaf.java
@@ -144,11 +144,17 @@
@@ -142,11 +142,17 @@
if (!worldIn.isRemote && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.shears)
{
player.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);

2
patches/minecraft/net/minecraft/block/BlockOre.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockOre.java
+++ ../src-work/minecraft/net/minecraft/block/BlockOre.java
@@ -60,34 +60,40 @@
@@ -58,34 +58,40 @@
public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
{
super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);

6
patches/minecraft/net/minecraft/block/BlockPane.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockPane.java
+++ ../src-work/minecraft/net/minecraft/block/BlockPane.java
@@ -39,7 +39,10 @@
@@ -38,7 +38,10 @@
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
@ -12,7 +12,7 @@
}
public Item getItemDropped(IBlockState state, Random rand, int fortune)
@@ -65,10 +68,10 @@
@@ -64,10 +67,10 @@
public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity)
{
@ -27,7 +27,7 @@
if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1))
{
@@ -187,4 +190,11 @@
@@ -186,4 +189,11 @@
{
return new BlockState(this, new IProperty[] {NORTH, EAST, WEST, SOUTH});
}

6
patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockPistonBase.java
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonBase.java
@@ -190,7 +190,7 @@
@@ -189,7 +189,7 @@
}
}
@ -9,7 +9,7 @@
{
this.doMove(worldIn, pos, enumfacing, false);
}
@@ -334,7 +334,7 @@
@@ -333,7 +333,7 @@
return false;
}
@ -18,7 +18,7 @@
}
else
{
@@ -372,7 +372,9 @@
@@ -371,7 +371,9 @@
{
BlockPos blockpos = (BlockPos)list1.get(j);
Block block = worldIn.getBlockState(blockpos).getBlock();

4
patches/minecraft/net/minecraft/block/BlockPistonMoving.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockPistonMoving.java
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonMoving.java
@@ -110,16 +110,7 @@
@@ -109,16 +109,7 @@
public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
{
@ -18,7 +18,7 @@
}
public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end)
@@ -283,4 +274,16 @@
@@ -282,4 +273,16 @@
{
return new BlockState(this, new IProperty[] {FACING, TYPE});
}

2
patches/minecraft/net/minecraft/block/BlockPotato.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockPotato.java
+++ ../src-work/minecraft/net/minecraft/block/BlockPotato.java
@@ -24,13 +24,14 @@
@@ -22,13 +22,14 @@
public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
{
super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);

2
patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockPumpkin.java
+++ ../src-work/minecraft/net/minecraft/block/BlockPumpkin.java
@@ -117,7 +117,7 @@
@@ -115,7 +115,7 @@
public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
{

2
patches/minecraft/net/minecraft/block/BlockQuartz.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockQuartz.java
+++ ../src-work/minecraft/net/minecraft/block/BlockQuartz.java
@@ -91,6 +91,26 @@
@@ -90,6 +90,26 @@
return new BlockState(this, new IProperty[] {VARIANT});
}

18
patches/minecraft/net/minecraft/block/BlockRailBase.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockRailBase.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRailBase.java
@@ -32,7 +32,7 @@
@@ -31,7 +31,7 @@
public static boolean isRailBlock(IBlockState state)
{
Block block = state.getBlock();
@ -9,7 +9,7 @@
}
protected BlockRailBase(boolean isPowered)
@@ -176,6 +176,81 @@
@@ -175,6 +175,81 @@
public abstract IProperty<BlockRailBase.EnumRailDirection> getShapeProperty();
@ -91,15 +91,15 @@
public static enum EnumRailDirection implements IStringSerializable
{
NORTH_SOUTH(0, "north_south"),
@@ -248,6 +323,7 @@
@@ -245,6 +320,7 @@
private IBlockState state;
private final boolean isPowered;
private final List<BlockPos> field_150657_g = Lists.<BlockPos>newArrayList();
private static final String __OBFID = "CL_00000196";
+ private final boolean canMakeSlopes;
public Rail(World worldIn, BlockPos pos, IBlockState state)
{
@@ -256,7 +332,8 @@
@@ -253,7 +329,8 @@
this.state = state;
this.block = (BlockRailBase)state.getBlock();
BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)state.getValue(BlockRailBase.this.getShapeProperty());
@ -109,7 +109,7 @@
this.func_180360_a(blockrailbase$enumraildirection);
}
@@ -442,7 +519,7 @@
@@ -439,7 +516,7 @@
}
}
@ -118,7 +118,7 @@
{
if (BlockRailBase.isRailBlock(this.world, blockpos.up()))
{
@@ -455,7 +532,7 @@
@@ -452,7 +529,7 @@
}
}
@ -127,7 +127,7 @@
{
if (BlockRailBase.isRailBlock(this.world, blockpos3.up()))
{
@@ -598,7 +675,7 @@
@@ -595,7 +672,7 @@
}
}
@ -136,7 +136,7 @@
{
if (BlockRailBase.isRailBlock(this.world, blockpos.up()))
{
@@ -611,7 +688,7 @@
@@ -608,7 +685,7 @@
}
}

2
patches/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneComparator.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneComparator.java
@@ -297,6 +297,21 @@
@@ -295,6 +295,21 @@
return this.getDefaultState().withProperty(FACING, placer.getHorizontalFacing().getOpposite()).withProperty(POWERED, Boolean.valueOf(false)).withProperty(MODE, BlockRedstoneComparator.Mode.COMPARE);
}

2
patches/minecraft/net/minecraft/block/BlockRedstoneDiode.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneDiode.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneDiode.java
@@ -199,6 +199,8 @@
@@ -198,6 +198,8 @@
{
EnumFacing enumfacing = (EnumFacing)state.getValue(FACING);
BlockPos blockpos = pos.offset(enumfacing.getOpposite());

2
patches/minecraft/net/minecraft/block/BlockRedstoneOre.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneOre.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneOre.java
@@ -92,12 +92,16 @@
@@ -91,12 +91,16 @@
public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
{
super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);

4
patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneWire.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneWire.java
@@ -59,10 +59,10 @@
@@ -58,10 +58,10 @@
BlockPos blockpos = pos.offset(direction);
Block block = worldIn.getBlockState(pos.offset(direction)).getBlock();
@ -13,7 +13,7 @@
}
else
{
@@ -360,35 +360,24 @@
@@ -359,35 +359,24 @@
Block block = iblockstate.getBlock();
boolean flag = block.isNormalCube();
boolean flag1 = worldIn.getBlockState(pos.up()).getBlock().isNormalCube();

6
patches/minecraft/net/minecraft/block/BlockReed.java.patch
View File

@ -8,8 +8,8 @@
+public class BlockReed extends Block implements net.minecraftforge.common.IPlantable
{
public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 15);
private static final String __OBFID = "CL_00000300";
@@ -66,6 +66,7 @@
@@ -65,6 +65,7 @@
public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
{
Block block = worldIn.getBlockState(pos.down()).getBlock();
@ -17,7 +17,7 @@
if (block == this)
{
@@ -165,4 +166,15 @@
@@ -164,4 +165,15 @@
{
return new BlockState(this, new IProperty[] {AGE});
}

2
patches/minecraft/net/minecraft/block/BlockRotatedPillar.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockRotatedPillar.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRotatedPillar.java
@@ -19,4 +19,18 @@
@@ -18,4 +18,18 @@
{
super(p_i46385_1_, p_i46385_2_);
}

2
patches/minecraft/net/minecraft/block/BlockSapling.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockSapling.java
+++ ../src-work/minecraft/net/minecraft/block/BlockSapling.java
@@ -72,6 +72,7 @@
@@ -71,6 +71,7 @@
public void generateTree(World worldIn, BlockPos pos, IBlockState state, Random rand)
{

8
patches/minecraft/net/minecraft/block/BlockSkull.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockSkull.java
+++ ../src-work/minecraft/net/minecraft/block/BlockSkull.java
@@ -123,10 +123,6 @@
@@ -121,10 +121,6 @@
return tileentity instanceof TileEntitySkull ? ((TileEntitySkull)tileentity).getSkullType() : super.getDamageValue(worldIn, pos);
}
@ -11,7 +11,7 @@
public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player)
{
if (player.capabilities.isCreativeMode)
@@ -134,13 +130,18 @@
@@ -132,13 +128,18 @@
state = state.withProperty(NODROP, Boolean.valueOf(true));
worldIn.setBlockState(pos, state, 4);
}
@ -31,7 +31,7 @@
{
if (!((Boolean)state.getValue(NODROP)).booleanValue())
{
@@ -149,7 +150,7 @@
@@ -147,7 +148,7 @@
if (tileentity instanceof TileEntitySkull)
{
TileEntitySkull tileentityskull = (TileEntitySkull)tileentity;
@ -40,7 +40,7 @@
if (tileentityskull.getSkullType() == 3 && tileentityskull.getPlayerProfile() != null)
{
@@ -159,12 +160,11 @@
@@ -157,12 +158,11 @@
itemstack.getTagCompound().setTag("SkullOwner", nbttagcompound);
}

10
patches/minecraft/net/minecraft/block/BlockSnow.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockSnow.java
+++ ../src-work/minecraft/net/minecraft/block/BlockSnow.java
@@ -80,7 +80,7 @@
@@ -79,7 +79,7 @@
{
IBlockState iblockstate = worldIn.getBlockState(pos.down());
Block block = iblockstate.getBlock();
@ -9,7 +9,7 @@
}
public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
@@ -92,7 +92,6 @@
@@ -91,7 +91,6 @@
{
if (!this.canPlaceBlockAt(worldIn, p_176314_2_))
{
@ -17,7 +17,7 @@
worldIn.setBlockToAir(p_176314_2_);
return false;
}
@@ -104,9 +103,8 @@
@@ -103,9 +102,8 @@
public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
{
@ -28,7 +28,7 @@
}
public Item getItemDropped(IBlockState state, Random rand, int fortune)
@@ -116,14 +114,13 @@
@@ -115,14 +113,13 @@
public int quantityDropped(Random random)
{
@ -44,7 +44,7 @@
worldIn.setBlockToAir(pos);
}
}
@@ -153,4 +150,6 @@
@@ -152,4 +149,6 @@
{
return new BlockState(this, new IProperty[] {LAYERS});
}

6
patches/minecraft/net/minecraft/block/BlockStem.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockStem.java
+++ ../src-work/minecraft/net/minecraft/block/BlockStem.java
@@ -96,7 +96,7 @@
@@ -94,7 +94,7 @@
pos = pos.offset(EnumFacing.Plane.HORIZONTAL.random(rand));
Block block = worldIn.getBlockState(pos.down()).getBlock();
@ -9,7 +9,7 @@
{
worldIn.setBlockState(pos, this.crop.getDefaultState());
}
@@ -150,8 +150,12 @@
@@ -148,8 +148,12 @@
public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
{
super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
@ -23,7 +23,7 @@
{
Item item = this.getSeedItem();
@@ -161,13 +165,14 @@
@@ -159,13 +163,14 @@
for (int j = 0; j < 3; ++j)
{

10
patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch
View File

@ -8,8 +8,8 @@
+public class BlockTallGrass extends BlockBush implements IGrowable, net.minecraftforge.common.IShearable
{
public static final PropertyEnum<BlockTallGrass.EnumType> TYPE = PropertyEnum.<BlockTallGrass.EnumType>create("type", BlockTallGrass.EnumType.class);
private static final String __OBFID = "CL_00000321";
@@ -44,7 +44,7 @@
@@ -43,7 +43,7 @@
public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state)
{
@ -18,7 +18,7 @@
}
public boolean isReplaceable(World worldIn, BlockPos pos)
@@ -54,7 +54,7 @@
@@ -53,7 +53,7 @@
public Item getItemDropped(IBlockState state, Random rand, int fortune)
{
@ -27,7 +27,7 @@
}
public int quantityDroppedWithBonus(int fortune, Random random)
@@ -64,13 +64,7 @@
@@ -63,13 +63,7 @@
public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
{
@ -41,7 +41,7 @@
super.harvestBlock(worldIn, player, pos, state, te);
}
}
@@ -206,4 +200,22 @@
@@ -204,4 +198,22 @@
}
}
}

8
patches/minecraft/net/minecraft/block/BlockTorch.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockTorch.java
+++ ../src-work/minecraft/net/minecraft/block/BlockTorch.java
@@ -65,7 +65,7 @@
@@ -63,7 +63,7 @@
else
{
Block block = worldIn.getBlockState(pos).getBlock();
@ -9,7 +9,7 @@
}
}
@@ -86,7 +86,7 @@
@@ -84,7 +84,7 @@
{
BlockPos blockpos = pos.offset(facing.getOpposite());
boolean flag = facing.getAxis().isHorizontal();
@ -18,7 +18,7 @@
}
public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
@@ -99,7 +99,7 @@
@@ -97,7 +97,7 @@
{
for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL)
{
@ -27,7 +27,7 @@
{
return this.getDefaultState().withProperty(FACING, enumfacing);
}
@@ -132,7 +132,7 @@
@@ -130,7 +130,7 @@
EnumFacing enumfacing1 = enumfacing.getOpposite();
boolean flag = false;

6
patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch
View File

@ -9,7 +9,7 @@
public static final PropertyDirection FACING = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
public static final PropertyBool OPEN = PropertyBool.create("open");
public static final PropertyEnum<BlockTrapDoor.DoorHalf> HALF = PropertyEnum.<BlockTrapDoor.DoorHalf>create("half", BlockTrapDoor.DoorHalf.class);
@@ -141,9 +143,10 @@
@@ -140,9 +142,10 @@
{
if (!worldIn.isRemote)
{
@ -21,7 +21,7 @@
{
worldIn.setBlockToAir(pos);
this.dropBlockAsItem(worldIn, pos, state, 0);
@@ -187,7 +190,10 @@
@@ -186,7 +189,10 @@
public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
{
@ -33,7 +33,7 @@
}
protected static EnumFacing getFacing(int meta)
@@ -224,6 +230,7 @@
@@ -223,6 +229,7 @@
private static boolean isValidSupportBlock(Block blockIn)
{

4
patches/minecraft/net/minecraft/block/BlockTripWireHook.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockTripWireHook.java
+++ ../src-work/minecraft/net/minecraft/block/BlockTripWireHook.java
@@ -59,14 +59,14 @@
@@ -58,14 +58,14 @@
public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
{
@ -17,7 +17,7 @@
{
return true;
}
@@ -100,7 +100,7 @@
@@ -99,7 +99,7 @@
{
EnumFacing enumfacing = (EnumFacing)state.getValue(FACING);

4
patches/minecraft/net/minecraft/block/BlockVine.java.patch
View File

@ -9,7 +9,7 @@
{
public static final PropertyBool UP = PropertyBool.create("up");
public static final PropertyBool NORTH = PropertyBool.create("north");
@@ -388,13 +388,7 @@
@@ -387,13 +387,7 @@
public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
{
@ -23,7 +23,7 @@
super.harvestBlock(worldIn, player, pos, state, te);
}
}
@@ -475,4 +469,14 @@
@@ -474,4 +468,14 @@
return i;
}

6
patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java
+++ ../src-work/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java
@@ -79,7 +79,7 @@
@@ -78,7 +78,7 @@
{
Block block = this.world.getBlockState(origin).getBlock();
@ -9,7 +9,7 @@
{
return true;
}
@@ -110,7 +110,7 @@
@@ -109,7 +109,7 @@
BlockPos blockpos = origin.offset(this.moveDirection.getOpposite(), i);
block = this.world.getBlockState(blockpos).getBlock();
@ -18,7 +18,7 @@
{
break;
}
@@ -157,7 +157,7 @@
@@ -156,7 +156,7 @@
block = this.world.getBlockState(blockpos1).getBlock();

8
patches/minecraft/net/minecraft/block/state/BlockState.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/state/BlockState.java
+++ ../src-work/minecraft/net/minecraft/block/state/BlockState.java
@@ -40,6 +40,16 @@
@@ -38,6 +38,16 @@
public BlockState(Block blockIn, IProperty... properties)
{
@ -17,7 +17,7 @@
this.block = blockIn;
Arrays.sort(properties, new Comparator<IProperty>()
{
@@ -56,7 +66,7 @@
@@ -53,7 +63,7 @@
for (List<Comparable> list1 : Cartesian.cartesianProduct(this.getAllowedValues()))
{
Map<IProperty, Comparable> map1 = MapPopulator.<IProperty, Comparable>createMap(this.properties, list1);
@ -26,7 +26,7 @@
map.put(map1, blockstate$stateimplementation);
list.add(blockstate$stateimplementation);
}
@@ -136,6 +146,13 @@
@@ -132,6 +142,13 @@
}
}
@ -40,7 +40,7 @@
public <T extends Comparable<T>, V extends T> IBlockState withProperty(IProperty<T> property, V value)
{
if (!this.properties.containsKey(property))
@@ -203,5 +220,10 @@
@@ -199,5 +216,10 @@
map.put(property, value);
return map;
}

2
patches/minecraft/net/minecraft/block/state/BlockStateBase.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/state/BlockStateBase.java
+++ ../src-work/minecraft/net/minecraft/block/state/BlockStateBase.java
@@ -69,4 +69,9 @@
@@ -67,4 +67,9 @@
return stringbuilder.toString();
}

4
patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
View File

@ -1,7 +1,7 @@
--- ../src-base/minecraft/net/minecraft/client/ClientBrandRetriever.java
+++ ../src-work/minecraft/net/minecraft/client/ClientBrandRetriever.java
@@ -10,6 +10,6 @@
@@ -8,6 +8,6 @@
{
public static String getClientModName()
{
- return "vanilla";

4
patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/LoadingScreenRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/LoadingScreenRenderer.java
@@ -140,6 +140,10 @@
@@ -139,6 +139,10 @@
GlStateManager.clear(16640);
}
@ -11,7 +11,7 @@
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
this.mc.getTextureManager().bindTexture(Gui.optionsBackground);
@@ -175,6 +179,12 @@
@@ -174,6 +178,12 @@
GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
this.mc.fontRendererObj.drawStringWithShadow(this.currentlyDisplayedText, (float)((k - this.mc.fontRendererObj.getStringWidth(this.currentlyDisplayedText)) / 2), (float)(l / 2 - 4 - 16), 16777215);
this.mc.fontRendererObj.drawStringWithShadow(this.message, (float)((k - this.mc.fontRendererObj.getStringWidth(this.message)) / 2), (float)(l / 2 - 4 + 8), 16777215);

48
patches/minecraft/net/minecraft/client/Minecraft.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/Minecraft.java
+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
@@ -302,7 +302,6 @@
@@ -301,7 +301,6 @@
this.sessionService = (new YggdrasilAuthenticationService(gameConfig.userInfo.proxy, UUID.randomUUID().toString())).createMinecraftSessionService();
this.session = gameConfig.userInfo.session;
logger.info("Setting user: " + this.session.getUsername());
@ -8,7 +8,7 @@
this.isDemo = gameConfig.gameInfo.isDemo;
this.displayWidth = gameConfig.displayInfo.width > 0 ? gameConfig.displayInfo.width : 1;
this.displayHeight = gameConfig.displayInfo.height > 0 ? gameConfig.displayInfo.height : 1;
@@ -416,10 +415,10 @@
@@ -415,10 +414,10 @@
this.mcResourceManager = new SimpleReloadableResourceManager(this.metadataSerializer_);
this.mcLanguageManager = new LanguageManager(this.metadataSerializer_, this.gameSettings.language);
this.mcResourceManager.registerReloadListener(this.mcLanguageManager);
@ -21,7 +21,7 @@
this.initStream();
this.skinManager = new SkinManager(this.renderEngine, new File(this.fileAssets, "skins"), this.sessionService);
this.saveLoader = new AnvilSaveConverter(new File(this.mcDataDir, "saves"));
@@ -455,6 +454,8 @@
@@ -453,6 +452,8 @@
}
});
this.mouseHelper = new MouseHelper();
@ -30,7 +30,7 @@
this.checkGLError("Pre startup");
GlStateManager.enableTexture2D();
GlStateManager.shadeModel(7425);
@@ -468,17 +469,21 @@
@@ -466,17 +467,21 @@
GlStateManager.loadIdentity();
GlStateManager.matrixMode(5888);
this.checkGLError("Startup");
@ -53,7 +53,7 @@
this.entityRenderer = new EntityRenderer(this, this.mcResourceManager);
this.mcResourceManager.registerReloadListener(this.entityRenderer);
this.blockRenderDispatcher = new BlockRendererDispatcher(this.modelManager.getBlockModelShapes(), this.gameSettings);
@@ -488,22 +493,25 @@
@@ -486,22 +491,25 @@
this.guiAchievement = new GuiAchievement(this);
GlStateManager.viewport(0, 0, this.displayWidth, this.displayHeight);
this.effectRenderer = new EffectRenderer(this.theWorld, this.renderEngine);
@ -82,7 +82,7 @@
if (this.gameSettings.fullScreen && !this.fullscreen)
{
this.toggleFullscreen();
@@ -684,21 +692,23 @@
@@ -681,21 +689,23 @@
File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
Bootstrap.printToSYSOUT(crashReportIn.getCompleteReport());
@ -109,7 +109,7 @@
}
public boolean isUnicode()
@@ -886,11 +896,6 @@
@@ -883,11 +893,6 @@
public void displayGuiScreen(GuiScreen guiScreenIn)
{
@ -121,7 +121,7 @@
if (guiScreenIn == null && this.theWorld == null)
{
guiScreenIn = new GuiMainMenu();
@@ -900,6 +905,17 @@
@@ -897,6 +902,17 @@
guiScreenIn = new GuiGameOver();
}
@ -139,7 +139,7 @@
if (guiScreenIn instanceof GuiMainMenu)
{
this.gameSettings.showDebugInfo = false;
@@ -1033,9 +1049,11 @@
@@ -1030,9 +1046,11 @@
if (!this.skipRenderWorld)
{
@ -151,7 +151,7 @@
}
this.mcProfiler.endSection();
@@ -1380,7 +1398,7 @@
@@ -1377,7 +1395,7 @@
if (this.theWorld.getBlockState(blockpos).getBlock().getMaterial() != Material.air && this.playerController.func_180512_c(blockpos, this.objectMouseOver.sideHit))
{
@ -160,7 +160,7 @@
this.thePlayer.swingItem();
}
}
@@ -1466,15 +1484,19 @@
@@ -1463,15 +1481,19 @@
case BLOCK:
BlockPos blockpos = this.objectMouseOver.getBlockPos();
@ -181,7 +181,7 @@
if (itemstack == null)
{
@@ -1497,7 +1519,8 @@
@@ -1494,7 +1516,8 @@
{
ItemStack itemstack1 = this.thePlayer.inventory.getCurrentItem();
@ -191,7 +191,7 @@
{
this.entityRenderer.itemRenderer.resetEquippedProgress2();
}
@@ -1601,6 +1624,8 @@
@@ -1598,6 +1621,8 @@
--this.rightClickDelayTimer;
}
@ -200,7 +200,7 @@
this.mcProfiler.startSection("gui");
if (!this.isGamePaused)
@@ -1695,6 +1720,8 @@
@@ -1690,6 +1715,8 @@
while (Mouse.next())
{
@ -209,7 +209,7 @@
int i = Mouse.getEventButton();
KeyBinding.setKeyBindState(i - 100, Mouse.getEventButtonState());
@@ -1750,6 +1777,7 @@
@@ -1745,6 +1772,7 @@
this.currentScreen.handleMouseInput();
}
}
@ -217,7 +217,7 @@
}
if (this.leftClickCounter > 0)
@@ -1928,6 +1956,7 @@
@@ -1923,6 +1951,7 @@
}
}
}
@ -225,7 +225,7 @@
}
for (int l = 0; l < 9; ++l)
@@ -2124,12 +2153,15 @@
@@ -2119,12 +2148,15 @@
this.myNetworkManager.processReceivedPackets();
}
@ -241,7 +241,7 @@
this.loadWorld((WorldClient)null);
System.gc();
ISaveHandler isavehandler = this.saveLoader.getSaveLoader(folderName, false);
@@ -2165,6 +2197,12 @@
@@ -2160,6 +2192,12 @@
while (!this.theIntegratedServer.serverIsInRunLoop())
{
@ -254,7 +254,7 @@
String s = this.theIntegratedServer.getUserMessage();
if (s != null)
@@ -2190,8 +2228,14 @@
@@ -2185,8 +2223,14 @@
SocketAddress socketaddress = this.theIntegratedServer.getNetworkSystem().addLocalEndpoint();
NetworkManager networkmanager = NetworkManager.provideLocalClient(socketaddress);
networkmanager.setNetHandler(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null));
@ -271,7 +271,7 @@
this.myNetworkManager = networkmanager;
}
@@ -2202,6 +2246,8 @@
@@ -2197,6 +2241,8 @@
public void loadWorld(WorldClient worldClientIn, String loadingMessage)
{
@ -280,7 +280,7 @@
if (worldClientIn == null)
{
NetHandlerPlayClient nethandlerplayclient = this.getNetHandler();
@@ -2215,6 +2261,18 @@
@@ -2210,6 +2256,18 @@
{
this.theIntegratedServer.initiateShutdown();
this.theIntegratedServer.setStaticInstance();
@ -299,7 +299,7 @@
}
this.theIntegratedServer = null;
@@ -2237,6 +2295,7 @@
@@ -2232,6 +2290,7 @@
this.ingameGUI.func_181029_i();
this.setServerData((ServerData)null);
this.integratedServerIsRunning = false;
@ -307,7 +307,7 @@
}
this.mcSoundHandler.stopSounds();
@@ -2341,126 +2400,10 @@
@@ -2336,126 +2395,10 @@
if (this.objectMouseOver != null)
{
boolean flag = this.thePlayer.capabilities.isCreativeMode;
@ -436,7 +436,7 @@
if (flag)
{
int j = this.thePlayer.inventoryContainer.inventorySlots.size() - 9 + inventoryplayer.currentItem;
@@ -2773,18 +2716,8 @@
@@ -2756,18 +2699,8 @@
public static int getGLMaximumTextureSize()
{

8
patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/audio/SoundManager.java
+++ ../src-work/minecraft/net/minecraft/client/audio/SoundManager.java
@@ -70,6 +70,7 @@
@@ -69,6 +69,7 @@
{
SoundSystemConfig.addLibrary(LibraryLWJGLOpenAL.class);
SoundSystemConfig.setCodec("ogg", CodecJOrbis.class);
@ -8,7 +8,7 @@
}
catch (SoundSystemException soundsystemexception)
{
@@ -81,6 +82,7 @@
@@ -80,6 +81,7 @@
{
this.unloadSoundSystem();
this.loadSoundSystem();
@ -16,7 +16,7 @@
}
private synchronized void loadSoundSystem()
@@ -319,6 +321,9 @@
@@ -316,6 +318,9 @@
}
else
{
@ -26,7 +26,7 @@
SoundEventAccessorComposite soundeventaccessorcomposite = this.sndHandler.getSound(sound.getSoundLocation());
if (soundeventaccessorcomposite == null)
@@ -360,10 +365,12 @@
@@ -357,10 +362,12 @@
if (soundpoolentry.isStreamingSound())
{
this.sndSystem.newStreamingSource(false, s, getURLForSoundResource(resourcelocation), resourcelocation.toString(), flag, sound.getXPosF(), sound.getYPosF(), sound.getZPosF(), sound.getAttenuationType().getTypeInt(), f1);

2
patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java
+++ ../src-work/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java
@@ -129,6 +129,6 @@
@@ -128,6 +128,6 @@
f *= 1.0F - f1 * 0.15F;
}

6
patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
+++ ../src-work/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
@@ -346,6 +346,15 @@
@@ -345,6 +345,15 @@
this.mc.ingameGUI.getChatGUI().printChatMessage(chatComponent);
}
@ -16,7 +16,7 @@
protected boolean pushOutOfBlocks(double x, double y, double z)
{
if (this.noClip)
@@ -358,30 +367,34 @@
@@ -357,30 +366,34 @@
double d0 = x - (double)blockpos.getX();
double d1 = z - (double)blockpos.getZ();
@ -56,7 +56,7 @@
{
d2 = 1.0D - d1;
i = 5;
@@ -449,6 +462,12 @@
@@ -448,6 +461,12 @@
public void playSound(String name, float volume, float pitch)
{

28
patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/FontRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/gui/FontRenderer.java
@@ -58,7 +58,7 @@
@@ -57,7 +57,7 @@
this.locationFontTexture = p_i1035_2_;
this.renderEngine = p_i1035_3_;
this.unicodeFlag = p_i1035_4_;
@ -9,7 +9,7 @@
for (int i = 0; i < 32; ++i)
{
@@ -98,6 +98,7 @@
@@ -97,6 +97,7 @@
public void onResourceManagerReload(IResourceManager resourceManager)
{
this.readFontTexture();
@ -17,7 +17,7 @@
}
private void readFontTexture()
@@ -106,7 +107,7 @@
@@ -105,7 +106,7 @@
try
{
@ -26,7 +26,7 @@
}
catch (IOException ioexception)
{
@@ -166,7 +167,7 @@
@@ -165,7 +166,7 @@
try
{
@ -35,7 +35,7 @@
inputstream.read(this.glyphWidth);
}
catch (IOException ioexception)
@@ -197,7 +198,7 @@
@@ -196,7 +197,7 @@
int i = p_78266_1_ % 16 * 8;
int j = p_78266_1_ / 16 * 8;
int k = p_78266_2_ ? 1 : 0;
@ -44,7 +44,7 @@
int l = this.charWidth[p_78266_1_];
float f = (float)l - 0.01F;
GL11.glBegin(GL11.GL_TRIANGLE_STRIP);
@@ -225,7 +226,7 @@
@@ -224,7 +225,7 @@
private void loadGlyphTexture(int p_78257_1_)
{
@ -53,7 +53,7 @@
}
protected float renderUnicodeChar(char p_78277_1_, boolean p_78277_2_)
@@ -272,7 +273,7 @@
@@ -271,7 +272,7 @@
public int drawString(String p_175065_1_, float p_175065_2_, float p_175065_3_, int p_175065_4_, boolean p_175065_5_)
{
@ -62,7 +62,7 @@
this.resetStyles();
int i;
@@ -342,7 +343,7 @@
@@ -341,7 +342,7 @@
int j1 = this.colorCode[i1];
this.textColor = j1;
@ -71,7 +71,7 @@
}
else if (i1 == 16)
{
@@ -371,7 +372,7 @@
@@ -370,7 +371,7 @@
this.strikethroughStyle = false;
this.underlineStyle = false;
this.italicStyle = false;
@ -80,7 +80,7 @@
}
++i;
@@ -399,7 +400,7 @@
@@ -398,7 +399,7 @@
c0 = c1;
}
@ -89,7 +89,7 @@
boolean flag = (c0 == 0 || j == -1 || this.unicodeFlag) && p_78255_2_;
if (flag)
@@ -437,7 +438,16 @@
@@ -436,7 +437,16 @@
++f;
}
@ -106,7 +106,7 @@
if (this.strikethroughStyle)
{
Tessellator tessellator = Tessellator.getInstance();
@@ -510,7 +520,7 @@
@@ -509,7 +519,7 @@
this.blue = (float)(p_180455_4_ >> 8 & 255) / 255.0F;
this.green = (float)(p_180455_4_ & 255) / 255.0F;
this.alpha = (float)(p_180455_4_ >> 24 & 255) / 255.0F;
@ -115,7 +115,7 @@
this.posX = p_180455_2_;
this.posY = p_180455_3_;
this.renderStringAtPos(p_180455_1_, p_180455_5_);
@@ -589,11 +599,6 @@
@@ -588,11 +598,6 @@
int j = this.glyphWidth[p_78263_1_] >>> 4;
int k = this.glyphWidth[p_78263_1_] & 15;
@ -127,7 +127,7 @@
++k;
return (k - j) / 2 + 1;
@@ -847,6 +852,26 @@
@@ -846,6 +851,26 @@
return this.bidiFlag;
}

6
patches/minecraft/net/minecraft/client/gui/GuiButton.java.patch
View File

@ -1,14 +1,14 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiButton.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiButton.java
@@ -22,6 +22,7 @@
@@ -21,6 +21,7 @@
public boolean enabled;
public boolean visible;
protected boolean hovered;
private static final String __OBFID = "CL_00000668";
+ public int packedFGColour; //FML
public GuiButton(int buttonId, int x, int y, String buttonText)
{
@@ -75,6 +76,11 @@
@@ -74,6 +75,11 @@
this.mouseDragged(mc, mouseX, mouseY);
int j = 14737632;

4
patches/minecraft/net/minecraft/client/gui/GuiChat.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiChat.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiChat.java
@@ -216,13 +216,14 @@
@@ -215,13 +215,14 @@
this.mc.ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText(stringbuilder.toString()), 1);
}
@ -16,7 +16,7 @@
BlockPos blockpos = null;
if (this.mc.objectMouseOver != null && this.mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
@@ -282,6 +283,12 @@
@@ -281,6 +282,12 @@
this.playerNamesFound = false;
this.foundPlayerNames.clear();

6
patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
@@ -206,6 +206,8 @@
@@ -205,6 +205,8 @@
}
}
@ -9,7 +9,7 @@
WorldSettings.GameType worldsettings$gametype = WorldSettings.GameType.getByName(this.field_146342_r);
WorldSettings worldsettings = new WorldSettings(i, worldsettings$gametype, this.field_146341_s, this.field_146337_w, WorldType.worldTypes[this.selectedIndex]);
worldsettings.setWorldName(this.chunkProviderSettingsJson);
@@ -313,14 +315,7 @@
@@ -312,14 +314,7 @@
}
else if (button.id == 8)
{
@ -25,7 +25,7 @@
}
}
}
@@ -372,7 +367,7 @@
@@ -371,7 +366,7 @@
this.btnBonusItems.visible = this.field_146344_y;
this.btnMapType.visible = this.field_146344_y;
this.btnAllowCommands.visible = this.field_146344_y;

4
patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
@@ -31,8 +31,9 @@
@@ -30,8 +30,9 @@
this.buttonList.add(new GuiButton(4, this.width / 2 - 100, this.height / 4 + 24 + i, I18n.format("menu.returnToGame", new Object[0])));
this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 96 + i, 98, 20, I18n.format("menu.options", new Object[0])));
@ -11,7 +11,7 @@
this.buttonList.add(new GuiButton(5, this.width / 2 - 100, this.height / 4 + 48 + i, 98, 20, I18n.format("gui.achievements", new Object[0])));
this.buttonList.add(new GuiButton(6, this.width / 2 + 2, this.height / 4 + 48 + i, 98, 20, I18n.format("gui.stats", new Object[0])));
guibutton.enabled = this.mc.isSingleplayer() && !this.mc.getIntegratedServer().getPublic();
@@ -75,13 +76,19 @@
@@ -74,13 +75,19 @@
this.mc.setIngameFocus();
break;
case 5:

6
patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
@@ -198,6 +198,11 @@
@@ -197,6 +197,11 @@
this.buttonList.add(new GuiButton(1, this.width / 2 - 100, p_73969_1_, I18n.format("menu.singleplayer", new Object[0])));
this.buttonList.add(new GuiButton(2, this.width / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.format("menu.multiplayer", new Object[0])));
this.buttonList.add(this.realmsButton = new GuiButton(14, this.width / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.format("menu.online", new Object[0])));
@ -12,7 +12,7 @@
}
private void addDemoButtons(int p_73972_1_, int p_73972_2_)
@@ -245,6 +250,11 @@
@@ -244,6 +249,11 @@
this.mc.shutdown();
}
@ -24,7 +24,7 @@
if (button.id == 11)
{
this.mc.launchIntegratedServer("Demo_World", "Demo_World", DemoWorldServer.demoWorldSettings);
@@ -490,7 +500,16 @@
@@ -489,7 +499,16 @@
s = s + " Demo";
}

4
patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
@@ -41,6 +41,7 @@
@@ -40,6 +40,7 @@
public GuiMultiplayer(GuiScreen parentScreen)
{
this.parentScreen = parentScreen;
@ -8,7 +8,7 @@
}
public void initGui()
@@ -373,7 +374,7 @@
@@ -372,7 +373,7 @@
private void connectToServer(ServerData server)
{

2
patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
@@ -177,6 +177,9 @@
@@ -176,6 +176,9 @@
long l = j - k;
List<String> list = Lists.newArrayList(new String[] {String.format("Java: %s %dbit", new Object[]{System.getProperty("java.version"), Integer.valueOf(this.mc.isJava64bit() ? 64 : 32)}), String.format("Mem: % 2d%% %03d/%03dMB", new Object[]{Long.valueOf(l * 100L / i), Long.valueOf(bytesToMb(l)), Long.valueOf(bytesToMb(i))}), String.format("Allocated: % 2d%% %03dMB", new Object[]{Long.valueOf(j * 100L / i), Long.valueOf(bytesToMb(j))}), "", String.format("CPU: %s", new Object[]{OpenGlHelper.func_183029_j()}), "", String.format("Display: %dx%d (%s)", new Object[]{Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GL11.glGetString(GL11.GL_VENDOR)}), GL11.glGetString(GL11.GL_RENDERER), GL11.glGetString(GL11.GL_VERSION)});

18
patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiScreen.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiScreen.java
@@ -144,7 +144,8 @@
@@ -143,7 +143,8 @@
}
}
@ -10,7 +10,7 @@
}
protected void drawCreativeTabHoveringText(String tabName, int mouseX, int mouseY)
@@ -154,6 +155,11 @@
@@ -153,6 +154,11 @@
protected void drawHoveringText(List<String> textLines, int x, int y)
{
@ -22,7 +22,7 @@
if (!textLines.isEmpty())
{
GlStateManager.disableRescaleNormal();
@@ -164,7 +170,7 @@
@@ -163,7 +169,7 @@
for (String s : textLines)
{
@ -31,7 +31,7 @@
if (j > i)
{
@@ -209,7 +215,7 @@
@@ -208,7 +214,7 @@
for (int k1 = 0; k1 < textLines.size(); ++k1)
{
String s1 = (String)textLines.get(k1);
@ -40,7 +40,7 @@
if (k1 == 0)
{
@@ -437,6 +443,7 @@
@@ -436,6 +442,7 @@
{
this.mc.ingameGUI.getChatGUI().addToSentMessages(msg);
}
@ -48,7 +48,7 @@
this.mc.thePlayer.sendChatMessage(msg);
}
@@ -451,9 +458,15 @@
@@ -450,9 +457,15 @@
if (guibutton.mousePressed(this.mc, mouseX, mouseY))
{
@ -64,7 +64,7 @@
}
}
}
@@ -483,8 +496,12 @@
@@ -482,8 +495,12 @@
this.fontRendererObj = mc.fontRendererObj;
this.width = width;
this.height = height;
@ -77,7 +77,7 @@
}
public void initGui()
@@ -497,7 +514,9 @@
@@ -496,7 +513,9 @@
{
while (Mouse.next())
{
@ -87,7 +87,7 @@
}
}
@@ -505,7 +524,9 @@
@@ -504,7 +523,9 @@
{
while (Keyboard.next())
{

2
patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
@@ -187,7 +187,7 @@
@@ -186,7 +186,7 @@
if (this.mc.getSaveLoader().canLoadWorld(s))
{

2
patches/minecraft/net/minecraft/client/gui/GuiSleepMP.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiSleepMP.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiSleepMP.java
@@ -34,7 +34,7 @@
@@ -32,7 +32,7 @@
if (!s.isEmpty())
{

4
patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiSlot.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiSlot.java
@@ -182,15 +182,8 @@
@@ -181,15 +181,8 @@
GlStateManager.disableFog();
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
@ -18,7 +18,7 @@
int k = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
int l = this.top + 4 - (int)this.amountScrolled;
@@ -459,4 +452,18 @@
@@ -458,4 +451,18 @@
{
return this.slotHeight;
}

4
patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
+++ ../src-work/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
@@ -84,7 +84,7 @@
@@ -82,7 +82,7 @@
boolean flag1 = this.field_148301_e.version < 47;
boolean flag2 = flag || flag1;
this.field_148300_d.fontRendererObj.drawString(this.field_148301_e.serverName, x + 32 + 3, y + 1, 16777215);
@ -9,7 +9,7 @@
for (int i = 0; i < Math.min(list.size(), 2); ++i)
{
@@ -178,6 +178,11 @@
@@ -176,6 +176,11 @@
int i1 = mouseX - x;
int j1 = mouseY - y;

22
patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch
View File

@ -1,8 +1,8 @@
--- ../src-base/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
+++ ../src-work/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
@@ -50,6 +50,10 @@
@@ -49,6 +49,10 @@
private StatFileWriter statFileWriter;
private boolean loadingAchievements = true;
private static final String __OBFID = "CL_00000722";
+ private int currentPage = -1;
+ private GuiButton button;
@ -11,7 +11,7 @@
public GuiAchievements(GuiScreen p_i45026_1_, StatFileWriter p_i45026_2_)
{
this.parentScreen = p_i45026_1_;
@@ -58,6 +62,14 @@
@@ -57,6 +61,14 @@
int j = 141;
this.field_146569_s = this.field_146567_u = this.field_146565_w = (double)(AchievementList.openInventory.displayColumn * 24 - i / 2 - 12);
this.field_146568_t = this.field_146566_v = this.field_146573_x = (double)(AchievementList.openInventory.displayRow * 24 - j / 2);
@ -26,7 +26,7 @@
}
public void initGui()
@@ -65,6 +77,7 @@
@@ -64,6 +76,7 @@
this.mc.getNetHandler().addToSendQueue(new C16PacketClientStatus(C16PacketClientStatus.EnumState.REQUEST_STATS));
this.buttonList.clear();
this.buttonList.add(new GuiOptionButton(1, this.width / 2 + 24, this.height / 2 + 74, 80, 20, I18n.format("gui.done", new Object[0])));
@ -34,7 +34,7 @@
}
protected void actionPerformed(GuiButton button) throws IOException
@@ -75,6 +88,16 @@
@@ -74,6 +87,16 @@
{
this.mc.displayGuiScreen(this.parentScreen);
}
@ -51,7 +51,7 @@
}
}
@@ -258,7 +281,9 @@
@@ -257,7 +280,9 @@
GlStateManager.depthFunc(518);
GlStateManager.pushMatrix();
GlStateManager.translate((float)i1, (float)j1, -200.0F);
@ -62,7 +62,7 @@
GlStateManager.enableTexture2D();
GlStateManager.disableLighting();
GlStateManager.enableRescaleNormal();
@@ -332,11 +357,12 @@
@@ -331,11 +356,12 @@
GlStateManager.depthFunc(515);
this.mc.getTextureManager().bindTexture(field_146561_C);
@ -78,7 +78,7 @@
{
int k5 = achievement1.displayColumn * 24 - i + 11;
int l5 = achievement1.displayRow * 24 - j + 11;
@@ -390,9 +416,9 @@
@@ -389,9 +415,9 @@
GlStateManager.enableRescaleNormal();
GlStateManager.enableColorMaterial();
@ -90,7 +90,7 @@
int l6 = achievement2.displayColumn * 24 - i;
int j7 = achievement2.displayRow * 24 - j;
@@ -433,6 +459,7 @@
@@ -432,6 +458,7 @@
this.mc.getTextureManager().bindTexture(field_146561_C);
@ -98,7 +98,7 @@
if (achievement2.getSpecial())
{
this.drawTexturedModalRect(l6 - 2, j7 - 2, 26, 202, 26, 26);
@@ -441,6 +468,7 @@
@@ -440,6 +467,7 @@
{
this.drawTexturedModalRect(l6 - 2, j7 - 2, 0, 202, 26, 26);
}
@ -106,7 +106,7 @@
if (!this.statFileWriter.canUnlockAchievement(achievement2))
{
@@ -449,7 +477,7 @@
@@ -448,7 +476,7 @@
this.itemRender.func_175039_a(false);
}

4
patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/achievement/GuiStats.java
+++ ../src-work/minecraft/net/minecraft/client/gui/achievement/GuiStats.java
@@ -759,7 +759,7 @@
@@ -748,7 +748,7 @@
super(mcIn, GuiStats.this.width, GuiStats.this.height, 32, GuiStats.this.height - 64, GuiStats.this.fontRendererObj.FONT_HEIGHT * 4);
this.setShowSelectionBox(false);
@ -9,7 +9,7 @@
{
if (GuiStats.this.field_146546_t.readStat(entitylist$entityegginfo.field_151512_d) > 0 || GuiStats.this.field_146546_t.readStat(entitylist$entityegginfo.field_151513_e) > 0)
{
@@ -795,7 +795,7 @@
@@ -784,7 +784,7 @@
protected void drawSlot(int entryID, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
{
EntityList.EntityEggInfo entitylist$entityegginfo = (EntityList.EntityEggInfo)this.field_148222_l.get(entryID);

8
patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
+++ ../src-work/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
@@ -176,8 +176,11 @@
@@ -175,8 +175,11 @@
GlStateManager.translate(0.0F, 0.0F, 32.0F);
this.zLevel = 200.0F;
this.itemRender.zLevel = 200.0F;
@ -13,7 +13,7 @@
this.zLevel = 0.0F;
this.itemRender.zLevel = 0.0F;
}
@@ -240,13 +243,12 @@
@@ -239,13 +242,12 @@
if (itemstack == null)
{
@ -30,7 +30,7 @@
this.drawTexturedModalRect(i, j, textureatlassprite, 16, 16);
GlStateManager.enableLighting();
flag1 = true;
@@ -464,6 +466,7 @@
@@ -463,6 +465,7 @@
protected void mouseReleased(int mouseX, int mouseY, int state)
{
@ -38,7 +38,7 @@
Slot slot = this.getSlotAtPosition(mouseX, mouseY);
int i = this.guiLeft;
int j = this.guiTop;
@@ -686,4 +689,16 @@
@@ -685,4 +688,16 @@
this.mc.thePlayer.closeScreen();
}
}

36
patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
View File

@ -1,15 +1,15 @@
--- ../src-base/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
+++ ../src-work/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
@@ -49,6 +49,8 @@
@@ -48,6 +48,8 @@
private Slot field_147064_C;
private boolean field_147057_D;
private CreativeCrafting field_147059_E;
private static final String __OBFID = "CL_00000752";
+ private static int tabPage = 0;
+ private int maxPages = 0;
public GuiContainerCreative(EntityPlayer p_i1088_1_)
{
@@ -176,7 +178,7 @@
@@ -175,7 +177,7 @@
return;
}
@ -18,7 +18,7 @@
{
if (clickedButton == 0)
{
@@ -260,6 +262,13 @@
@@ -259,6 +261,13 @@
this.setCurrentCreativeTab(CreativeTabs.creativeTabArray[i]);
this.field_147059_E = new CreativeCrafting(this.mc);
this.mc.thePlayer.inventoryContainer.addCraftingToCrafters(this.field_147059_E);
@ -32,7 +32,7 @@
}
else
{
@@ -281,7 +290,7 @@
@@ -280,7 +289,7 @@
protected void keyTyped(char typedChar, int keyCode) throws IOException
{
@ -41,7 +41,7 @@
{
if (GameSettings.isKeyDown(this.mc.gameSettings.keyBindChat))
{
@@ -319,6 +328,14 @@
@@ -318,6 +327,14 @@
GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.inventorySlots;
guicontainercreative$containercreative.itemList.clear();
@ -56,7 +56,7 @@
for (Item item : Item.itemRegistry)
{
if (item != null && item.getCreativeTab() != null)
@@ -326,7 +343,13 @@
@@ -325,7 +342,13 @@
item.getSubItems(item, (CreativeTabs)null, guicontainercreative$containercreative.itemList);
}
}
@ -70,7 +70,7 @@
for (Enchantment enchantment : Enchantment.enchantmentsBookList)
{
if (enchantment != null && enchantment.type != null)
@@ -334,7 +357,6 @@
@@ -333,7 +356,6 @@
Items.enchanted_book.getAll(enchantment, guicontainercreative$containercreative.itemList);
}
}
@ -78,7 +78,7 @@
Iterator<ItemStack> iterator = guicontainercreative$containercreative.itemList.iterator();
String s1 = this.searchField.getText().toLowerCase();
@@ -366,7 +388,7 @@
@@ -365,7 +387,7 @@
{
CreativeTabs creativetabs = CreativeTabs.creativeTabArray[selectedTabIndex];
@ -87,7 +87,7 @@
{
GlStateManager.disableBlend();
this.fontRendererObj.drawString(I18n.format(creativetabs.getTranslatedTabLabel(), new Object[0]), 8, 6, 4210752);
@@ -401,7 +423,7 @@
@@ -400,7 +422,7 @@
for (CreativeTabs creativetabs : CreativeTabs.creativeTabArray)
{
@ -96,7 +96,7 @@
{
this.setCurrentCreativeTab(creativetabs);
return;
@@ -414,11 +436,13 @@
@@ -413,11 +435,13 @@
private boolean needsScrollBars()
{
@ -110,7 +110,7 @@
int i = selectedTabIndex;
selectedTabIndex = p_147050_1_.getTabIndex();
GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.inventorySlots;
@@ -484,12 +508,14 @@
@@ -483,12 +507,14 @@
if (this.searchField != null)
{
@ -126,7 +126,7 @@
this.updateCreativeSearch();
}
else
@@ -559,20 +585,43 @@
@@ -558,20 +584,43 @@
}
super.drawScreen(mouseX, mouseY, partialTicks);
@ -171,7 +171,7 @@
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.disableLighting();
}
@@ -634,16 +683,35 @@
@@ -633,16 +682,35 @@
RenderHelper.enableGUIStandardItemLighting();
CreativeTabs creativetabs = CreativeTabs.creativeTabArray[selectedTabIndex];
@ -208,7 +208,7 @@
this.mc.getTextureManager().bindTexture(new ResourceLocation("textures/gui/container/creative_inventory/tab_" + creativetabs.getBackgroundImageName()));
this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
this.searchField.drawTextBox();
@@ -658,6 +726,14 @@
@@ -657,6 +725,14 @@
this.drawTexturedModalRect(i, j + (int)((float)(k - j - 17) * this.currentScroll), 232 + (this.needsScrollBars() ? 0 : 12), 0, 12, 15);
}
@ -223,7 +223,7 @@
this.func_147051_a(creativetabs);
if (creativetabs == CreativeTabs.tabInventory)
@@ -668,6 +744,14 @@
@@ -667,6 +743,14 @@
protected boolean func_147049_a(CreativeTabs p_147049_1_, int p_147049_2_, int p_147049_3_)
{
@ -238,7 +238,7 @@
int i = p_147049_1_.getTabColumn();
int j = 28 * i;
int k = 0;
@@ -764,6 +848,8 @@
@@ -763,6 +847,8 @@
}
GlStateManager.disableLighting();
@ -247,7 +247,7 @@
this.drawTexturedModalRect(l, i1, j, k, 28, j1);
this.zLevel = 100.0F;
this.itemRender.zLevel = 100.0F;
@@ -790,6 +876,15 @@
@@ -789,6 +875,15 @@
{
this.mc.displayGuiScreen(new GuiStats(this, this.mc.thePlayer.getStatFileWriter()));
}

2
patches/minecraft/net/minecraft/client/model/ModelBox.java.patch
View File

@ -8,7 +8,7 @@
public class ModelBox
{
private PositionTextureVertex[] vertexPositions;
@@ -82,6 +81,7 @@
@@ -81,6 +80,7 @@
}
}

8
patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch
View File

@ -8,7 +8,7 @@
public class ModelRenderer
{
public float textureWidth;
@@ -110,6 +109,7 @@
@@ -109,6 +108,7 @@
this.rotationPointZ = p_78793_3_;
}
@ -16,7 +16,7 @@
public void render(float p_78785_1_)
{
if (!this.isHidden)
@@ -191,6 +191,7 @@
@@ -190,6 +190,7 @@
}
}
@ -24,7 +24,7 @@
public void renderWithRotation(float p_78791_1_)
{
if (!this.isHidden)
@@ -226,6 +227,7 @@
@@ -225,6 +226,7 @@
}
}
@ -32,7 +32,7 @@
public void postRender(float p_78794_1_)
{
if (!this.isHidden)
@@ -267,6 +269,7 @@
@@ -266,6 +268,7 @@
}
}

2
patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
@@ -56,6 +56,7 @@
@@ -55,6 +55,7 @@
Chunk chunk = new Chunk(this.worldObj, p_73158_1_, p_73158_2_);
this.chunkMapping.add(ChunkCoordIntPair.chunkXZ2Int(p_73158_1_, p_73158_2_), chunk);
this.chunkListing.add(chunk);

2
patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
@@ -69,7 +69,7 @@
@@ -67,7 +67,7 @@
inetaddress = InetAddress.getByName(ip);
GuiConnecting.this.networkManager = NetworkManager.func_181124_a(inetaddress, port, GuiConnecting.this.mc.gameSettings.func_181148_f());
GuiConnecting.this.networkManager.setNetHandler(new NetHandlerLoginClient(GuiConnecting.this.networkManager, GuiConnecting.this.mc, GuiConnecting.this.previousGuiScreen));

10
patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
@@ -112,6 +112,12 @@
@@ -111,6 +111,12 @@
}
}
@ -13,7 +13,7 @@
if (this.currentGameType.isCreative() && this.mc.thePlayer.getHeldItem() != null && this.mc.thePlayer.getHeldItem().getItem() instanceof ItemSword)
{
return false;
@@ -129,7 +135,7 @@
@@ -128,7 +134,7 @@
else
{
world.playAuxSFX(2001, pos, Block.getStateId(iblockstate));
@ -22,7 +22,7 @@
if (flag)
{
@@ -357,11 +363,19 @@
@@ -356,11 +362,19 @@
{
if (this.currentGameType != WorldSettings.GameType.SPECTATOR)
{
@ -44,7 +44,7 @@
}
if (!flag && p_178890_3_ != null && p_178890_3_.getItem() instanceof ItemBlock)
@@ -394,7 +408,9 @@
@@ -393,7 +407,9 @@
}
else
{
@ -55,7 +55,7 @@
}
}
else
@@ -421,9 +437,10 @@
@@ -420,9 +436,10 @@
{
playerIn.inventory.mainInventory[playerIn.inventory.currentItem] = itemstack;

2
patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/multiplayer/WorldClient.java
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/WorldClient.java
@@ -53,12 +53,13 @@
@@ -52,12 +52,13 @@
super(new SaveHandlerMP(), new WorldInfo(p_i45063_2_, "MpServer"), WorldProvider.getProviderForDimension(p_i45063_3_), p_i45063_5_, true);
this.sendQueue = p_i45063_1_;
this.getWorldInfo().setDifficulty(p_i45063_4_);

2
patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java
@@ -24,6 +24,7 @@
@@ -23,6 +23,7 @@
public void processHandshake(C00Handshake packetIn)
{

2
patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
@@ -106,7 +106,10 @@
@@ -104,7 +104,10 @@
{
this.gameProfile = packetIn.getProfile();
this.networkManager.setConnectionState(EnumConnectionState.PLAY);

10
patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
@@ -247,7 +247,7 @@
@@ -246,7 +246,7 @@
{
PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.gameController);
this.gameController.playerController = new PlayerControllerMP(this.gameController, this);
@ -9,7 +9,7 @@
this.gameController.gameSettings.difficulty = packetIn.getDifficulty();
this.gameController.loadWorld(this.clientWorldController);
this.gameController.thePlayer.dimension = packetIn.getDimension();
@@ -751,14 +751,16 @@
@@ -750,14 +750,16 @@
public void handleChat(S02PacketChat packetIn)
{
PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.gameController);
@ -28,7 +28,7 @@
}
}
@@ -809,6 +811,11 @@
@@ -808,6 +810,11 @@
float f = (float)(packetIn.func_149028_l() * 360) / 256.0F;
float f1 = (float)(packetIn.func_149030_m() * 360) / 256.0F;
EntityLivingBase entitylivingbase = (EntityLivingBase)EntityList.createEntityByID(packetIn.func_149025_e(), this.gameController.theWorld);
@ -40,7 +40,7 @@
entitylivingbase.serverPosX = packetIn.func_149023_f();
entitylivingbase.serverPosY = packetIn.func_149034_g();
entitylivingbase.serverPosZ = packetIn.func_149029_h();
@@ -1134,6 +1141,10 @@
@@ -1133,6 +1140,10 @@
{
tileentity.readFromNBT(packetIn.getNbtCompound());
}
@ -51,7 +51,7 @@
}
}
@@ -1342,7 +1353,7 @@
@@ -1341,7 +1352,7 @@
if (entity instanceof EntityLivingBase)
{

2
patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/network/OldServerPinger.java
+++ ../src-work/minecraft/net/minecraft/client/network/OldServerPinger.java
@@ -152,6 +152,7 @@
@@ -150,6 +150,7 @@
server.setBase64EncodedIconData((String)null);
}

6
patches/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/particle/EffectRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/particle/EffectRenderer.java
@@ -134,6 +134,7 @@
@@ -133,6 +133,7 @@
public void addEffect(EntityFX p_78873_1_)
{
@ -8,7 +8,7 @@
int i = p_78873_1_.getFXLayer();
int j = p_78873_1_.func_174838_j() != 1.0F ? 0 : 1;
@@ -356,7 +357,7 @@
@@ -351,7 +352,7 @@
public void func_180533_a(BlockPos p_180533_1_, IBlockState p_180533_2_)
{
@ -17,7 +17,7 @@
{
p_180533_2_ = p_180533_2_.getBlock().getActualState(p_180533_2_, this.worldObj, p_180533_1_);
int i = 4;
@@ -462,4 +463,13 @@
@@ -457,4 +458,13 @@
return "" + i;
}

2
patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java
@@ -536,8 +536,19 @@
@@ -533,8 +533,19 @@
@SideOnly(Side.CLIENT)
public static enum EnumNeighborInfo
{

2
patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/BlockModelShapes.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/BlockModelShapes.java
@@ -317,5 +317,6 @@
@@ -309,5 +309,6 @@
return new ModelResourceLocation(s + "_double_slab", s1);
}
});

6
patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.java.patch
View File

@ -8,8 +8,8 @@
+ private final BlockModelRenderer blockModelRenderer = new net.minecraftforge.client.model.pipeline.ForgeBlockModelRenderer();
private final ChestRenderer chestRenderer = new ChestRenderer();
private final BlockFluidRenderer fluidRenderer = new BlockFluidRenderer();
private static final String __OBFID = "CL_00002520";
@@ -49,6 +49,24 @@
@@ -48,6 +48,24 @@
{
p_175020_1_ = block.getActualState(p_175020_1_, p_175020_4_, p_175020_2_);
IBakedModel ibakedmodel = this.blockModelShapes.getModelForState(p_175020_1_);
@ -34,7 +34,7 @@
IBakedModel ibakedmodel1 = (new SimpleBakedModel.Builder(ibakedmodel, p_175020_3_)).makeBakedModel();
this.blockModelRenderer.renderModel(p_175020_4_, ibakedmodel1, p_175020_1_, p_175020_2_, Tessellator.getInstance().getWorldRenderer());
}
@@ -129,6 +147,12 @@
@@ -128,6 +146,12 @@
ibakedmodel = ((WeightedBakedModel)ibakedmodel).getAlternativeModel(MathHelper.getPositionRandom(p_175022_3_));
}

28
patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/EntityRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/EntityRenderer.java
@@ -423,7 +423,7 @@
@@ -419,7 +419,7 @@
if (d3 < d2 || d2 == 0.0D)
{
@ -9,7 +9,7 @@
{
if (d2 == 0.0D)
{
@@ -580,14 +580,8 @@
@@ -576,14 +576,8 @@
{
BlockPos blockpos = new BlockPos(entity);
IBlockState iblockstate = this.mc.theWorld.getBlockState(blockpos);
@ -25,7 +25,7 @@
GlStateManager.rotate(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * p_78467_1_ + 180.0F, 0.0F, -1.0F, 0.0F);
GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * p_78467_1_, -1.0F, 0.0F, 0.0F);
}
@@ -654,17 +648,20 @@
@@ -650,17 +644,20 @@
if (!this.mc.gameSettings.debugCamEnable)
{
@ -53,7 +53,7 @@
}
GlStateManager.translate(0.0F, -f, 0.0F);
@@ -1107,7 +1104,7 @@
@@ -1103,7 +1100,7 @@
try
{
@ -62,7 +62,7 @@
}
catch (Throwable throwable)
{
@@ -1171,7 +1168,7 @@
@@ -1164,7 +1161,7 @@
if (this.mc.playerController.getCurrentGameType() == WorldSettings.GameType.SPECTATOR)
{
@ -71,7 +71,7 @@
}
else
{
@@ -1321,7 +1318,9 @@
@@ -1314,7 +1311,9 @@
GlStateManager.pushMatrix();
RenderHelper.enableStandardItemLighting();
this.mc.mcProfiler.endStartSection("entities");
@ -81,7 +81,7 @@
RenderHelper.disableStandardItemLighting();
this.disableLightmap();
GlStateManager.matrixMode(5888);
@@ -1333,6 +1332,7 @@
@@ -1326,6 +1325,7 @@
EntityPlayer entityplayer = (EntityPlayer)entity;
GlStateManager.disableAlpha();
this.mc.mcProfiler.endStartSection("outline");
@ -89,7 +89,7 @@
renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, partialTicks);
GlStateManager.enableAlpha();
}
@@ -1346,6 +1346,7 @@
@@ -1339,6 +1339,7 @@
EntityPlayer entityplayer1 = (EntityPlayer)entity;
GlStateManager.disableAlpha();
this.mc.mcProfiler.endStartSection("outline");
@ -97,7 +97,7 @@
renderglobal.drawSelectionBox(entityplayer1, this.mc.objectMouseOver, 0, partialTicks);
GlStateManager.enableAlpha();
}
@@ -1387,6 +1388,15 @@
@@ -1380,6 +1381,15 @@
GlStateManager.shadeModel(7425);
this.mc.mcProfiler.endStartSection("translucent");
renderglobal.renderBlockLayer(EnumWorldBlockLayer.TRANSLUCENT, (double)partialTicks, pass, entity);
@ -113,7 +113,7 @@
GlStateManager.shadeModel(7424);
GlStateManager.depthMask(true);
GlStateManager.enableCull();
@@ -1399,8 +1409,12 @@
@@ -1392,8 +1402,12 @@
this.renderCloudsCheck(renderglobal, partialTicks, pass);
}
@ -126,7 +126,7 @@
if (this.renderHand)
{
GlStateManager.clear(256);
@@ -1512,6 +1526,13 @@
@@ -1505,6 +1519,13 @@
protected void renderRainSnow(float partialTicks)
{
@ -140,7 +140,7 @@
float f = this.mc.theWorld.getRainStrength(partialTicks);
if (f > 0.0F)
@@ -1837,6 +1858,13 @@
@@ -1830,6 +1851,13 @@
this.fogColorBlue = f7;
}
@ -154,7 +154,7 @@
GlStateManager.clearColor(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 0.0F);
}
@@ -1855,6 +1883,10 @@
@@ -1848,6 +1876,10 @@
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
Block block = ActiveRenderInfo.getBlockAtEntityViewpoint(this.mc.theWorld, entity, partialTicks);
@ -165,7 +165,7 @@
if (entity instanceof EntityLivingBase && ((EntityLivingBase)entity).isPotionActive(Potion.blindness))
{
float f1 = 5.0F;
@@ -1932,6 +1964,7 @@
@@ -1925,6 +1957,7 @@
GlStateManager.setFogStart(f * 0.05F);
GlStateManager.setFogEnd(Math.min(f, 192.0F) * 0.5F);
}

2
patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java
@@ -81,6 +81,8 @@
@@ -80,6 +80,8 @@
this.drawTexturedModalRect(i + 6, j + 7, 0 + i1 % 8 * 18, 198 + i1 / 8 * 18, 18, 18);
}

2
patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/ItemModelMesher.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/ItemModelMesher.java
@@ -51,6 +51,11 @@
@@ -50,6 +50,11 @@
}
}

10
patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/ItemRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/ItemRenderer.java
@@ -314,7 +314,7 @@
@@ -313,7 +313,7 @@
if (this.itemToRender != null)
{
@ -9,7 +9,7 @@
{
this.func_178097_a(abstractclientplayer, f2, f, f1);
}
@@ -366,6 +366,7 @@
@@ -365,6 +365,7 @@
if (this.mc.thePlayer.isEntityInsideOpaqueBlock())
{
IBlockState iblockstate = this.mc.theWorld.getBlockState(new BlockPos(this.mc.thePlayer));
@ -17,7 +17,7 @@
EntityPlayer entityplayer = this.mc.thePlayer;
for (int i = 0; i < 8; ++i)
@@ -379,11 +380,13 @@
@@ -378,11 +379,13 @@
if (iblockstate1.getBlock().isVisuallyOpaque())
{
iblockstate = iblockstate1;
@ -31,7 +31,7 @@
this.func_178108_a(p_78447_1_, this.mc.getBlockRendererDispatcher().getBlockModelShapes().getTexture(iblockstate));
}
}
@@ -392,11 +395,13 @@
@@ -391,11 +394,13 @@
{
if (this.mc.thePlayer.isInsideOfMaterial(Material.water))
{
@ -45,7 +45,7 @@
this.renderFireInFirstPerson(p_78447_1_);
}
}
@@ -513,6 +518,12 @@
@@ -512,6 +517,12 @@
{
if (!this.itemToRender.getIsItemStackEqual(itemstack))
{

6
patches/minecraft/net/minecraft/client/renderer/OpenGlHelper.java.patch
View File

@ -1,8 +1,8 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/OpenGlHelper.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/OpenGlHelper.java
@@ -84,6 +84,10 @@
@@ -83,6 +83,10 @@
public static int GL_ARRAY_BUFFER;
public static int GL_STATIC_DRAW;
private static final String __OBFID = "CL_00001179";
+ /* Stores the last values sent into setLightmapTextureCoords */
+ public static float lastBrightnessX = 0.0f;
@ -11,7 +11,7 @@
public static void initializeTextures()
{
ContextCapabilities contextcapabilities = GLContext.getCapabilities();
@@ -844,6 +848,12 @@
@@ -843,6 +847,12 @@
{
GL13.glMultiTexCoord2f(p_77475_0_, p_77475_1_, p_77475_2_);
}

24
patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/RenderGlobal.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/RenderGlobal.java
@@ -526,8 +526,10 @@
@@ -525,8 +525,10 @@
public void renderEntities(Entity p_180446_1_, ICamera p_180446_2_, float partialTicks)
{
@ -11,7 +11,7 @@
--this.renderEntitiesStartupCounter;
}
else
@@ -538,9 +540,12 @@
@@ -537,9 +539,12 @@
this.theWorld.theProfiler.startSection("prepare");
TileEntityRendererDispatcher.instance.cacheActiveRenderInfo(this.theWorld, this.mc.getTextureManager(), this.mc.fontRendererObj, this.mc.getRenderViewEntity(), partialTicks);
this.renderManager.cacheActiveRenderInfo(this.theWorld, this.mc.fontRendererObj, this.mc.getRenderViewEntity(), this.mc.pointedEntity, this.mc.gameSettings, partialTicks);
@ -24,7 +24,7 @@
Entity entity = this.mc.getRenderViewEntity();
double d3 = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * (double)partialTicks;
double d4 = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * (double)partialTicks;
@@ -552,11 +557,15 @@
@@ -551,11 +556,15 @@
this.mc.entityRenderer.enableLightmap();
this.theWorld.theProfiler.endStartSection("global");
List<Entity> list = this.theWorld.getLoadedEntityList();
@ -40,7 +40,7 @@
++this.countEntitiesRendered;
if (entity1.isInRangeToRender3d(d0, d1, d2))
@@ -578,6 +587,7 @@
@@ -577,6 +586,7 @@
for (int j = 0; j < list.size(); ++j)
{
Entity entity3 = (Entity)list.get(j);
@ -48,7 +48,7 @@
boolean flag = this.mc.getRenderViewEntity() instanceof EntityLivingBase && ((EntityLivingBase)this.mc.getRenderViewEntity()).isPlayerSleeping();
boolean flag1 = entity3.isInRangeToRender3d(d0, d1, d2) && (entity3.ignoreFrustumCheck || p_180446_2_.isBoundingBoxInFrustum(entity3.getEntityBoundingBox()) || entity3.riddenByEntity == this.mc.thePlayer) && entity3 instanceof EntityPlayer;
@@ -627,6 +637,7 @@
@@ -626,6 +636,7 @@
}
entity2 = (Entity)iterator.next();
@ -56,7 +56,7 @@
flag2 = this.renderManager.shouldRender(entity2, p_180446_2_, d0, d1, d2) || entity2.riddenByEntity == this.mc.thePlayer;
if (!flag2)
@@ -663,6 +674,7 @@
@@ -662,6 +673,7 @@
{
for (TileEntity tileentity2 : list1)
{
@ -64,7 +64,7 @@
TileEntityRendererDispatcher.instance.renderTileEntity(tileentity2, partialTicks, -1);
}
}
@@ -672,6 +684,7 @@
@@ -671,6 +683,7 @@
{
for (TileEntity tileentity : this.field_181024_n)
{
@ -72,7 +72,7 @@
TileEntityRendererDispatcher.instance.renderTileEntity(tileentity, partialTicks, -1);
}
}
@@ -701,7 +714,7 @@
@@ -700,7 +713,7 @@
Block block = this.theWorld.getBlockState(blockpos).getBlock();
@ -81,7 +81,7 @@
{
TileEntityRendererDispatcher.instance.renderTileEntity(tileentity1, partialTicks, destroyblockprogress.getPartialBlockDamage());
}
@@ -1162,6 +1175,12 @@
@@ -1161,6 +1174,12 @@
public void renderSky(float partialTicks, int pass)
{
@ -94,7 +94,7 @@
if (this.mc.theWorld.provider.getDimensionId() == 1)
{
this.renderSkyEnd();
@@ -1379,6 +1398,12 @@
@@ -1378,6 +1397,12 @@
public void renderClouds(float p_180447_1_, int p_180447_2_)
{
@ -107,7 +107,7 @@
if (this.mc.theWorld.provider.isSurfaceWorld())
{
if (this.mc.gameSettings.func_181147_e() == 2)
@@ -1794,8 +1819,11 @@
@@ -1793,8 +1818,11 @@
double d4 = (double)blockpos.getY() - d1;
double d5 = (double)blockpos.getZ() - d2;
Block block = this.theWorld.getBlockState(blockpos).getBlock();
@ -120,7 +120,7 @@
{
if (d3 * d3 + d4 * d4 + d5 * d5 > 1024.0D)
{
@@ -1950,13 +1978,16 @@
@@ -1949,13 +1977,16 @@
if (recordName != null)
{
ItemRecord itemrecord = ItemRecord.getRecord(recordName);

2
patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/WorldRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/WorldRenderer.java
@@ -580,6 +580,11 @@
@@ -578,6 +578,11 @@
}
}

4
patches/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java
@@ -25,32 +25,9 @@
@@ -23,32 +23,9 @@
for (int j = 0; j < list.size(); ++j)
{
@ -35,7 +35,7 @@
}
GL11.glDrawArrays(p_181679_1_.getDrawMode(), 0, p_181679_1_.getVertexCount());
@@ -59,26 +36,8 @@
@@ -57,26 +34,8 @@
for (int j1 = list.size(); i1 < j1; ++i1)
{
VertexFormatElement vertexformatelement1 = (VertexFormatElement)list.get(i1);

8
patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java
@@ -21,6 +21,11 @@
@@ -20,6 +20,11 @@
public BakedQuad makeBakedQuad(Vector3f posFrom, Vector3f posTo, BlockPartFace face, TextureAtlasSprite sprite, EnumFacing facing, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade)
{
@ -12,7 +12,7 @@
int[] aint = this.makeQuadVertexData(face, sprite, facing, this.getPositionsDiv16(posFrom, posTo), modelRotationIn, partRotation, uvLocked, shade);
EnumFacing enumfacing = getFacingFromVertexData(aint);
@@ -34,11 +39,17 @@
@@ -33,11 +38,17 @@
this.func_178408_a(aint, enumfacing);
}
@ -30,7 +30,7 @@
int[] aint = new int[28];
for (int i = 0; i < 4; ++i)
@@ -89,7 +100,12 @@
@@ -88,7 +99,12 @@
private void fillVertexData(int[] faceData, int vertexIndex, EnumFacing facing, BlockPartFace partFace, float[] p_178402_5_, TextureAtlasSprite sprite, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade)
{
@ -44,7 +44,7 @@
int i = shade ? this.getFaceShadeColor(enumfacing) : -1;
EnumFaceDirection.VertexInformation enumfacedirection$vertexinformation = EnumFaceDirection.getFacing(facing).func_179025_a(vertexIndex);
Vector3f vector3f = new Vector3f(p_178402_5_[enumfacedirection$vertexinformation.field_179184_a], p_178402_5_[enumfacedirection$vertexinformation.field_179182_b], p_178402_5_[enumfacedirection$vertexinformation.field_179183_c]);
@@ -155,14 +171,19 @@
@@ -154,14 +170,19 @@
public int rotateVertex(Vector3f position, EnumFacing facing, int vertexIndex, ModelRotation modelRotationIn, boolean uvLocked)
{

Some files were not shown because too many files have changed in this diff Show More