Dereku/minecraft_server-b1.7.3
0
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Reformat code

Browse source
This commit is contained in:
Dereku 2026-01-30 02:26:17 +07:00
parent ee3d133a31
commit 3b140b91c9
432 changed files with 33958 additions and 34058 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/net/minecraft/achievement/Achievement.java
View file

@ -28,19 +28,19 @@ public class Achievement extends StatBase<Achievement> {
this.field_27063_l = StatCollector.translateToLocal("achievement." + var2 + ".desc"); this.field_27063_l = StatCollector.translateToLocal("achievement." + var2 + ".desc");
this.field_25067_a = var3; this.field_25067_a = var3;
this.field_27991_b = var4; this.field_27991_b = var4;
if(var3 < AchievementList.field_27114_a) { if (var3 < AchievementList.field_27114_a) {
AchievementList.field_27114_a = var3; AchievementList.field_27114_a = var3;
} }
if(var4 < AchievementList.field_27113_b) { if (var4 < AchievementList.field_27113_b) {
AchievementList.field_27113_b = var4; AchievementList.field_27113_b = var4;
} }
if(var3 > AchievementList.field_27112_c) { if (var3 > AchievementList.field_27112_c) {
AchievementList.field_27112_c = var3; AchievementList.field_27112_c = var3;
} }
if(var4 > AchievementList.field_27111_d) { if (var4 > AchievementList.field_27111_d) {
AchievementList.field_27111_d = var4; AchievementList.field_27111_d = var4;
} }

7
src/net/minecraft/achievement/AchievementList.java
View file

@ -1,9 +1,10 @@
package net.minecraft.achievement; package net.minecraft.achievement;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
public class AchievementList { public class AchievementList {
public static int field_27114_a; public static int field_27114_a;
@ -11,7 +12,7 @@ public class AchievementList {
public static int field_27112_c; public static int field_27112_c;
public static int field_27111_d; public static int field_27111_d;
public static List field_25129_a = new ArrayList(); public static List field_25129_a = new ArrayList();
public static Achievement field_25128_b = (new Achievement(0, "openInventory", 0, 0, Item.book, (Achievement)null)).func_27052_e().func_27053_d(); public static Achievement field_25128_b = (new Achievement(0, "openInventory", 0, 0, Item.book, (Achievement) null)).func_27052_e().func_27053_d();
public static Achievement field_25131_c = (new Achievement(1, "mineWood", 2, 1, Block.wood, field_25128_b)).func_27053_d(); public static Achievement field_25131_c = (new Achievement(1, "mineWood", 2, 1, Block.wood, field_25128_b)).func_27053_d();
public static Achievement field_25130_d = (new Achievement(2, "buildWorkBench", 4, -1, Block.workbench, field_25131_c)).func_27053_d(); public static Achievement field_25130_d = (new Achievement(2, "buildWorkBench", 4, -1, Block.workbench, field_25131_c)).func_27053_d();
public static Achievement field_27110_i = (new Achievement(3, "buildPickaxe", 4, 2, Item.pickaxeWood, field_25130_d)).func_27053_d(); public static Achievement field_27110_i = (new Achievement(3, "buildPickaxe", 4, 2, Item.pickaxeWood, field_25130_d)).func_27053_d();

6
src/net/minecraft/achievement/AchievementMap.java
View file

@ -13,9 +13,9 @@ public class AchievementMap {
try { try {
BufferedReader var1 = new BufferedReader(new InputStreamReader(AchievementMap.class.getResourceAsStream("/achievement/map.txt"))); BufferedReader var1 = new BufferedReader(new InputStreamReader(AchievementMap.class.getResourceAsStream("/achievement/map.txt")));
while(true) { while (true) {
String var2 = var1.readLine(); String var2 = var1.readLine();
if(var2 == null) { if (var2 == null) {
var1.close(); var1.close();
break; break;
} }
@ -31,6 +31,6 @@ public class AchievementMap {
} }
public static String func_25132_a(int var0) { public static String func_25132_a(int var0) {
return (String)field_25134_a.field_25133_b.get(Integer.valueOf(var0)); return (String) field_25134_a.field_25133_b.get(Integer.valueOf(var0));
} }
} }

130
src/net/minecraft/block/Block.java
View file

@ -1,25 +1,12 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.ArrayList;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.stepsound.StepSound; import net.minecraft.block.stepsound.StepSound;
import net.minecraft.block.stepsound.StepSoundSand; import net.minecraft.block.stepsound.StepSoundSand;
import net.minecraft.block.stepsound.StepSoundStone; import net.minecraft.block.stepsound.StepSoundStone;
import net.minecraft.block.tile.TileEntitySign; import net.minecraft.block.tile.TileEntitySign;
import net.minecraft.entity.Entity; import net.minecraft.entity.*;
import net.minecraft.entity.EntityItem; import net.minecraft.item.*;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityPlayer;
import net.minecraft.entity.EnumMobType;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemCloth;
import net.minecraft.item.ItemLeaves;
import net.minecraft.item.ItemLog;
import net.minecraft.item.ItemPiston;
import net.minecraft.item.ItemSapling;
import net.minecraft.item.ItemSlab;
import net.minecraft.item.crafting.ItemStack; import net.minecraft.item.crafting.ItemStack;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.math.Vec3D; import net.minecraft.math.Vec3D;
@ -29,6 +16,9 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.Random;
public class Block { public class Block {
public static final StepSound soundPowderFootstep = new StepSound("stone", 1.0F, 1.0F); public static final StepSound soundPowderFootstep = new StepSound("stone", 1.0F, 1.0F);
public static final StepSound soundWoodFootstep = new StepSound("wood", 1.0F, 1.0F); public static final StepSound soundWoodFootstep = new StepSound("wood", 1.0F, 1.0F);
@ -48,7 +38,7 @@ public class Block {
public static final int[] lightValue = new int[256]; public static final int[] lightValue = new int[256];
public static final boolean[] requiresSelfNotify = new boolean[256]; public static final boolean[] requiresSelfNotify = new boolean[256];
public static final Block stone = (new BlockStone(1, 1)).setHardness(1.5F).setResistance(10.0F).setStepSound(soundStoneFootstep).setBlockName("stone"); public static final Block stone = (new BlockStone(1, 1)).setHardness(1.5F).setResistance(10.0F).setStepSound(soundStoneFootstep).setBlockName("stone");
public static final BlockGrass grass = (BlockGrass)(new BlockGrass(2)).setHardness(0.6F).setStepSound(soundGrassFootstep).setBlockName("grass"); public static final BlockGrass grass = (BlockGrass) (new BlockGrass(2)).setHardness(0.6F).setStepSound(soundGrassFootstep).setBlockName("grass");
public static final Block dirt = (new BlockDirt(3, 2)).setHardness(0.5F).setStepSound(soundGravelFootstep).setBlockName("dirt"); public static final Block dirt = (new BlockDirt(3, 2)).setHardness(0.5F).setStepSound(soundGravelFootstep).setBlockName("dirt");
public static final Block cobblestone = (new Block(4, 16, Material.rock)).setHardness(2.0F).setResistance(10.0F).setStepSound(soundStoneFootstep).setBlockName("stonebrick"); public static final Block cobblestone = (new Block(4, 16, Material.rock)).setHardness(2.0F).setResistance(10.0F).setStepSound(soundStoneFootstep).setBlockName("stonebrick");
public static final Block planks = (new Block(5, 4, Material.wood)).setHardness(2.0F).setResistance(5.0F).setStepSound(soundWoodFootstep).setBlockName("wood").setRequiresSelfNotify(); public static final Block planks = (new Block(5, 4, Material.wood)).setHardness(2.0F).setResistance(5.0F).setStepSound(soundWoodFootstep).setBlockName("wood").setRequiresSelfNotify();
@ -64,7 +54,7 @@ public class Block {
public static final Block oreIron = (new BlockOre(15, 33)).setHardness(3.0F).setResistance(5.0F).setStepSound(soundStoneFootstep).setBlockName("oreIron"); public static final Block oreIron = (new BlockOre(15, 33)).setHardness(3.0F).setResistance(5.0F).setStepSound(soundStoneFootstep).setBlockName("oreIron");
public static final Block oreCoal = (new BlockOre(16, 34)).setHardness(3.0F).setResistance(5.0F).setStepSound(soundStoneFootstep).setBlockName("oreCoal"); public static final Block oreCoal = (new BlockOre(16, 34)).setHardness(3.0F).setResistance(5.0F).setStepSound(soundStoneFootstep).setBlockName("oreCoal");
public static final Block wood = (new BlockLog(17)).setHardness(2.0F).setStepSound(soundWoodFootstep).setBlockName("log").setRequiresSelfNotify(); public static final Block wood = (new BlockLog(17)).setHardness(2.0F).setStepSound(soundWoodFootstep).setBlockName("log").setRequiresSelfNotify();
public static final BlockLeaves leaves = (BlockLeaves)(new BlockLeaves(18, 52)).setHardness(0.2F).setLightOpacity(1).setStepSound(soundGrassFootstep).setBlockName("leaves").disableStats().setRequiresSelfNotify(); public static final BlockLeaves leaves = (BlockLeaves) (new BlockLeaves(18, 52)).setHardness(0.2F).setLightOpacity(1).setStepSound(soundGrassFootstep).setBlockName("leaves").disableStats().setRequiresSelfNotify();
public static final Block sponge = (new BlockSponge(19)).setHardness(0.6F).setStepSound(soundGrassFootstep).setBlockName("sponge"); public static final Block sponge = (new BlockSponge(19)).setHardness(0.6F).setStepSound(soundGrassFootstep).setBlockName("sponge");
public static final Block glass = (new BlockGlass(20, 49, Material.glass, false)).setHardness(0.3F).setStepSound(soundGlassFootstep).setBlockName("glass"); public static final Block glass = (new BlockGlass(20, 49, Material.glass, false)).setHardness(0.3F).setStepSound(soundGlassFootstep).setBlockName("glass");
public static final Block oreLapis = (new BlockOre(21, 160)).setHardness(3.0F).setResistance(5.0F).setStepSound(soundStoneFootstep).setBlockName("oreLapis"); public static final Block oreLapis = (new BlockOre(21, 160)).setHardness(3.0F).setResistance(5.0F).setStepSound(soundStoneFootstep).setBlockName("oreLapis");
@ -77,16 +67,16 @@ public class Block {
public static final Block railDetector = (new BlockDetectorRail(28, 195)).setHardness(0.7F).setStepSound(soundMetalFootstep).setBlockName("detectorRail").setRequiresSelfNotify(); public static final Block railDetector = (new BlockDetectorRail(28, 195)).setHardness(0.7F).setStepSound(soundMetalFootstep).setBlockName("detectorRail").setRequiresSelfNotify();
public static final Block pistonStickyBase = (new BlockPistonBase(29, 106, true)).setBlockName("pistonStickyBase").setRequiresSelfNotify(); public static final Block pistonStickyBase = (new BlockPistonBase(29, 106, true)).setBlockName("pistonStickyBase").setRequiresSelfNotify();
public static final Block web = (new BlockWeb(30, 11)).setLightOpacity(1).setHardness(4.0F).setBlockName("web"); public static final Block web = (new BlockWeb(30, 11)).setLightOpacity(1).setHardness(4.0F).setBlockName("web");
public static final BlockTallGrass tallGrass = (BlockTallGrass)(new BlockTallGrass(31, 39)).setHardness(0.0F).setStepSound(soundGrassFootstep).setBlockName("tallgrass"); public static final BlockTallGrass tallGrass = (BlockTallGrass) (new BlockTallGrass(31, 39)).setHardness(0.0F).setStepSound(soundGrassFootstep).setBlockName("tallgrass");
public static final BlockDeadBush deadBush = (BlockDeadBush)(new BlockDeadBush(32, 55)).setHardness(0.0F).setStepSound(soundGrassFootstep).setBlockName("deadbush"); public static final BlockDeadBush deadBush = (BlockDeadBush) (new BlockDeadBush(32, 55)).setHardness(0.0F).setStepSound(soundGrassFootstep).setBlockName("deadbush");
public static final Block pistonBase = (new BlockPistonBase(33, 107, false)).setBlockName("pistonBase").setRequiresSelfNotify(); public static final Block pistonBase = (new BlockPistonBase(33, 107, false)).setBlockName("pistonBase").setRequiresSelfNotify();
public static final BlockPistonExtension pistonExtension = (BlockPistonExtension)(new BlockPistonExtension(34, 107)).setRequiresSelfNotify(); public static final BlockPistonExtension pistonExtension = (BlockPistonExtension) (new BlockPistonExtension(34, 107)).setRequiresSelfNotify();
public static final Block cloth = (new BlockCloth()).setHardness(0.8F).setStepSound(soundClothFootstep).setBlockName("cloth").setRequiresSelfNotify(); public static final Block cloth = (new BlockCloth()).setHardness(0.8F).setStepSound(soundClothFootstep).setBlockName("cloth").setRequiresSelfNotify();
public static final BlockPistonMoving pistonMoving = new BlockPistonMoving(36); public static final BlockPistonMoving pistonMoving = new BlockPistonMoving(36);
public static final BlockFlower plantYellow = (BlockFlower)(new BlockFlower(37, 13)).setHardness(0.0F).setStepSound(soundGrassFootstep).setBlockName("flower"); public static final BlockFlower plantYellow = (BlockFlower) (new BlockFlower(37, 13)).setHardness(0.0F).setStepSound(soundGrassFootstep).setBlockName("flower");
public static final BlockFlower plantRed = (BlockFlower)(new BlockFlower(38, 12)).setHardness(0.0F).setStepSound(soundGrassFootstep).setBlockName("rose"); public static final BlockFlower plantRed = (BlockFlower) (new BlockFlower(38, 12)).setHardness(0.0F).setStepSound(soundGrassFootstep).setBlockName("rose");
public static final BlockFlower mushroomBrown = (BlockFlower)(new BlockMushroom(39, 29)).setHardness(0.0F).setStepSound(soundGrassFootstep).setLightValue(2.0F / 16.0F).setBlockName("mushroom"); public static final BlockFlower mushroomBrown = (BlockFlower) (new BlockMushroom(39, 29)).setHardness(0.0F).setStepSound(soundGrassFootstep).setLightValue(2.0F / 16.0F).setBlockName("mushroom");
public static final BlockFlower mushroomRed = (BlockFlower)(new BlockMushroom(40, 28)).setHardness(0.0F).setStepSound(soundGrassFootstep).setBlockName("mushroom"); public static final BlockFlower mushroomRed = (BlockFlower) (new BlockMushroom(40, 28)).setHardness(0.0F).setStepSound(soundGrassFootstep).setBlockName("mushroom");
public static final Block blockGold = (new BlockOreStorage(41, 23)).setHardness(3.0F).setResistance(10.0F).setStepSound(soundMetalFootstep).setBlockName("blockGold"); public static final Block blockGold = (new BlockOreStorage(41, 23)).setHardness(3.0F).setResistance(10.0F).setStepSound(soundMetalFootstep).setBlockName("blockGold");
public static final Block blockSteel = (new BlockOreStorage(42, 22)).setHardness(5.0F).setResistance(10.0F).setStepSound(soundMetalFootstep).setBlockName("blockIron"); public static final Block blockSteel = (new BlockOreStorage(42, 22)).setHardness(5.0F).setResistance(10.0F).setStepSound(soundMetalFootstep).setBlockName("blockIron");
public static final Block stairDouble = (new BlockStep(43, true)).setHardness(2.0F).setResistance(10.0F).setStepSound(soundStoneFootstep).setBlockName("stoneSlab"); public static final Block stairDouble = (new BlockStep(43, true)).setHardness(2.0F).setResistance(10.0F).setStepSound(soundStoneFootstep).setBlockName("stoneSlab");
@ -97,7 +87,7 @@ public class Block {
public static final Block cobblestoneMossy = (new Block(48, 36, Material.rock)).setHardness(2.0F).setResistance(10.0F).setStepSound(soundStoneFootstep).setBlockName("stoneMoss"); public static final Block cobblestoneMossy = (new Block(48, 36, Material.rock)).setHardness(2.0F).setResistance(10.0F).setStepSound(soundStoneFootstep).setBlockName("stoneMoss");
public static final Block obsidian = (new BlockObsidian(49, 37)).setHardness(10.0F).setResistance(2000.0F).setStepSound(soundStoneFootstep).setBlockName("obsidian"); public static final Block obsidian = (new BlockObsidian(49, 37)).setHardness(10.0F).setResistance(2000.0F).setStepSound(soundStoneFootstep).setBlockName("obsidian");
public static final Block torchWood = (new BlockTorch(50, 80)).setHardness(0.0F).setLightValue(15.0F / 16.0F).setStepSound(soundWoodFootstep).setBlockName("torch").setRequiresSelfNotify(); public static final Block torchWood = (new BlockTorch(50, 80)).setHardness(0.0F).setLightValue(15.0F / 16.0F).setStepSound(soundWoodFootstep).setBlockName("torch").setRequiresSelfNotify();
public static final BlockFire fire = (BlockFire)(new BlockFire(51, 31)).setHardness(0.0F).setLightValue(1.0F).setStepSound(soundWoodFootstep).setBlockName("fire").disableStats().setRequiresSelfNotify(); public static final BlockFire fire = (BlockFire) (new BlockFire(51, 31)).setHardness(0.0F).setLightValue(1.0F).setStepSound(soundWoodFootstep).setBlockName("fire").disableStats().setRequiresSelfNotify();
public static final Block mobSpawner = (new BlockMobSpawner(52, 65)).setHardness(5.0F).setStepSound(soundMetalFootstep).setBlockName("mobSpawner").disableStats(); public static final Block mobSpawner = (new BlockMobSpawner(52, 65)).setHardness(5.0F).setStepSound(soundMetalFootstep).setBlockName("mobSpawner").disableStats();
public static final Block stairCompactPlanks = (new BlockStairs(53, planks)).setBlockName("stairsWood").setRequiresSelfNotify(); public static final Block stairCompactPlanks = (new BlockStairs(53, planks)).setBlockName("stairsWood").setRequiresSelfNotify();
public static final Block chest = (new BlockChest(54)).setHardness(2.5F).setStepSound(soundWoodFootstep).setBlockName("chest").setRequiresSelfNotify(); public static final Block chest = (new BlockChest(54)).setHardness(2.5F).setStepSound(soundWoodFootstep).setBlockName("chest").setRequiresSelfNotify();
@ -136,7 +126,7 @@ public class Block {
public static final Block bloodStone = (new BlockNetherrack(87, 103)).setHardness(0.4F).setStepSound(soundStoneFootstep).setBlockName("hellrock"); public static final Block bloodStone = (new BlockNetherrack(87, 103)).setHardness(0.4F).setStepSound(soundStoneFootstep).setBlockName("hellrock");
public static final Block slowSand = (new BlockSoulSand(88, 104)).setHardness(0.5F).setStepSound(soundSandFootstep).setBlockName("hellsand"); public static final Block slowSand = (new BlockSoulSand(88, 104)).setHardness(0.5F).setStepSound(soundSandFootstep).setBlockName("hellsand");
public static final Block glowStone = (new BlockGlowStone(89, 105, Material.rock)).setHardness(0.3F).setStepSound(soundGlassFootstep).setLightValue(1.0F).setBlockName("lightgem"); public static final Block glowStone = (new BlockGlowStone(89, 105, Material.rock)).setHardness(0.3F).setStepSound(soundGlassFootstep).setLightValue(1.0F).setBlockName("lightgem");
public static final BlockPortal portal = (BlockPortal)(new BlockPortal(90, 14)).setHardness(-1.0F).setStepSound(soundGlassFootstep).setLightValue(12.0F / 16.0F).setBlockName("portal"); public static final BlockPortal portal = (BlockPortal) (new BlockPortal(90, 14)).setHardness(-1.0F).setStepSound(soundGlassFootstep).setLightValue(12.0F / 16.0F).setBlockName("portal");
public static final Block pumpkinLantern = (new BlockPumpkin(91, 102, true)).setHardness(1.0F).setStepSound(soundWoodFootstep).setLightValue(1.0F).setBlockName("litpumpkin").setRequiresSelfNotify(); public static final Block pumpkinLantern = (new BlockPumpkin(91, 102, true)).setHardness(1.0F).setStepSound(soundWoodFootstep).setLightValue(1.0F).setBlockName("litpumpkin").setRequiresSelfNotify();
public static final Block cake = (new BlockCake(92, 121)).setHardness(0.5F).setStepSound(soundClothFootstep).setBlockName("cake").disableStats().setRequiresSelfNotify(); public static final Block cake = (new BlockCake(92, 121)).setHardness(0.5F).setStepSound(soundClothFootstep).setBlockName("cake").disableStats().setRequiresSelfNotify();
public static final Block redstoneRepeaterIdle = (new BlockRedstoneRepeater(93, false)).setHardness(0.0F).setStepSound(soundWoodFootstep).setBlockName("diode").disableStats().setRequiresSelfNotify(); public static final Block redstoneRepeaterIdle = (new BlockRedstoneRepeater(93, false)).setHardness(0.0F).setStepSound(soundWoodFootstep).setBlockName("diode").disableStats().setRequiresSelfNotify();
@ -167,7 +157,7 @@ public class Block {
this.stepSound = soundPowderFootstep; this.stepSound = soundPowderFootstep;
this.blockParticleGravity = 1.0F; this.blockParticleGravity = 1.0F;
this.slipperiness = 0.6F; this.slipperiness = 0.6F;
if(blocksList[var1] != null) { if (blocksList[var1] != null) {
throw new IllegalArgumentException("Slot " + var1 + " is already occupied by " + blocksList[var1] + " when adding " + this); throw new IllegalArgumentException("Slot " + var1 + " is already occupied by " + blocksList[var1] + " when adding " + this);
} else { } else {
this.blockMaterial = var2; this.blockMaterial = var2;
@ -205,7 +195,7 @@ public class Block {
} }
protected Block setLightValue(float var1) { protected Block setLightValue(float var1) {
lightValue[this.blockID] = (int)(15.0F * var1); lightValue[this.blockID] = (int) (15.0F * var1);
return this; return this;
} }
@ -220,7 +210,7 @@ public class Block {
protected Block setHardness(float var1) { protected Block setHardness(float var1) {
this.blockHardness = var1; this.blockHardness = var1;
if(this.blockResistance < var1 * 5.0F) { if (this.blockResistance < var1 * 5.0F) {
this.blockResistance = var1 * 5.0F; this.blockResistance = var1 * 5.0F;
} }
@ -242,12 +232,12 @@ public class Block {
} }
public void setBlockBounds(float var1, float var2, float var3, float var4, float var5, float var6) { public void setBlockBounds(float var1, float var2, float var3, float var4, float var5, float var6) {
this.minX = (double)var1; this.minX = (double) var1;
this.minY = (double)var2; this.minY = (double) var2;
this.minZ = (double)var3; this.minZ = (double) var3;
this.maxX = (double)var4; this.maxX = (double) var4;
this.maxY = (double)var5; this.maxY = (double) var5;
this.maxZ = (double)var6; this.maxZ = (double) var6;
} }
public boolean shouldSideBeRendered(IBlockAccess var1, int var2, int var3, int var4, int var5) { public boolean shouldSideBeRendered(IBlockAccess var1, int var2, int var3, int var4, int var5) {
@ -264,14 +254,14 @@ public class Block {
public void getCollidingBoundingBoxes(World var1, int var2, int var3, int var4, AxisAlignedBB var5, ArrayList var6) { public void getCollidingBoundingBoxes(World var1, int var2, int var3, int var4, AxisAlignedBB var5, ArrayList var6) {
AxisAlignedBB var7 = this.getCollisionBoundingBoxFromPool(var1, var2, var3, var4); AxisAlignedBB var7 = this.getCollisionBoundingBoxFromPool(var1, var2, var3, var4);
if(var7 != null && var5.intersectsWith(var7)) { if (var7 != null && var5.intersectsWith(var7)) {
var6.add(var7); var6.add(var7);
} }
} }
public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) { public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) {
return AxisAlignedBB.getBoundingBoxFromPool((double)var2 + this.minX, (double)var3 + this.minY, (double)var4 + this.minZ, (double)var2 + this.maxX, (double)var3 + this.maxY, (double)var4 + this.maxZ); return AxisAlignedBB.getBoundingBoxFromPool((double) var2 + this.minX, (double) var3 + this.minY, (double) var4 + this.minZ, (double) var2 + this.maxX, (double) var3 + this.maxY, (double) var4 + this.maxZ);
} }
public boolean isOpaqueCube() { public boolean isOpaqueCube() {
@ -322,13 +312,13 @@ public class Block {
} }
public void dropBlockAsItemWithChance(World var1, int var2, int var3, int var4, int var5, float var6) { public void dropBlockAsItemWithChance(World var1, int var2, int var3, int var4, int var5, float var6) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
int var7 = this.quantityDropped(var1.rand); int var7 = this.quantityDropped(var1.rand);
for(int var8 = 0; var8 < var7; ++var8) { for (int var8 = 0; var8 < var7; ++var8) {
if(var1.rand.nextFloat() <= var6) { if (var1.rand.nextFloat() <= var6) {
int var9 = this.idDropped(var5, var1.rand); int var9 = this.idDropped(var5, var1.rand);
if(var9 > 0) { if (var9 > 0) {
this.dropBlockAsItem_do(var1, var2, var3, var4, new ItemStack(var9, 1, this.damageDropped(var5))); this.dropBlockAsItem_do(var1, var2, var3, var4, new ItemStack(var9, 1, this.damageDropped(var5)));
} }
} }
@ -338,12 +328,12 @@ public class Block {
} }
protected void dropBlockAsItem_do(World var1, int var2, int var3, int var4, ItemStack var5) { protected void dropBlockAsItem_do(World var1, int var2, int var3, int var4, ItemStack var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
float var6 = 0.7F; float var6 = 0.7F;
double var7 = (double)(var1.rand.nextFloat() * var6) + (double)(1.0F - var6) * 0.5D; double var7 = (double) (var1.rand.nextFloat() * var6) + (double) (1.0F - var6) * 0.5D;
double var9 = (double)(var1.rand.nextFloat() * var6) + (double)(1.0F - var6) * 0.5D; double var9 = (double) (var1.rand.nextFloat() * var6) + (double) (1.0F - var6) * 0.5D;
double var11 = (double)(var1.rand.nextFloat() * var6) + (double)(1.0F - var6) * 0.5D; double var11 = (double) (var1.rand.nextFloat() * var6) + (double) (1.0F - var6) * 0.5D;
EntityItem var13 = new EntityItem(var1, (double)var2 + var7, (double)var3 + var9, (double)var4 + var11, var5); EntityItem var13 = new EntityItem(var1, (double) var2 + var7, (double) var3 + var9, (double) var4 + var11, var5);
var13.delayBeforeCanPickup = 10; var13.delayBeforeCanPickup = 10;
var1.entityJoinedWorld(var13); var1.entityJoinedWorld(var13);
} }
@ -359,92 +349,92 @@ public class Block {
public MovingObjectPosition collisionRayTrace(World var1, int var2, int var3, int var4, Vec3D var5, Vec3D var6) { public MovingObjectPosition collisionRayTrace(World var1, int var2, int var3, int var4, Vec3D var5, Vec3D var6) {
this.setBlockBoundsBasedOnState(var1, var2, var3, var4); this.setBlockBoundsBasedOnState(var1, var2, var3, var4);
var5 = var5.addVector((double)(-var2), (double)(-var3), (double)(-var4)); var5 = var5.addVector((double) (-var2), (double) (-var3), (double) (-var4));
var6 = var6.addVector((double)(-var2), (double)(-var3), (double)(-var4)); var6 = var6.addVector((double) (-var2), (double) (-var3), (double) (-var4));
Vec3D var7 = var5.getIntermediateWithXValue(var6, this.minX); Vec3D var7 = var5.getIntermediateWithXValue(var6, this.minX);
Vec3D var8 = var5.getIntermediateWithXValue(var6, this.maxX); Vec3D var8 = var5.getIntermediateWithXValue(var6, this.maxX);
Vec3D var9 = var5.getIntermediateWithYValue(var6, this.minY); Vec3D var9 = var5.getIntermediateWithYValue(var6, this.minY);
Vec3D var10 = var5.getIntermediateWithYValue(var6, this.maxY); Vec3D var10 = var5.getIntermediateWithYValue(var6, this.maxY);
Vec3D var11 = var5.getIntermediateWithZValue(var6, this.minZ); Vec3D var11 = var5.getIntermediateWithZValue(var6, this.minZ);
Vec3D var12 = var5.getIntermediateWithZValue(var6, this.maxZ); Vec3D var12 = var5.getIntermediateWithZValue(var6, this.maxZ);
if(!this.isVecInsideYZBounds(var7)) { if (!this.isVecInsideYZBounds(var7)) {
var7 = null; var7 = null;
} }
if(!this.isVecInsideYZBounds(var8)) { if (!this.isVecInsideYZBounds(var8)) {
var8 = null; var8 = null;
} }
if(!this.isVecInsideXZBounds(var9)) { if (!this.isVecInsideXZBounds(var9)) {
var9 = null; var9 = null;
} }
if(!this.isVecInsideXZBounds(var10)) { if (!this.isVecInsideXZBounds(var10)) {
var10 = null; var10 = null;
} }
if(!this.isVecInsideXYBounds(var11)) { if (!this.isVecInsideXYBounds(var11)) {
var11 = null; var11 = null;
} }
if(!this.isVecInsideXYBounds(var12)) { if (!this.isVecInsideXYBounds(var12)) {
var12 = null; var12 = null;
} }
Vec3D var13 = null; Vec3D var13 = null;
if(var7 != null && (var13 == null || var5.distanceTo(var7) < var5.distanceTo(var13))) { if (var7 != null && (var13 == null || var5.distanceTo(var7) < var5.distanceTo(var13))) {
var13 = var7; var13 = var7;
} }
if(var8 != null && (var13 == null || var5.distanceTo(var8) < var5.distanceTo(var13))) { if (var8 != null && (var13 == null || var5.distanceTo(var8) < var5.distanceTo(var13))) {
var13 = var8; var13 = var8;
} }
if(var9 != null && (var13 == null || var5.distanceTo(var9) < var5.distanceTo(var13))) { if (var9 != null && (var13 == null || var5.distanceTo(var9) < var5.distanceTo(var13))) {
var13 = var9; var13 = var9;
} }
if(var10 != null && (var13 == null || var5.distanceTo(var10) < var5.distanceTo(var13))) { if (var10 != null && (var13 == null || var5.distanceTo(var10) < var5.distanceTo(var13))) {
var13 = var10; var13 = var10;
} }
if(var11 != null && (var13 == null || var5.distanceTo(var11) < var5.distanceTo(var13))) { if (var11 != null && (var13 == null || var5.distanceTo(var11) < var5.distanceTo(var13))) {
var13 = var11; var13 = var11;
} }
if(var12 != null && (var13 == null || var5.distanceTo(var12) < var5.distanceTo(var13))) { if (var12 != null && (var13 == null || var5.distanceTo(var12) < var5.distanceTo(var13))) {
var13 = var12; var13 = var12;
} }
if(var13 == null) { if (var13 == null) {
return null; return null;
} else { } else {
byte var14 = -1; byte var14 = -1;
if(var13 == var7) { if (var13 == var7) {
var14 = 4; var14 = 4;
} }
if(var13 == var8) { if (var13 == var8) {
var14 = 5; var14 = 5;
} }
if(var13 == var9) { if (var13 == var9) {
var14 = 0; var14 = 0;
} }
if(var13 == var10) { if (var13 == var10) {
var14 = 1; var14 = 1;
} }
if(var13 == var11) { if (var13 == var11) {
var14 = 2; var14 = 2;
} }
if(var13 == var12) { if (var13 == var12) {
var14 = 3; var14 = 3;
} }
return new MovingObjectPosition(var2, var3, var4, var14, var13.addVector((double)var2, (double)var3, (double)var4)); return new MovingObjectPosition(var2, var3, var4, var14, var13.addVector((double) var2, (double) var3, (double) var4));
} }
} }
@ -556,8 +546,8 @@ public class Block {
Item.itemsList[pistonBase.blockID] = new ItemPiston(pistonBase.blockID - 256); Item.itemsList[pistonBase.blockID] = new ItemPiston(pistonBase.blockID - 256);
Item.itemsList[pistonStickyBase.blockID] = new ItemPiston(pistonStickyBase.blockID - 256); Item.itemsList[pistonStickyBase.blockID] = new ItemPiston(pistonStickyBase.blockID - 256);
for(int var0 = 0; var0 < 256; ++var0) { for (int var0 = 0; var0 < 256; ++var0) {
if(blocksList[var0] != null && Item.itemsList[var0] == null) { if (blocksList[var0] != null && Item.itemsList[var0] == null) {
Item.itemsList[var0] = new ItemBlock(var0 - 256); Item.itemsList[var0] = new ItemBlock(var0 - 256);
blocksList[var0].setFireBurnRates(); blocksList[var0].setFireBurnRates();
} }

69
src/net/minecraft/block/BlockBed.java
View file

@ -1,7 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Iterator;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
@ -12,6 +10,9 @@ import net.minecraft.world.EnumBedResult;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Iterator;
import java.util.Random;
public class BlockBed extends Block { public class BlockBed extends Block {
public static final int[][] field_22023_a = new int[][]{{0, 1}, {-1, 0}, {0, -1}, {1, 0}}; public static final int[][] field_22023_a = new int[][]{{0, 1}, {-1, 0}, {0, -1}, {1, 0}};
@ -21,54 +22,54 @@ public class BlockBed extends Block {
} }
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) { public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(var1.singleplayerWorld) { if (var1.singleplayerWorld) {
return true; return true;
} else { } else {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if(!func_22020_d(var6)) { if (!func_22020_d(var6)) {
int var7 = func_22019_c(var6); int var7 = func_22019_c(var6);
var2 += field_22023_a[var7][0]; var2 += field_22023_a[var7][0];
var4 += field_22023_a[var7][1]; var4 += field_22023_a[var7][1];
if(var1.getBlockId(var2, var3, var4) != this.blockID) { if (var1.getBlockId(var2, var3, var4) != this.blockID) {
return true; return true;
} }
var6 = var1.getBlockMetadata(var2, var3, var4); var6 = var1.getBlockMetadata(var2, var3, var4);
} }
if(!var1.worldProvider.func_28108_d()) { if (!var1.worldProvider.func_28108_d()) {
double var16 = (double)var2 + 0.5D; double var16 = (double) var2 + 0.5D;
double var17 = (double)var3 + 0.5D; double var17 = (double) var3 + 0.5D;
double var11 = (double)var4 + 0.5D; double var11 = (double) var4 + 0.5D;
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
int var13 = func_22019_c(var6); int var13 = func_22019_c(var6);
var2 += field_22023_a[var13][0]; var2 += field_22023_a[var13][0];
var4 += field_22023_a[var13][1]; var4 += field_22023_a[var13][1];
if(var1.getBlockId(var2, var3, var4) == this.blockID) { if (var1.getBlockId(var2, var3, var4) == this.blockID) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
var16 = (var16 + (double)var2 + 0.5D) / 2.0D; var16 = (var16 + (double) var2 + 0.5D) / 2.0D;
var17 = (var17 + (double)var3 + 0.5D) / 2.0D; var17 = (var17 + (double) var3 + 0.5D) / 2.0D;
var11 = (var11 + (double)var4 + 0.5D) / 2.0D; var11 = (var11 + (double) var4 + 0.5D) / 2.0D;
} }
var1.newExplosion((Entity)null, (double)((float)var2 + 0.5F), (double)((float)var3 + 0.5F), (double)((float)var4 + 0.5F), 5.0F, true); var1.newExplosion((Entity) null, (double) ((float) var2 + 0.5F), (double) ((float) var3 + 0.5F), (double) ((float) var4 + 0.5F), 5.0F, true);
return true; return true;
} else { } else {
if(func_22018_f(var6)) { if (func_22018_f(var6)) {
EntityPlayer var14 = null; EntityPlayer var14 = null;
Iterator var8 = var1.playerEntities.iterator(); Iterator var8 = var1.playerEntities.iterator();
while(var8.hasNext()) { while (var8.hasNext()) {
EntityPlayer var9 = (EntityPlayer)var8.next(); EntityPlayer var9 = (EntityPlayer) var8.next();
if(var9.func_22057_E()) { if (var9.func_22057_E()) {
ChunkCoordinates var10 = var9.playerLocation; ChunkCoordinates var10 = var9.playerLocation;
if(var10.posX == var2 && var10.posY == var3 && var10.posZ == var4) { if (var10.posX == var2 && var10.posY == var3 && var10.posZ == var4) {
var14 = var9; var14 = var9;
} }
} }
} }
if(var14 != null) { if (var14 != null) {
var5.func_22061_a("tile.bed.occupied"); var5.func_22061_a("tile.bed.occupied");
return true; return true;
} }
@ -77,11 +78,11 @@ public class BlockBed extends Block {
} }
EnumBedResult var15 = var5.goToSleep(var2, var3, var4); EnumBedResult var15 = var5.goToSleep(var2, var3, var4);
if(var15 == EnumBedResult.OK) { if (var15 == EnumBedResult.OK) {
func_22022_a(var1, var2, var3, var4, true); func_22022_a(var1, var2, var3, var4, true);
return true; return true;
} else { } else {
if(var15 == EnumBedResult.NOT_POSSIBLE_NOW) { if (var15 == EnumBedResult.NOT_POSSIBLE_NOW) {
var5.func_22061_a("tile.bed.noSleep"); var5.func_22061_a("tile.bed.noSleep");
} }
@ -92,7 +93,7 @@ public class BlockBed extends Block {
} }
public int getBlockTextureFromSideAndMetadata(int var1, int var2) { public int getBlockTextureFromSideAndMetadata(int var1, int var2) {
if(var1 == 0) { if (var1 == 0) {
return Block.planks.blockIndexInTexture; return Block.planks.blockIndexInTexture;
} else { } else {
int var3 = func_22019_c(var2); int var3 = func_22019_c(var2);
@ -116,13 +117,13 @@ public class BlockBed extends Block {
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
int var7 = func_22019_c(var6); int var7 = func_22019_c(var6);
if(func_22020_d(var6)) { if (func_22020_d(var6)) {
if(var1.getBlockId(var2 - field_22023_a[var7][0], var3, var4 - field_22023_a[var7][1]) != this.blockID) { if (var1.getBlockId(var2 - field_22023_a[var7][0], var3, var4 - field_22023_a[var7][1]) != this.blockID) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
} else if(var1.getBlockId(var2 + field_22023_a[var7][0], var3, var4 + field_22023_a[var7][1]) != this.blockID) { } else if (var1.getBlockId(var2 + field_22023_a[var7][0], var3, var4 + field_22023_a[var7][1]) != this.blockID) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
this.dropBlockAsItem(var1, var2, var3, var4, var6); this.dropBlockAsItem(var1, var2, var3, var4, var6);
} }
} }
@ -151,7 +152,7 @@ public class BlockBed extends Block {
public static void func_22022_a(World var0, int var1, int var2, int var3, boolean var4) { public static void func_22022_a(World var0, int var1, int var2, int var3, boolean var4) {
int var5 = var0.getBlockMetadata(var1, var2, var3); int var5 = var0.getBlockMetadata(var1, var2, var3);
if(var4) { if (var4) {
var5 |= 4; var5 |= 4;
} else { } else {
var5 &= -5; var5 &= -5;
@ -164,16 +165,16 @@ public class BlockBed extends Block {
int var5 = var0.getBlockMetadata(var1, var2, var3); int var5 = var0.getBlockMetadata(var1, var2, var3);
int var6 = func_22019_c(var5); int var6 = func_22019_c(var5);
for(int var7 = 0; var7 <= 1; ++var7) { for (int var7 = 0; var7 <= 1; ++var7) {
int var8 = var1 - field_22023_a[var6][0] * var7 - 1; int var8 = var1 - field_22023_a[var6][0] * var7 - 1;
int var9 = var3 - field_22023_a[var6][1] * var7 - 1; int var9 = var3 - field_22023_a[var6][1] * var7 - 1;
int var10 = var8 + 2; int var10 = var8 + 2;
int var11 = var9 + 2; int var11 = var9 + 2;
for(int var12 = var8; var12 <= var10; ++var12) { for (int var12 = var8; var12 <= var10; ++var12) {
for(int var13 = var9; var13 <= var11; ++var13) { for (int var13 = var9; var13 <= var11; ++var13) {
if(var0.isBlockNormalCube(var12, var2 - 1, var13) && var0.isAirBlock(var12, var2, var13) && var0.isAirBlock(var12, var2 + 1, var13)) { if (var0.isBlockNormalCube(var12, var2 - 1, var13) && var0.isAirBlock(var12, var2, var13) && var0.isAirBlock(var12, var2 + 1, var13)) {
if(var4 <= 0) { if (var4 <= 0) {
return new ChunkCoordinates(var12, var2, var13); return new ChunkCoordinates(var12, var2, var13);
} }
@ -187,7 +188,7 @@ public class BlockBed extends Block {
} }
public void dropBlockAsItemWithChance(World var1, int var2, int var3, int var4, int var5, float var6) { public void dropBlockAsItemWithChance(World var1, int var2, int var3, int var4, int var5, float var6) {
if(!func_22020_d(var5)) { if (!func_22020_d(var5)) {
super.dropBlockAsItemWithChance(var1, var2, var3, var4, var5, var6); super.dropBlockAsItemWithChance(var1, var2, var3, var4, var5, var6);
} }

3
src/net/minecraft/block/BlockBookshelf.java
View file

@ -1,8 +1,9 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import java.util.Random;
public class BlockBookshelf extends Block { public class BlockBookshelf extends Block {
public BlockBookshelf(int var1, int var2) { public BlockBookshelf(int var1, int var2) {
super(var1, var2, Material.wood); super(var1, var2, Material.wood);

73
src/net/minecraft/block/BlockButton.java
View file

@ -1,12 +1,13 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockButton extends Block { public class BlockButton extends Block {
protected BlockButton(int var1, int var2) { protected BlockButton(int var1, int var2) {
super(var1, var2, Material.circuits); super(var1, var2, Material.circuits);
@ -41,13 +42,13 @@ public class BlockButton extends Block {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
int var7 = var6 & 8; int var7 = var6 & 8;
var6 &= 7; var6 &= 7;
if(var5 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1)) { if (var5 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1)) {
var6 = 4; var6 = 4;
} else if(var5 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1)) { } else if (var5 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1)) {
var6 = 3; var6 = 3;
} else if(var5 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4)) { } else if (var5 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4)) {
var6 = 2; var6 = 2;
} else if(var5 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)) { } else if (var5 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)) {
var6 = 1; var6 = 1;
} else { } else {
var6 = this.getOrientation(var1, var2, var3, var4); var6 = this.getOrientation(var1, var2, var3, var4);
@ -61,26 +62,26 @@ public class BlockButton extends Block {
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(this.func_322_g(var1, var2, var3, var4)) { if (this.func_322_g(var1, var2, var3, var4)) {
int var6 = var1.getBlockMetadata(var2, var3, var4) & 7; int var6 = var1.getBlockMetadata(var2, var3, var4) & 7;
boolean var7 = false; boolean var7 = false;
if(!var1.isBlockNormalCube(var2 - 1, var3, var4) && var6 == 1) { if (!var1.isBlockNormalCube(var2 - 1, var3, var4) && var6 == 1) {
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2 + 1, var3, var4) && var6 == 2) { if (!var1.isBlockNormalCube(var2 + 1, var3, var4) && var6 == 2) {
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2, var3, var4 - 1) && var6 == 3) { if (!var1.isBlockNormalCube(var2, var3, var4 - 1) && var6 == 3) {
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2, var3, var4 + 1) && var6 == 4) { if (!var1.isBlockNormalCube(var2, var3, var4 + 1) && var6 == 4) {
var7 = true; var7 = true;
} }
if(var7) { if (var7) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
@ -89,7 +90,7 @@ public class BlockButton extends Block {
} }
private boolean func_322_g(World var1, int var2, int var3, int var4) { private boolean func_322_g(World var1, int var2, int var3, int var4) {
if(!this.canPlaceBlockAt(var1, var2, var3, var4)) { if (!this.canPlaceBlockAt(var1, var2, var3, var4)) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
return false; return false;
@ -106,17 +107,17 @@ public class BlockButton extends Block {
float var9 = 10.0F / 16.0F; float var9 = 10.0F / 16.0F;
float var10 = 3.0F / 16.0F; float var10 = 3.0F / 16.0F;
float var11 = 2.0F / 16.0F; float var11 = 2.0F / 16.0F;
if(var7) { if (var7) {
var11 = 1.0F / 16.0F; var11 = 1.0F / 16.0F;
} }
if(var6 == 1) { if (var6 == 1) {
this.setBlockBounds(0.0F, var8, 0.5F - var10, var11, var9, 0.5F + var10); this.setBlockBounds(0.0F, var8, 0.5F - var10, var11, var9, 0.5F + var10);
} else if(var6 == 2) { } else if (var6 == 2) {
this.setBlockBounds(1.0F - var11, var8, 0.5F - var10, 1.0F, var9, 0.5F + var10); this.setBlockBounds(1.0F - var11, var8, 0.5F - var10, 1.0F, var9, 0.5F + var10);
} else if(var6 == 3) { } else if (var6 == 3) {
this.setBlockBounds(0.5F - var10, var8, 0.0F, 0.5F + var10, var9, var11); this.setBlockBounds(0.5F - var10, var8, 0.0F, 0.5F + var10, var9, var11);
} else if(var6 == 4) { } else if (var6 == 4) {
this.setBlockBounds(0.5F - var10, var8, 1.0F - var11, 0.5F + var10, var9, 1.0F); this.setBlockBounds(0.5F - var10, var8, 1.0F - var11, 0.5F + var10, var9, 1.0F);
} }
@ -130,20 +131,20 @@ public class BlockButton extends Block {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
int var7 = var6 & 7; int var7 = var6 & 7;
int var8 = 8 - (var6 & 8); int var8 = 8 - (var6 & 8);
if(var8 == 0) { if (var8 == 0) {
return true; return true;
} else { } else {
var1.setBlockMetadataWithNotify(var2, var3, var4, var7 + var8); var1.setBlockMetadataWithNotify(var2, var3, var4, var7 + var8);
var1.markBlocksDirty(var2, var3, var4, var2, var3, var4); var1.markBlocksDirty(var2, var3, var4, var2, var3, var4);
var1.playSoundEffect((double)var2 + 0.5D, (double)var3 + 0.5D, (double)var4 + 0.5D, "random.click", 0.3F, 0.6F); var1.playSoundEffect((double) var2 + 0.5D, (double) var3 + 0.5D, (double) var4 + 0.5D, "random.click", 0.3F, 0.6F);
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
if(var7 == 1) { if (var7 == 1) {
var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID);
} else if(var7 == 2) { } else if (var7 == 2) {
var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID);
} else if(var7 == 3) { } else if (var7 == 3) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID);
} else if(var7 == 4) { } else if (var7 == 4) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID);
} else { } else {
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
@ -156,16 +157,16 @@ public class BlockButton extends Block {
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
if((var5 & 8) > 0) { if ((var5 & 8) > 0) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
int var6 = var5 & 7; int var6 = var5 & 7;
if(var6 == 1) { if (var6 == 1) {
var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID);
} else if(var6 == 2) { } else if (var6 == 2) {
var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID);
} else if(var6 == 3) { } else if (var6 == 3) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID);
} else if(var6 == 4) { } else if (var6 == 4) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID);
} else { } else {
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
@ -181,7 +182,7 @@ public class BlockButton extends Block {
public boolean isIndirectlyPoweringTo(World var1, int var2, int var3, int var4, int var5) { public boolean isIndirectlyPoweringTo(World var1, int var2, int var3, int var4, int var5) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if((var6 & 8) == 0) { if ((var6 & 8) == 0) {
return false; return false;
} else { } else {
int var7 = var6 & 7; int var7 = var6 & 7;
@ -194,25 +195,25 @@ public class BlockButton extends Block {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if((var6 & 8) != 0) { if ((var6 & 8) != 0) {
var1.setBlockMetadataWithNotify(var2, var3, var4, var6 & 7); var1.setBlockMetadataWithNotify(var2, var3, var4, var6 & 7);
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
int var7 = var6 & 7; int var7 = var6 & 7;
if(var7 == 1) { if (var7 == 1) {
var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID);
} else if(var7 == 2) { } else if (var7 == 2) {
var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID);
} else if(var7 == 3) { } else if (var7 == 3) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID);
} else if(var7 == 4) { } else if (var7 == 4) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID);
} else { } else {
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
} }
var1.playSoundEffect((double)var2 + 0.5D, (double)var3 + 0.5D, (double)var4 + 0.5D, "random.click", 0.3F, 0.5F); var1.playSoundEffect((double) var2 + 0.5D, (double) var3 + 0.5D, (double) var4 + 0.5D, "random.click", 0.3F, 0.5F);
var1.markBlocksDirty(var2, var3, var4, var2, var3, var4); var1.markBlocksDirty(var2, var3, var4, var2, var3, var4);
} }
} }

25
src/net/minecraft/block/BlockCactus.java
View file

@ -1,11 +1,12 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockCactus extends Block { public class BlockCactus extends Block {
protected BlockCactus(int var1, int var2) { protected BlockCactus(int var1, int var2) {
super(var1, var2, Material.cactus); super(var1, var2, Material.cactus);
@ -13,14 +14,14 @@ public class BlockCactus extends Block {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(var1.isAirBlock(var2, var3 + 1, var4)) { if (var1.isAirBlock(var2, var3 + 1, var4)) {
int var6; int var6;
for(var6 = 1; var1.getBlockId(var2, var3 - var6, var4) == this.blockID; ++var6) { for (var6 = 1; var1.getBlockId(var2, var3 - var6, var4) == this.blockID; ++var6) {
} }
if(var6 < 3) { if (var6 < 3) {
int var7 = var1.getBlockMetadata(var2, var3, var4); int var7 = var1.getBlockMetadata(var2, var3, var4);
if(var7 == 15) { if (var7 == 15) {
var1.setBlockWithNotify(var2, var3 + 1, var4, this.blockID); var1.setBlockWithNotify(var2, var3 + 1, var4, this.blockID);
var1.setBlockMetadataWithNotify(var2, var3, var4, 0); var1.setBlockMetadataWithNotify(var2, var3, var4, 0);
} else { } else {
@ -33,7 +34,7 @@ public class BlockCactus extends Block {
public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) { public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) {
float var5 = 1.0F / 16.0F; float var5 = 1.0F / 16.0F;
return AxisAlignedBB.getBoundingBoxFromPool((double)((float)var2 + var5), (double)var3, (double)((float)var4 + var5), (double)((float)(var2 + 1) - var5), (double)((float)(var3 + 1) - var5), (double)((float)(var4 + 1) - var5)); return AxisAlignedBB.getBoundingBoxFromPool((double) ((float) var2 + var5), (double) var3, (double) ((float) var4 + var5), (double) ((float) (var2 + 1) - var5), (double) ((float) (var3 + 1) - var5), (double) ((float) (var4 + 1) - var5));
} }
public int getBlockTextureFromSide(int var1) { public int getBlockTextureFromSide(int var1) {
@ -53,7 +54,7 @@ public class BlockCactus extends Block {
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(!this.canBlockStay(var1, var2, var3, var4)) { if (!this.canBlockStay(var1, var2, var3, var4)) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
@ -61,13 +62,13 @@ public class BlockCactus extends Block {
} }
public boolean canBlockStay(World var1, int var2, int var3, int var4) { public boolean canBlockStay(World var1, int var2, int var3, int var4) {
if(var1.getBlockMaterial(var2 - 1, var3, var4).isSolid()) { if (var1.getBlockMaterial(var2 - 1, var3, var4).isSolid()) {
return false; return false;
} else if(var1.getBlockMaterial(var2 + 1, var3, var4).isSolid()) { } else if (var1.getBlockMaterial(var2 + 1, var3, var4).isSolid()) {
return false; return false;
} else if(var1.getBlockMaterial(var2, var3, var4 - 1).isSolid()) { } else if (var1.getBlockMaterial(var2, var3, var4 - 1).isSolid()) {
return false; return false;
} else if(var1.getBlockMaterial(var2, var3, var4 + 1).isSolid()) { } else if (var1.getBlockMaterial(var2, var3, var4 + 1).isSolid()) {
return false; return false;
} else { } else {
int var5 = var1.getBlockId(var2, var3 - 1, var4); int var5 = var1.getBlockId(var2, var3 - 1, var4);
@ -76,6 +77,6 @@ public class BlockCactus extends Block {
} }
public void onEntityCollidedWithBlock(World var1, int var2, int var3, int var4, Entity var5) { public void onEntityCollidedWithBlock(World var1, int var2, int var3, int var4, Entity var5) {
var5.attackEntityFrom((Entity)null, 1); var5.attackEntityFrom((Entity) null, 1);
} }
} }

15
src/net/minecraft/block/BlockCake.java
View file

@ -1,12 +1,13 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockCake extends Block { public class BlockCake extends Block {
protected BlockCake(int var1, int var2) { protected BlockCake(int var1, int var2) {
super(var1, var2, Material.cakeMaterial); super(var1, var2, Material.cakeMaterial);
@ -16,7 +17,7 @@ public class BlockCake extends Block {
public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) { public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
float var6 = 1.0F / 16.0F; float var6 = 1.0F / 16.0F;
float var7 = (float)(1 + var5 * 2) / 16.0F; float var7 = (float) (1 + var5 * 2) / 16.0F;
float var8 = 0.5F; float var8 = 0.5F;
this.setBlockBounds(var7, 0.0F, var6, 1.0F - var6, var8, 1.0F - var6); this.setBlockBounds(var7, 0.0F, var6, 1.0F - var6, var8, 1.0F - var6);
} }
@ -24,9 +25,9 @@ public class BlockCake extends Block {
public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) { public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
float var6 = 1.0F / 16.0F; float var6 = 1.0F / 16.0F;
float var7 = (float)(1 + var5 * 2) / 16.0F; float var7 = (float) (1 + var5 * 2) / 16.0F;
float var8 = 0.5F; float var8 = 0.5F;
return AxisAlignedBB.getBoundingBoxFromPool((double)((float)var2 + var7), (double)var3, (double)((float)var4 + var6), (double)((float)(var2 + 1) - var6), (double)((float)var3 + var8 - var6), (double)((float)(var4 + 1) - var6)); return AxisAlignedBB.getBoundingBoxFromPool((double) ((float) var2 + var7), (double) var3, (double) ((float) var4 + var6), (double) ((float) (var2 + 1) - var6), (double) ((float) var3 + var8 - var6), (double) ((float) (var4 + 1) - var6));
} }
public int getBlockTextureFromSideAndMetadata(int var1, int var2) { public int getBlockTextureFromSideAndMetadata(int var1, int var2) {
@ -55,10 +56,10 @@ public class BlockCake extends Block {
} }
private void eatCakeSlice(World var1, int var2, int var3, int var4, EntityPlayer var5) { private void eatCakeSlice(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(var5.health < 20) { if (var5.health < 20) {
var5.heal(3); var5.heal(3);
int var6 = var1.getBlockMetadata(var2, var3, var4) + 1; int var6 = var1.getBlockMetadata(var2, var3, var4) + 1;
if(var6 >= 6) { if (var6 >= 6) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} else { } else {
var1.setBlockMetadataWithNotify(var2, var3, var4, var6); var1.setBlockMetadataWithNotify(var2, var3, var4, var6);
@ -73,7 +74,7 @@ public class BlockCake extends Block {
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(!this.canBlockStay(var1, var2, var3, var4)) { if (!this.canBlockStay(var1, var2, var3, var4)) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }

61
src/net/minecraft/block/BlockChest.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.tile.TileEntity; import net.minecraft.block.tile.TileEntity;
import net.minecraft.block.tile.TileEntityChest; import net.minecraft.block.tile.TileEntityChest;
@ -11,6 +10,8 @@ import net.minecraft.entity.EntityPlayer;
import net.minecraft.item.crafting.ItemStack; import net.minecraft.item.crafting.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockChest extends BlockContainer { public class BlockChest extends BlockContainer {
private Random random = new Random(); private Random random = new Random();
@ -25,19 +26,19 @@ public class BlockChest extends BlockContainer {
public boolean canPlaceBlockAt(World var1, int var2, int var3, int var4) { public boolean canPlaceBlockAt(World var1, int var2, int var3, int var4) {
int var5 = 0; int var5 = 0;
if(var1.getBlockId(var2 - 1, var3, var4) == this.blockID) { if (var1.getBlockId(var2 - 1, var3, var4) == this.blockID) {
++var5; ++var5;
} }
if(var1.getBlockId(var2 + 1, var3, var4) == this.blockID) { if (var1.getBlockId(var2 + 1, var3, var4) == this.blockID) {
++var5; ++var5;
} }
if(var1.getBlockId(var2, var3, var4 - 1) == this.blockID) { if (var1.getBlockId(var2, var3, var4 - 1) == this.blockID) {
++var5; ++var5;
} }
if(var1.getBlockId(var2, var3, var4 + 1) == this.blockID) { if (var1.getBlockId(var2, var3, var4 + 1) == this.blockID) {
++var5; ++var5;
} }
@ -49,27 +50,27 @@ public class BlockChest extends BlockContainer {
} }
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
TileEntityChest var5 = (TileEntityChest)var1.getBlockTileEntity(var2, var3, var4); TileEntityChest var5 = (TileEntityChest) var1.getBlockTileEntity(var2, var3, var4);
for(int var6 = 0; var6 < var5.getSizeInventory(); ++var6) { for (int var6 = 0; var6 < var5.getSizeInventory(); ++var6) {
ItemStack var7 = var5.getStackInSlot(var6); ItemStack var7 = var5.getStackInSlot(var6);
if(var7 != null) { if (var7 != null) {
float var8 = this.random.nextFloat() * 0.8F + 0.1F; float var8 = this.random.nextFloat() * 0.8F + 0.1F;
float var9 = this.random.nextFloat() * 0.8F + 0.1F; float var9 = this.random.nextFloat() * 0.8F + 0.1F;
float var10 = this.random.nextFloat() * 0.8F + 0.1F; float var10 = this.random.nextFloat() * 0.8F + 0.1F;
while(var7.stackSize > 0) { while (var7.stackSize > 0) {
int var11 = this.random.nextInt(21) + 10; int var11 = this.random.nextInt(21) + 10;
if(var11 > var7.stackSize) { if (var11 > var7.stackSize) {
var11 = var7.stackSize; var11 = var7.stackSize;
} }
var7.stackSize -= var11; var7.stackSize -= var11;
EntityItem var12 = new EntityItem(var1, (double)((float)var2 + var8), (double)((float)var3 + var9), (double)((float)var4 + var10), new ItemStack(var7.itemID, var11, var7.getItemDamage())); EntityItem var12 = new EntityItem(var1, (double) ((float) var2 + var8), (double) ((float) var3 + var9), (double) ((float) var4 + var10), new ItemStack(var7.itemID, var11, var7.getItemDamage()));
float var13 = 0.05F; float var13 = 0.05F;
var12.motionX = (double)((float)this.random.nextGaussian() * var13); var12.motionX = (double) ((float) this.random.nextGaussian() * var13);
var12.motionY = (double)((float)this.random.nextGaussian() * var13 + 0.2F); var12.motionY = (double) ((float) this.random.nextGaussian() * var13 + 0.2F);
var12.motionZ = (double)((float)this.random.nextGaussian() * var13); var12.motionZ = (double) ((float) this.random.nextGaussian() * var13);
var1.entityJoinedWorld(var12); var1.entityJoinedWorld(var12);
} }
} }
@ -79,38 +80,38 @@ public class BlockChest extends BlockContainer {
} }
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) { public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
Object var6 = (TileEntityChest)var1.getBlockTileEntity(var2, var3, var4); Object var6 = (TileEntityChest) var1.getBlockTileEntity(var2, var3, var4);
if(var1.isBlockNormalCube(var2, var3 + 1, var4)) { if (var1.isBlockNormalCube(var2, var3 + 1, var4)) {
return true; return true;
} else if(var1.getBlockId(var2 - 1, var3, var4) == this.blockID && var1.isBlockNormalCube(var2 - 1, var3 + 1, var4)) { } else if (var1.getBlockId(var2 - 1, var3, var4) == this.blockID && var1.isBlockNormalCube(var2 - 1, var3 + 1, var4)) {
return true; return true;
} else if(var1.getBlockId(var2 + 1, var3, var4) == this.blockID && var1.isBlockNormalCube(var2 + 1, var3 + 1, var4)) { } else if (var1.getBlockId(var2 + 1, var3, var4) == this.blockID && var1.isBlockNormalCube(var2 + 1, var3 + 1, var4)) {
return true; return true;
} else if(var1.getBlockId(var2, var3, var4 - 1) == this.blockID && var1.isBlockNormalCube(var2, var3 + 1, var4 - 1)) { } else if (var1.getBlockId(var2, var3, var4 - 1) == this.blockID && var1.isBlockNormalCube(var2, var3 + 1, var4 - 1)) {
return true; return true;
} else if(var1.getBlockId(var2, var3, var4 + 1) == this.blockID && var1.isBlockNormalCube(var2, var3 + 1, var4 + 1)) { } else if (var1.getBlockId(var2, var3, var4 + 1) == this.blockID && var1.isBlockNormalCube(var2, var3 + 1, var4 + 1)) {
return true; return true;
} else { } else {
if(var1.getBlockId(var2 - 1, var3, var4) == this.blockID) { if (var1.getBlockId(var2 - 1, var3, var4) == this.blockID) {
var6 = new InventoryLargeChest("Large chest", (TileEntityChest)var1.getBlockTileEntity(var2 - 1, var3, var4), (IInventory)var6); var6 = new InventoryLargeChest("Large chest", (TileEntityChest) var1.getBlockTileEntity(var2 - 1, var3, var4), (IInventory) var6);
} }
if(var1.getBlockId(var2 + 1, var3, var4) == this.blockID) { if (var1.getBlockId(var2 + 1, var3, var4) == this.blockID) {
var6 = new InventoryLargeChest("Large chest", (IInventory)var6, (TileEntityChest)var1.getBlockTileEntity(var2 + 1, var3, var4)); var6 = new InventoryLargeChest("Large chest", (IInventory) var6, (TileEntityChest) var1.getBlockTileEntity(var2 + 1, var3, var4));
} }
if(var1.getBlockId(var2, var3, var4 - 1) == this.blockID) { if (var1.getBlockId(var2, var3, var4 - 1) == this.blockID) {
var6 = new InventoryLargeChest("Large chest", (TileEntityChest)var1.getBlockTileEntity(var2, var3, var4 - 1), (IInventory)var6); var6 = new InventoryLargeChest("Large chest", (TileEntityChest) var1.getBlockTileEntity(var2, var3, var4 - 1), (IInventory) var6);
} }
if(var1.getBlockId(var2, var3, var4 + 1) == this.blockID) { if (var1.getBlockId(var2, var3, var4 + 1) == this.blockID) {
var6 = new InventoryLargeChest("Large chest", (IInventory)var6, (TileEntityChest)var1.getBlockTileEntity(var2, var3, var4 + 1)); var6 = new InventoryLargeChest("Large chest", (IInventory) var6, (TileEntityChest) var1.getBlockTileEntity(var2, var3, var4 + 1));
} }
if(var1.singleplayerWorld) { if (var1.singleplayerWorld) {
return true; return true;
} else { } else {
var5.displayGUIChest((IInventory)var6); var5.displayGUIChest((IInventory) var6);
return true; return true;
} }
} }

3
src/net/minecraft/block/BlockClay.java
View file

@ -1,9 +1,10 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import java.util.Random;
public class BlockClay extends Block { public class BlockClay extends Block {
public BlockClay(int var1, int var2) { public BlockClay(int var1, int var2) {
super(var1, var2, Material.clay); super(var1, var2, Material.clay);

2
src/net/minecraft/block/BlockCloth.java
View file

@ -8,7 +8,7 @@ public class BlockCloth extends Block {
} }
public int getBlockTextureFromSideAndMetadata(int var1, int var2) { public int getBlockTextureFromSideAndMetadata(int var1, int var2) {
if(var2 == 0) { if (var2 == 0) {
return this.blockIndexInTexture; return this.blockIndexInTexture;
} else { } else {
var2 = ~(var2 & 15); var2 = ~(var2 & 15);

31
src/net/minecraft/block/BlockCrops.java
View file

@ -1,11 +1,12 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.entity.EntityItem; import net.minecraft.entity.EntityItem;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.crafting.ItemStack; import net.minecraft.item.crafting.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockCrops extends BlockFlower { public class BlockCrops extends BlockFlower {
protected BlockCrops(int var1, int var2) { protected BlockCrops(int var1, int var2) {
super(var1, var2); super(var1, var2);
@ -21,11 +22,11 @@ public class BlockCrops extends BlockFlower {
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
super.updateTick(var1, var2, var3, var4, var5); super.updateTick(var1, var2, var3, var4, var5);
if(var1.getBlockLightValue(var2, var3 + 1, var4) >= 9) { if (var1.getBlockLightValue(var2, var3 + 1, var4) >= 9) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if(var6 < 7) { if (var6 < 7) {
float var7 = this.getGrowthRate(var1, var2, var3, var4); float var7 = this.getGrowthRate(var1, var2, var3, var4);
if(var5.nextInt((int)(100.0F / var7)) == 0) { if (var5.nextInt((int) (100.0F / var7)) == 0) {
++var6; ++var6;
var1.setBlockMetadataWithNotify(var2, var3, var4, var6); var1.setBlockMetadataWithNotify(var2, var3, var4, var6);
} }
@ -52,18 +53,18 @@ public class BlockCrops extends BlockFlower {
boolean var15 = var6 == this.blockID || var7 == this.blockID; boolean var15 = var6 == this.blockID || var7 == this.blockID;
boolean var16 = var10 == this.blockID || var11 == this.blockID || var12 == this.blockID || var13 == this.blockID; boolean var16 = var10 == this.blockID || var11 == this.blockID || var12 == this.blockID || var13 == this.blockID;
for(int var17 = var2 - 1; var17 <= var2 + 1; ++var17) { for (int var17 = var2 - 1; var17 <= var2 + 1; ++var17) {
for(int var18 = var4 - 1; var18 <= var4 + 1; ++var18) { for (int var18 = var4 - 1; var18 <= var4 + 1; ++var18) {
int var19 = var1.getBlockId(var17, var3 - 1, var18); int var19 = var1.getBlockId(var17, var3 - 1, var18);
float var20 = 0.0F; float var20 = 0.0F;
if(var19 == Block.tilledField.blockID) { if (var19 == Block.tilledField.blockID) {
var20 = 1.0F; var20 = 1.0F;
if(var1.getBlockMetadata(var17, var3 - 1, var18) > 0) { if (var1.getBlockMetadata(var17, var3 - 1, var18) > 0) {
var20 = 3.0F; var20 = 3.0F;
} }
} }
if(var17 != var2 || var18 != var4) { if (var17 != var2 || var18 != var4) {
var20 /= 4.0F; var20 /= 4.0F;
} }
@ -71,7 +72,7 @@ public class BlockCrops extends BlockFlower {
} }
} }
if(var16 || var14 && var15) { if (var16 || var14 && var15) {
var5 /= 2.0F; var5 /= 2.0F;
} }
@ -79,7 +80,7 @@ public class BlockCrops extends BlockFlower {
} }
public int getBlockTextureFromSideAndMetadata(int var1, int var2) { public int getBlockTextureFromSideAndMetadata(int var1, int var2) {
if(var2 < 0) { if (var2 < 0) {
var2 = 7; var2 = 7;
} }
@ -88,14 +89,14 @@ public class BlockCrops extends BlockFlower {
public void dropBlockAsItemWithChance(World var1, int var2, int var3, int var4, int var5, float var6) { public void dropBlockAsItemWithChance(World var1, int var2, int var3, int var4, int var5, float var6) {
super.dropBlockAsItemWithChance(var1, var2, var3, var4, var5, var6); super.dropBlockAsItemWithChance(var1, var2, var3, var4, var5, var6);
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
for(int var7 = 0; var7 < 3; ++var7) { for (int var7 = 0; var7 < 3; ++var7) {
if(var1.rand.nextInt(15) <= var5) { if (var1.rand.nextInt(15) <= var5) {
float var8 = 0.7F; float var8 = 0.7F;
float var9 = var1.rand.nextFloat() * var8 + (1.0F - var8) * 0.5F; float var9 = var1.rand.nextFloat() * var8 + (1.0F - var8) * 0.5F;
float var10 = var1.rand.nextFloat() * var8 + (1.0F - var8) * 0.5F; float var10 = var1.rand.nextFloat() * var8 + (1.0F - var8) * 0.5F;
float var11 = var1.rand.nextFloat() * var8 + (1.0F - var8) * 0.5F; float var11 = var1.rand.nextFloat() * var8 + (1.0F - var8) * 0.5F;
EntityItem var12 = new EntityItem(var1, (double)((float)var2 + var9), (double)((float)var3 + var10), (double)((float)var4 + var11), new ItemStack(Item.seeds)); EntityItem var12 = new EntityItem(var1, (double) ((float) var2 + var9), (double) ((float) var3 + var10), (double) ((float) var4 + var11), new ItemStack(Item.seeds));
var12.delayBeforeCanPickup = 10; var12.delayBeforeCanPickup = 10;
var1.entityJoinedWorld(var12); var1.entityJoinedWorld(var12);
} }

23
src/net/minecraft/block/BlockDetectorRail.java
View file

@ -1,13 +1,14 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.List;
import java.util.Random;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityMinecart; import net.minecraft.entity.EntityMinecart;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class BlockDetectorRail extends BlockRail { public class BlockDetectorRail extends BlockRail {
public BlockDetectorRail(int var1, int var2) { public BlockDetectorRail(int var1, int var2) {
super(var1, var2, true); super(var1, var2, true);
@ -23,18 +24,18 @@ public class BlockDetectorRail extends BlockRail {
} }
public void onEntityCollidedWithBlock(World var1, int var2, int var3, int var4, Entity var5) { public void onEntityCollidedWithBlock(World var1, int var2, int var3, int var4, Entity var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if((var6 & 8) == 0) { if ((var6 & 8) == 0) {
this.func_27035_f(var1, var2, var3, var4, var6); this.func_27035_f(var1, var2, var3, var4, var6);
} }
} }
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if((var6 & 8) != 0) { if ((var6 & 8) != 0) {
this.func_27035_f(var1, var2, var3, var4, var6); this.func_27035_f(var1, var2, var3, var4, var6);
} }
} }
@ -52,26 +53,26 @@ public class BlockDetectorRail extends BlockRail {
boolean var6 = (var5 & 8) != 0; boolean var6 = (var5 & 8) != 0;
boolean var7 = false; boolean var7 = false;
float var8 = 2.0F / 16.0F; float var8 = 2.0F / 16.0F;
List var9 = var1.getEntitiesWithinAABB(EntityMinecart.class, AxisAlignedBB.getBoundingBoxFromPool((double)((float)var2 + var8), (double)var3, (double)((float)var4 + var8), (double)((float)(var2 + 1) - var8), (double)var3 + 0.25D, (double)((float)(var4 + 1) - var8))); List var9 = var1.getEntitiesWithinAABB(EntityMinecart.class, AxisAlignedBB.getBoundingBoxFromPool((double) ((float) var2 + var8), (double) var3, (double) ((float) var4 + var8), (double) ((float) (var2 + 1) - var8), (double) var3 + 0.25D, (double) ((float) (var4 + 1) - var8)));
if(var9.size() > 0) { if (var9.size() > 0) {
var7 = true; var7 = true;
} }
if(var7 && !var6) { if (var7 && !var6) {
var1.setBlockMetadataWithNotify(var2, var3, var4, var5 | 8); var1.setBlockMetadataWithNotify(var2, var3, var4, var5 | 8);
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
var1.markBlocksDirty(var2, var3, var4, var2, var3, var4); var1.markBlocksDirty(var2, var3, var4, var2, var3, var4);
} }
if(!var7 && var6) { if (!var7 && var6) {
var1.setBlockMetadataWithNotify(var2, var3, var4, var5 & 7); var1.setBlockMetadataWithNotify(var2, var3, var4, var5 & 7);
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
var1.markBlocksDirty(var2, var3, var4, var2, var3, var4); var1.markBlocksDirty(var2, var3, var4, var2, var3, var4);
} }
if(var7) { if (var7) {
var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate()); var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate());
} }

98
src/net/minecraft/block/BlockDispenser.java
View file

@ -1,20 +1,16 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.tile.TileEntity; import net.minecraft.block.tile.TileEntity;
import net.minecraft.block.tile.TileEntityDispenser; import net.minecraft.block.tile.TileEntityDispenser;
import net.minecraft.entity.EntityArrow; import net.minecraft.entity.*;
import net.minecraft.entity.EntityEgg;
import net.minecraft.entity.EntityItem;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityPlayer;
import net.minecraft.entity.EntitySnowball;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.crafting.ItemStack; import net.minecraft.item.crafting.ItemStack;
import net.minecraft.math.MathHelper; import net.minecraft.math.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockDispenser extends BlockContainer { public class BlockDispenser extends BlockContainer {
private Random field_28032_a = new Random(); private Random field_28032_a = new Random();
@ -37,25 +33,25 @@ public class BlockDispenser extends BlockContainer {
} }
private void setDispenserDefaultDirection(World var1, int var2, int var3, int var4) { private void setDispenserDefaultDirection(World var1, int var2, int var3, int var4) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
int var5 = var1.getBlockId(var2, var3, var4 - 1); int var5 = var1.getBlockId(var2, var3, var4 - 1);
int var6 = var1.getBlockId(var2, var3, var4 + 1); int var6 = var1.getBlockId(var2, var3, var4 + 1);
int var7 = var1.getBlockId(var2 - 1, var3, var4); int var7 = var1.getBlockId(var2 - 1, var3, var4);
int var8 = var1.getBlockId(var2 + 1, var3, var4); int var8 = var1.getBlockId(var2 + 1, var3, var4);
byte var9 = 3; byte var9 = 3;
if(Block.opaqueCubeLookup[var5] && !Block.opaqueCubeLookup[var6]) { if (Block.opaqueCubeLookup[var5] && !Block.opaqueCubeLookup[var6]) {
var9 = 3; var9 = 3;
} }
if(Block.opaqueCubeLookup[var6] && !Block.opaqueCubeLookup[var5]) { if (Block.opaqueCubeLookup[var6] && !Block.opaqueCubeLookup[var5]) {
var9 = 2; var9 = 2;
} }
if(Block.opaqueCubeLookup[var7] && !Block.opaqueCubeLookup[var8]) { if (Block.opaqueCubeLookup[var7] && !Block.opaqueCubeLookup[var8]) {
var9 = 5; var9 = 5;
} }
if(Block.opaqueCubeLookup[var8] && !Block.opaqueCubeLookup[var7]) { if (Block.opaqueCubeLookup[var8] && !Block.opaqueCubeLookup[var7]) {
var9 = 4; var9 = 4;
} }
@ -68,10 +64,10 @@ public class BlockDispenser extends BlockContainer {
} }
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) { public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(var1.singleplayerWorld) { if (var1.singleplayerWorld) {
return true; return true;
} else { } else {
TileEntityDispenser var6 = (TileEntityDispenser)var1.getBlockTileEntity(var2, var3, var4); TileEntityDispenser var6 = (TileEntityDispenser) var1.getBlockTileEntity(var2, var3, var4);
var5.displayGUIDispenser(var6); var5.displayGUIDispenser(var6);
return true; return true;
} }
@ -81,49 +77,49 @@ public class BlockDispenser extends BlockContainer {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
byte var9 = 0; byte var9 = 0;
byte var10 = 0; byte var10 = 0;
if(var6 == 3) { if (var6 == 3) {
var10 = 1; var10 = 1;
} else if(var6 == 2) { } else if (var6 == 2) {
var10 = -1; var10 = -1;
} else if(var6 == 5) { } else if (var6 == 5) {
var9 = 1; var9 = 1;
} else { } else {
var9 = -1; var9 = -1;
} }
TileEntityDispenser var11 = (TileEntityDispenser)var1.getBlockTileEntity(var2, var3, var4); TileEntityDispenser var11 = (TileEntityDispenser) var1.getBlockTileEntity(var2, var3, var4);
ItemStack var12 = var11.getRandomStackFromInventory(); ItemStack var12 = var11.getRandomStackFromInventory();
double var13 = (double)var2 + (double)var9 * 0.6D + 0.5D; double var13 = (double) var2 + (double) var9 * 0.6D + 0.5D;
double var15 = (double)var3 + 0.5D; double var15 = (double) var3 + 0.5D;
double var17 = (double)var4 + (double)var10 * 0.6D + 0.5D; double var17 = (double) var4 + (double) var10 * 0.6D + 0.5D;
if(var12 == null) { if (var12 == null) {
var1.func_28097_e(1001, var2, var3, var4, 0); var1.func_28097_e(1001, var2, var3, var4, 0);
} else { } else {
if(var12.itemID == Item.arrow.shiftedIndex) { if (var12.itemID == Item.arrow.shiftedIndex) {
EntityArrow var19 = new EntityArrow(var1, var13, var15, var17); EntityArrow var19 = new EntityArrow(var1, var13, var15, var17);
var19.setArrowHeading((double)var9, (double)0.1F, (double)var10, 1.1F, 6.0F); var19.setArrowHeading((double) var9, (double) 0.1F, (double) var10, 1.1F, 6.0F);
var19.field_28012_a = true; var19.field_28012_a = true;
var1.entityJoinedWorld(var19); var1.entityJoinedWorld(var19);
var1.func_28097_e(1002, var2, var3, var4, 0); var1.func_28097_e(1002, var2, var3, var4, 0);
} else if(var12.itemID == Item.egg.shiftedIndex) { } else if (var12.itemID == Item.egg.shiftedIndex) {
EntityEgg var22 = new EntityEgg(var1, var13, var15, var17); EntityEgg var22 = new EntityEgg(var1, var13, var15, var17);
var22.func_20078_a((double)var9, (double)0.1F, (double)var10, 1.1F, 6.0F); var22.func_20078_a((double) var9, (double) 0.1F, (double) var10, 1.1F, 6.0F);
var1.entityJoinedWorld(var22); var1.entityJoinedWorld(var22);
var1.func_28097_e(1002, var2, var3, var4, 0); var1.func_28097_e(1002, var2, var3, var4, 0);
} else if(var12.itemID == Item.snowball.shiftedIndex) { } else if (var12.itemID == Item.snowball.shiftedIndex) {
EntitySnowball var23 = new EntitySnowball(var1, var13, var15, var17); EntitySnowball var23 = new EntitySnowball(var1, var13, var15, var17);
var23.func_6141_a((double)var9, (double)0.1F, (double)var10, 1.1F, 6.0F); var23.func_6141_a((double) var9, (double) 0.1F, (double) var10, 1.1F, 6.0F);
var1.entityJoinedWorld(var23); var1.entityJoinedWorld(var23);
var1.func_28097_e(1002, var2, var3, var4, 0); var1.func_28097_e(1002, var2, var3, var4, 0);
} else { } else {
EntityItem var24 = new EntityItem(var1, var13, var15 - 0.3D, var17, var12); EntityItem var24 = new EntityItem(var1, var13, var15 - 0.3D, var17, var12);
double var20 = var5.nextDouble() * 0.1D + 0.2D; double var20 = var5.nextDouble() * 0.1D + 0.2D;
var24.motionX = (double)var9 * var20; var24.motionX = (double) var9 * var20;
var24.motionY = (double)0.2F; var24.motionY = (double) 0.2F;
var24.motionZ = (double)var10 * var20; var24.motionZ = (double) var10 * var20;
var24.motionX += var5.nextGaussian() * (double)0.0075F * 6.0D; var24.motionX += var5.nextGaussian() * (double) 0.0075F * 6.0D;
var24.motionY += var5.nextGaussian() * (double)0.0075F * 6.0D; var24.motionY += var5.nextGaussian() * (double) 0.0075F * 6.0D;
var24.motionZ += var5.nextGaussian() * (double)0.0075F * 6.0D; var24.motionZ += var5.nextGaussian() * (double) 0.0075F * 6.0D;
var1.entityJoinedWorld(var24); var1.entityJoinedWorld(var24);
var1.func_28097_e(1000, var2, var3, var4, 0); var1.func_28097_e(1000, var2, var3, var4, 0);
} }
@ -134,9 +130,9 @@ public class BlockDispenser extends BlockContainer {
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(var5 > 0 && Block.blocksList[var5].canProvidePower()) { if (var5 > 0 && Block.blocksList[var5].canProvidePower()) {
boolean var6 = var1.isBlockIndirectlyGettingPowered(var2, var3, var4) || var1.isBlockIndirectlyGettingPowered(var2, var3 + 1, var4); boolean var6 = var1.isBlockIndirectlyGettingPowered(var2, var3, var4) || var1.isBlockIndirectlyGettingPowered(var2, var3 + 1, var4);
if(var6) { if (var6) {
var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate()); var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate());
} }
} }
@ -144,7 +140,7 @@ public class BlockDispenser extends BlockContainer {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(var1.isBlockIndirectlyGettingPowered(var2, var3, var4) || var1.isBlockIndirectlyGettingPowered(var2, var3 + 1, var4)) { if (var1.isBlockIndirectlyGettingPowered(var2, var3, var4) || var1.isBlockIndirectlyGettingPowered(var2, var3 + 1, var4)) {
this.dispenseItem(var1, var2, var3, var4, var5); this.dispenseItem(var1, var2, var3, var4, var5);
} }
@ -155,47 +151,47 @@ public class BlockDispenser extends BlockContainer {
} }
public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) { public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) {
int var6 = MathHelper.floor_double((double)(var5.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int var6 = MathHelper.floor_double((double) (var5.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
if(var6 == 0) { if (var6 == 0) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 2); var1.setBlockMetadataWithNotify(var2, var3, var4, 2);
} }
if(var6 == 1) { if (var6 == 1) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 5); var1.setBlockMetadataWithNotify(var2, var3, var4, 5);
} }
if(var6 == 2) { if (var6 == 2) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 3); var1.setBlockMetadataWithNotify(var2, var3, var4, 3);
} }
if(var6 == 3) { if (var6 == 3) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 4); var1.setBlockMetadataWithNotify(var2, var3, var4, 4);
} }
} }
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
TileEntityDispenser var5 = (TileEntityDispenser)var1.getBlockTileEntity(var2, var3, var4); TileEntityDispenser var5 = (TileEntityDispenser) var1.getBlockTileEntity(var2, var3, var4);
for(int var6 = 0; var6 < var5.getSizeInventory(); ++var6) { for (int var6 = 0; var6 < var5.getSizeInventory(); ++var6) {
ItemStack var7 = var5.getStackInSlot(var6); ItemStack var7 = var5.getStackInSlot(var6);
if(var7 != null) { if (var7 != null) {
float var8 = this.field_28032_a.nextFloat() * 0.8F + 0.1F; float var8 = this.field_28032_a.nextFloat() * 0.8F + 0.1F;
float var9 = this.field_28032_a.nextFloat() * 0.8F + 0.1F; float var9 = this.field_28032_a.nextFloat() * 0.8F + 0.1F;
float var10 = this.field_28032_a.nextFloat() * 0.8F + 0.1F; float var10 = this.field_28032_a.nextFloat() * 0.8F + 0.1F;
while(var7.stackSize > 0) { while (var7.stackSize > 0) {
int var11 = this.field_28032_a.nextInt(21) + 10; int var11 = this.field_28032_a.nextInt(21) + 10;
if(var11 > var7.stackSize) { if (var11 > var7.stackSize) {
var11 = var7.stackSize; var11 = var7.stackSize;
} }
var7.stackSize -= var11; var7.stackSize -= var11;
EntityItem var12 = new EntityItem(var1, (double)((float)var2 + var8), (double)((float)var3 + var9), (double)((float)var4 + var10), new ItemStack(var7.itemID, var11, var7.getItemDamage())); EntityItem var12 = new EntityItem(var1, (double) ((float) var2 + var8), (double) ((float) var3 + var9), (double) ((float) var4 + var10), new ItemStack(var7.itemID, var11, var7.getItemDamage()));
float var13 = 0.05F; float var13 = 0.05F;
var12.motionX = (double)((float)this.field_28032_a.nextGaussian() * var13); var12.motionX = (double) ((float) this.field_28032_a.nextGaussian() * var13);
var12.motionY = (double)((float)this.field_28032_a.nextGaussian() * var13 + 0.2F); var12.motionY = (double) ((float) this.field_28032_a.nextGaussian() * var13 + 0.2F);
var12.motionZ = (double)((float)this.field_28032_a.nextGaussian() * var13); var12.motionZ = (double) ((float) this.field_28032_a.nextGaussian() * var13);
var1.entityJoinedWorld(var12); var1.entityJoinedWorld(var12);
} }
} }

55
src/net/minecraft/block/BlockDoor.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -10,11 +9,13 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockDoor extends Block { public class BlockDoor extends Block {
protected BlockDoor(int var1, Material var2) { protected BlockDoor(int var1, Material var2) {
super(var1, var2); super(var1, var2);
this.blockIndexInTexture = 97; this.blockIndexInTexture = 97;
if(var2 == Material.iron) { if (var2 == Material.iron) {
++this.blockIndexInTexture; ++this.blockIndexInTexture;
} }
@ -24,15 +25,15 @@ public class BlockDoor extends Block {
} }
public int getBlockTextureFromSideAndMetadata(int var1, int var2) { public int getBlockTextureFromSideAndMetadata(int var1, int var2) {
if(var1 != 0 && var1 != 1) { if (var1 != 0 && var1 != 1) {
int var3 = this.func_271_d(var2); int var3 = this.func_271_d(var2);
if((var3 == 0 || var3 == 2) ^ var1 <= 3) { if ((var3 == 0 || var3 == 2) ^ var1 <= 3) {
return this.blockIndexInTexture; return this.blockIndexInTexture;
} else { } else {
int var4 = var3 / 2 + (var1 & 1 ^ var3); int var4 = var3 / 2 + (var1 & 1 ^ var3);
var4 += (var2 & 4) / 4; var4 += (var2 & 4) / 4;
int var5 = this.blockIndexInTexture - (var2 & 8) * 2; int var5 = this.blockIndexInTexture - (var2 & 8) * 2;
if((var4 & 1) != 0) { if ((var4 & 1) != 0) {
var5 = -var5; var5 = -var5;
} }
@ -63,19 +64,19 @@ public class BlockDoor extends Block {
public void func_273_b(int var1) { public void func_273_b(int var1) {
float var2 = 3.0F / 16.0F; float var2 = 3.0F / 16.0F;
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 2.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 2.0F, 1.0F);
if(var1 == 0) { if (var1 == 0) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var2); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var2);
} }
if(var1 == 1) { if (var1 == 1) {
this.setBlockBounds(1.0F - var2, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); this.setBlockBounds(1.0F - var2, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
} }
if(var1 == 2) { if (var1 == 2) {
this.setBlockBounds(0.0F, 0.0F, 1.0F - var2, 1.0F, 1.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 1.0F - var2, 1.0F, 1.0F, 1.0F);
} }
if(var1 == 3) { if (var1 == 3) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, var2, 1.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, var2, 1.0F, 1.0F);
} }
@ -86,18 +87,18 @@ public class BlockDoor extends Block {
} }
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) { public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(this.blockMaterial == Material.iron) { if (this.blockMaterial == Material.iron) {
return true; return true;
} else { } else {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if((var6 & 8) != 0) { if ((var6 & 8) != 0) {
if(var1.getBlockId(var2, var3 - 1, var4) == this.blockID) { if (var1.getBlockId(var2, var3 - 1, var4) == this.blockID) {
this.blockActivated(var1, var2, var3 - 1, var4, var5); this.blockActivated(var1, var2, var3 - 1, var4, var5);
} }
return true; return true;
} else { } else {
if(var1.getBlockId(var2, var3 + 1, var4) == this.blockID) { if (var1.getBlockId(var2, var3 + 1, var4) == this.blockID) {
var1.setBlockMetadataWithNotify(var2, var3 + 1, var4, (var6 ^ 4) + 8); var1.setBlockMetadataWithNotify(var2, var3 + 1, var4, (var6 ^ 4) + 8);
} }
@ -111,55 +112,55 @@ public class BlockDoor extends Block {
public void func_272_a(World var1, int var2, int var3, int var4, boolean var5) { public void func_272_a(World var1, int var2, int var3, int var4, boolean var5) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if((var6 & 8) != 0) { if ((var6 & 8) != 0) {
if(var1.getBlockId(var2, var3 - 1, var4) == this.blockID) { if (var1.getBlockId(var2, var3 - 1, var4) == this.blockID) {
this.func_272_a(var1, var2, var3 - 1, var4, var5); this.func_272_a(var1, var2, var3 - 1, var4, var5);
} }
} else { } else {
boolean var7 = (var1.getBlockMetadata(var2, var3, var4) & 4) > 0; boolean var7 = (var1.getBlockMetadata(var2, var3, var4) & 4) > 0;
if(var7 != var5) { if (var7 != var5) {
if(var1.getBlockId(var2, var3 + 1, var4) == this.blockID) { if (var1.getBlockId(var2, var3 + 1, var4) == this.blockID) {
var1.setBlockMetadataWithNotify(var2, var3 + 1, var4, (var6 ^ 4) + 8); var1.setBlockMetadataWithNotify(var2, var3 + 1, var4, (var6 ^ 4) + 8);
} }
var1.setBlockMetadataWithNotify(var2, var3, var4, var6 ^ 4); var1.setBlockMetadataWithNotify(var2, var3, var4, var6 ^ 4);
var1.markBlocksDirty(var2, var3 - 1, var4, var2, var3, var4); var1.markBlocksDirty(var2, var3 - 1, var4, var2, var3, var4);
var1.func_28101_a((EntityPlayer)null, 1003, var2, var3, var4, 0); var1.func_28101_a((EntityPlayer) null, 1003, var2, var3, var4, 0);
} }
} }
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if((var6 & 8) != 0) { if ((var6 & 8) != 0) {
if(var1.getBlockId(var2, var3 - 1, var4) != this.blockID) { if (var1.getBlockId(var2, var3 - 1, var4) != this.blockID) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
if(var5 > 0 && Block.blocksList[var5].canProvidePower()) { if (var5 > 0 && Block.blocksList[var5].canProvidePower()) {
this.onNeighborBlockChange(var1, var2, var3 - 1, var4, var5); this.onNeighborBlockChange(var1, var2, var3 - 1, var4, var5);
} }
} else { } else {
boolean var7 = false; boolean var7 = false;
if(var1.getBlockId(var2, var3 + 1, var4) != this.blockID) { if (var1.getBlockId(var2, var3 + 1, var4) != this.blockID) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2, var3 - 1, var4)) { if (!var1.isBlockNormalCube(var2, var3 - 1, var4)) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
var7 = true; var7 = true;
if(var1.getBlockId(var2, var3 + 1, var4) == this.blockID) { if (var1.getBlockId(var2, var3 + 1, var4) == this.blockID) {
var1.setBlockWithNotify(var2, var3 + 1, var4, 0); var1.setBlockWithNotify(var2, var3 + 1, var4, 0);
} }
} }
if(var7) { if (var7) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
this.dropBlockAsItem(var1, var2, var3, var4, var6); this.dropBlockAsItem(var1, var2, var3, var4, var6);
} }
} else if(var5 > 0 && Block.blocksList[var5].canProvidePower()) { } else if (var5 > 0 && Block.blocksList[var5].canProvidePower()) {
boolean var8 = var1.isBlockIndirectlyGettingPowered(var2, var3, var4) || var1.isBlockIndirectlyGettingPowered(var2, var3 + 1, var4); boolean var8 = var1.isBlockIndirectlyGettingPowered(var2, var3, var4) || var1.isBlockIndirectlyGettingPowered(var2, var3 + 1, var4);
this.func_272_a(var1, var2, var3, var4, var8); this.func_272_a(var1, var2, var3, var4, var8);
} }

31
src/net/minecraft/block/BlockFarmland.java
View file

@ -1,11 +1,12 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockFarmland extends Block { public class BlockFarmland extends Block {
protected BlockFarmland(int var1) { protected BlockFarmland(int var1) {
super(var1, Material.ground); super(var1, Material.ground);
@ -16,7 +17,7 @@ public class BlockFarmland extends Block {
} }
public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) { public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) {
return AxisAlignedBB.getBoundingBoxFromPool((double)(var2 + 0), (double)(var3 + 0), (double)(var4 + 0), (double)(var2 + 1), (double)(var3 + 1), (double)(var4 + 1)); return AxisAlignedBB.getBoundingBoxFromPool((double) (var2 + 0), (double) (var3 + 0), (double) (var4 + 0), (double) (var2 + 1), (double) (var3 + 1), (double) (var4 + 1));
} }
public boolean isOpaqueCube() { public boolean isOpaqueCube() {
@ -32,12 +33,12 @@ public class BlockFarmland extends Block {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(var5.nextInt(5) == 0) { if (var5.nextInt(5) == 0) {
if(!this.isWaterNearby(var1, var2, var3, var4) && !var1.canLightningStrikeAt(var2, var3 + 1, var4)) { if (!this.isWaterNearby(var1, var2, var3, var4) && !var1.canLightningStrikeAt(var2, var3 + 1, var4)) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if(var6 > 0) { if (var6 > 0) {
var1.setBlockMetadataWithNotify(var2, var3, var4, var6 - 1); var1.setBlockMetadataWithNotify(var2, var3, var4, var6 - 1);
} else if(!this.isCropsNearby(var1, var2, var3, var4)) { } else if (!this.isCropsNearby(var1, var2, var3, var4)) {
var1.setBlockWithNotify(var2, var3, var4, Block.dirt.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.dirt.blockID);
} }
} else { } else {
@ -48,7 +49,7 @@ public class BlockFarmland extends Block {
} }
public void onEntityWalking(World var1, int var2, int var3, int var4, Entity var5) { public void onEntityWalking(World var1, int var2, int var3, int var4, Entity var5) {
if(var1.rand.nextInt(4) == 0) { if (var1.rand.nextInt(4) == 0) {
var1.setBlockWithNotify(var2, var3, var4, Block.dirt.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.dirt.blockID);
} }
@ -57,9 +58,9 @@ public class BlockFarmland extends Block {
private boolean isCropsNearby(World var1, int var2, int var3, int var4) { private boolean isCropsNearby(World var1, int var2, int var3, int var4) {
byte var5 = 0; byte var5 = 0;
for(int var6 = var2 - var5; var6 <= var2 + var5; ++var6) { for (int var6 = var2 - var5; var6 <= var2 + var5; ++var6) {
for(int var7 = var4 - var5; var7 <= var4 + var5; ++var7) { for (int var7 = var4 - var5; var7 <= var4 + var5; ++var7) {
if(var1.getBlockId(var6, var3 + 1, var7) == Block.crops.blockID) { if (var1.getBlockId(var6, var3 + 1, var7) == Block.crops.blockID) {
return true; return true;
} }
} }
@ -69,10 +70,10 @@ public class BlockFarmland extends Block {
} }
private boolean isWaterNearby(World var1, int var2, int var3, int var4) { private boolean isWaterNearby(World var1, int var2, int var3, int var4) {
for(int var5 = var2 - 4; var5 <= var2 + 4; ++var5) { for (int var5 = var2 - 4; var5 <= var2 + 4; ++var5) {
for(int var6 = var3; var6 <= var3 + 1; ++var6) { for (int var6 = var3; var6 <= var3 + 1; ++var6) {
for(int var7 = var4 - 4; var7 <= var4 + 4; ++var7) { for (int var7 = var4 - 4; var7 <= var4 + 4; ++var7) {
if(var1.getBlockMaterial(var5, var6, var7) == Material.water) { if (var1.getBlockMaterial(var5, var6, var7) == Material.water) {
return true; return true;
} }
} }
@ -85,7 +86,7 @@ public class BlockFarmland extends Block {
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
super.onNeighborBlockChange(var1, var2, var3, var4, var5); super.onNeighborBlockChange(var1, var2, var3, var4, var5);
Material var6 = var1.getBlockMaterial(var2, var3 + 1, var4); Material var6 = var1.getBlockMaterial(var2, var3 + 1, var4);
if(var6.isSolid()) { if (var6.isSolid()) {
var1.setBlockWithNotify(var2, var3, var4, Block.dirt.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.dirt.blockID);
} }

2
src/net/minecraft/block/BlockFence.java
View file

@ -14,7 +14,7 @@ public class BlockFence extends Block {
} }
public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) { public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) {
return AxisAlignedBB.getBoundingBoxFromPool((double)var2, (double)var3, (double)var4, (double)(var2 + 1), (double)((float)var3 + 1.5F), (double)(var4 + 1)); return AxisAlignedBB.getBoundingBoxFromPool((double) var2, (double) var3, (double) var4, (double) (var2 + 1), (double) ((float) var3 + 1.5F), (double) (var4 + 1));
} }
public boolean isOpaqueCube() { public boolean isOpaqueCube() {

47
src/net/minecraft/block/BlockFire.java
View file

@ -1,11 +1,12 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockFire extends Block { public class BlockFire extends Block {
private int[] chanceToEncourageFire = new int[256]; private int[] chanceToEncourageFire = new int[256];
private int[] abilityToCatchFire = new int[256]; private int[] abilityToCatchFire = new int[256];
@ -54,23 +55,23 @@ public class BlockFire extends Block {
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
boolean var6 = var1.getBlockId(var2, var3 - 1, var4) == Block.bloodStone.blockID; boolean var6 = var1.getBlockId(var2, var3 - 1, var4) == Block.bloodStone.blockID;
if(!this.canPlaceBlockAt(var1, var2, var3, var4)) { if (!this.canPlaceBlockAt(var1, var2, var3, var4)) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
if(var6 || !var1.func_27068_v() || !var1.canLightningStrikeAt(var2, var3, var4) && !var1.canLightningStrikeAt(var2 - 1, var3, var4) && !var1.canLightningStrikeAt(var2 + 1, var3, var4) && !var1.canLightningStrikeAt(var2, var3, var4 - 1) && !var1.canLightningStrikeAt(var2, var3, var4 + 1)) { if (var6 || !var1.func_27068_v() || !var1.canLightningStrikeAt(var2, var3, var4) && !var1.canLightningStrikeAt(var2 - 1, var3, var4) && !var1.canLightningStrikeAt(var2 + 1, var3, var4) && !var1.canLightningStrikeAt(var2, var3, var4 - 1) && !var1.canLightningStrikeAt(var2, var3, var4 + 1)) {
int var7 = var1.getBlockMetadata(var2, var3, var4); int var7 = var1.getBlockMetadata(var2, var3, var4);
if(var7 < 15) { if (var7 < 15) {
var1.setBlockMetadata(var2, var3, var4, var7 + var5.nextInt(3) / 2); var1.setBlockMetadata(var2, var3, var4, var7 + var5.nextInt(3) / 2);
} }
var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate()); var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate());
if(!var6 && !this.func_268_g(var1, var2, var3, var4)) { if (!var6 && !this.func_268_g(var1, var2, var3, var4)) {
if(!var1.isBlockNormalCube(var2, var3 - 1, var4) || var7 > 3) { if (!var1.isBlockNormalCube(var2, var3 - 1, var4) || var7 > 3) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
} else if(!var6 && !this.canBlockCatchFire(var1, var2, var3 - 1, var4) && var7 == 15 && var5.nextInt(4) == 0) { } else if (!var6 && !this.canBlockCatchFire(var1, var2, var3 - 1, var4) && var7 == 15 && var5.nextInt(4) == 0) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} else { } else {
this.tryToCatchBlockOnFire(var1, var2 + 1, var3, var4, 300, var5, var7); this.tryToCatchBlockOnFire(var1, var2 + 1, var3, var4, 300, var5, var7);
@ -80,21 +81,21 @@ public class BlockFire extends Block {
this.tryToCatchBlockOnFire(var1, var2, var3, var4 - 1, 300, var5, var7); this.tryToCatchBlockOnFire(var1, var2, var3, var4 - 1, 300, var5, var7);
this.tryToCatchBlockOnFire(var1, var2, var3, var4 + 1, 300, var5, var7); this.tryToCatchBlockOnFire(var1, var2, var3, var4 + 1, 300, var5, var7);
for(int var8 = var2 - 1; var8 <= var2 + 1; ++var8) { for (int var8 = var2 - 1; var8 <= var2 + 1; ++var8) {
for(int var9 = var4 - 1; var9 <= var4 + 1; ++var9) { for (int var9 = var4 - 1; var9 <= var4 + 1; ++var9) {
for(int var10 = var3 - 1; var10 <= var3 + 4; ++var10) { for (int var10 = var3 - 1; var10 <= var3 + 4; ++var10) {
if(var8 != var2 || var10 != var3 || var9 != var4) { if (var8 != var2 || var10 != var3 || var9 != var4) {
int var11 = 100; int var11 = 100;
if(var10 > var3 + 1) { if (var10 > var3 + 1) {
var11 += (var10 - (var3 + 1)) * 100; var11 += (var10 - (var3 + 1)) * 100;
} }
int var12 = this.getChanceOfNeighborsEncouragingFire(var1, var8, var10, var9); int var12 = this.getChanceOfNeighborsEncouragingFire(var1, var8, var10, var9);
if(var12 > 0) { if (var12 > 0) {
int var13 = (var12 + 40) / (var7 + 30); int var13 = (var12 + 40) / (var7 + 30);
if(var13 > 0 && var5.nextInt(var11) <= var13 && (!var1.func_27068_v() || !var1.canLightningStrikeAt(var8, var10, var9)) && !var1.canLightningStrikeAt(var8 - 1, var10, var4) && !var1.canLightningStrikeAt(var8 + 1, var10, var9) && !var1.canLightningStrikeAt(var8, var10, var9 - 1) && !var1.canLightningStrikeAt(var8, var10, var9 + 1)) { if (var13 > 0 && var5.nextInt(var11) <= var13 && (!var1.func_27068_v() || !var1.canLightningStrikeAt(var8, var10, var9)) && !var1.canLightningStrikeAt(var8 - 1, var10, var4) && !var1.canLightningStrikeAt(var8 + 1, var10, var9) && !var1.canLightningStrikeAt(var8, var10, var9 - 1) && !var1.canLightningStrikeAt(var8, var10, var9 + 1)) {
int var14 = var7 + var5.nextInt(5) / 4; int var14 = var7 + var5.nextInt(5) / 4;
if(var14 > 15) { if (var14 > 15) {
var14 = 15; var14 = 15;
} }
@ -114,11 +115,11 @@ public class BlockFire extends Block {
private void tryToCatchBlockOnFire(World var1, int var2, int var3, int var4, int var5, Random var6, int var7) { private void tryToCatchBlockOnFire(World var1, int var2, int var3, int var4, int var5, Random var6, int var7) {
int var8 = this.abilityToCatchFire[var1.getBlockId(var2, var3, var4)]; int var8 = this.abilityToCatchFire[var1.getBlockId(var2, var3, var4)];
if(var6.nextInt(var5) < var8) { if (var6.nextInt(var5) < var8) {
boolean var9 = var1.getBlockId(var2, var3, var4) == Block.tnt.blockID; boolean var9 = var1.getBlockId(var2, var3, var4) == Block.tnt.blockID;
if(var6.nextInt(var7 + 10) < 5 && !var1.canLightningStrikeAt(var2, var3, var4)) { if (var6.nextInt(var7 + 10) < 5 && !var1.canLightningStrikeAt(var2, var3, var4)) {
int var10 = var7 + var6.nextInt(5) / 4; int var10 = var7 + var6.nextInt(5) / 4;
if(var10 > 15) { if (var10 > 15) {
var10 = 15; var10 = 15;
} }
@ -127,7 +128,7 @@ public class BlockFire extends Block {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
if(var9) { if (var9) {
Block.tnt.onBlockDestroyedByPlayer(var1, var2, var3, var4, 1); Block.tnt.onBlockDestroyedByPlayer(var1, var2, var3, var4, 1);
} }
} }
@ -140,7 +141,7 @@ public class BlockFire extends Block {
private int getChanceOfNeighborsEncouragingFire(World var1, int var2, int var3, int var4) { private int getChanceOfNeighborsEncouragingFire(World var1, int var2, int var3, int var4) {
byte var5 = 0; byte var5 = 0;
if(!var1.isAirBlock(var2, var3, var4)) { if (!var1.isAirBlock(var2, var3, var4)) {
return 0; return 0;
} else { } else {
int var6 = this.getChanceToEncourageFire(var1, var2 + 1, var3, var4, var5); int var6 = this.getChanceToEncourageFire(var1, var2 + 1, var3, var4, var5);
@ -171,14 +172,14 @@ public class BlockFire extends Block {
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(!var1.isBlockNormalCube(var2, var3 - 1, var4) && !this.func_268_g(var1, var2, var3, var4)) { if (!var1.isBlockNormalCube(var2, var3 - 1, var4) && !this.func_268_g(var1, var2, var3, var4)) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
} }
public void onBlockAdded(World var1, int var2, int var3, int var4) { public void onBlockAdded(World var1, int var2, int var3, int var4) {
if(var1.getBlockId(var2, var3 - 1, var4) != Block.obsidian.blockID || !Block.portal.tryToCreatePortal(var1, var2, var3, var4)) { if (var1.getBlockId(var2, var3 - 1, var4) != Block.obsidian.blockID || !Block.portal.tryToCreatePortal(var1, var2, var3, var4)) {
if(!var1.isBlockNormalCube(var2, var3 - 1, var4) && !this.func_268_g(var1, var2, var3, var4)) { if (!var1.isBlockNormalCube(var2, var3 - 1, var4) && !this.func_268_g(var1, var2, var3, var4)) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} else { } else {
var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate()); var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate());

5
src/net/minecraft/block/BlockFlower.java
View file

@ -1,10 +1,11 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockFlower extends Block { public class BlockFlower extends Block {
protected BlockFlower(int var1, int var2) { protected BlockFlower(int var1, int var2) {
super(var1, Material.plants); super(var1, Material.plants);
@ -32,7 +33,7 @@ public class BlockFlower extends Block {
} }
protected final void func_276_g(World var1, int var2, int var3, int var4) { protected final void func_276_g(World var1, int var2, int var3, int var4) {
if(!this.canBlockStay(var1, var2, var3, var4)) { if (!this.canBlockStay(var1, var2, var3, var4)) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }

103
src/net/minecraft/block/BlockFlowing.java
View file

@ -1,9 +1,10 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockFlowing extends BlockFluid { public class BlockFlowing extends BlockFluid {
int field_659_a = 0; int field_659_a = 0;
boolean[] field_658_b = new boolean[4]; boolean[] field_658_b = new boolean[4];
@ -23,13 +24,13 @@ public class BlockFlowing extends BlockFluid {
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
int var6 = this.func_301_g(var1, var2, var3, var4); int var6 = this.func_301_g(var1, var2, var3, var4);
byte var7 = 1; byte var7 = 1;
if(this.blockMaterial == Material.lava && !var1.worldProvider.isHellWorld) { if (this.blockMaterial == Material.lava && !var1.worldProvider.isHellWorld) {
var7 = 2; var7 = 2;
} }
boolean var8 = true; boolean var8 = true;
int var10; int var10;
if(var6 > 0) { if (var6 > 0) {
byte var9 = -100; byte var9 = -100;
this.field_659_a = 0; this.field_659_a = 0;
int var12 = this.func_307_e(var1, var2 - 1, var3, var4, var9); int var12 = this.func_307_e(var1, var2 - 1, var3, var4, var9);
@ -37,78 +38,78 @@ public class BlockFlowing extends BlockFluid {
var12 = this.func_307_e(var1, var2, var3, var4 - 1, var12); var12 = this.func_307_e(var1, var2, var3, var4 - 1, var12);
var12 = this.func_307_e(var1, var2, var3, var4 + 1, var12); var12 = this.func_307_e(var1, var2, var3, var4 + 1, var12);
var10 = var12 + var7; var10 = var12 + var7;
if(var10 >= 8 || var12 < 0) { if (var10 >= 8 || var12 < 0) {
var10 = -1; var10 = -1;
} }
if(this.func_301_g(var1, var2, var3 + 1, var4) >= 0) { if (this.func_301_g(var1, var2, var3 + 1, var4) >= 0) {
int var11 = this.func_301_g(var1, var2, var3 + 1, var4); int var11 = this.func_301_g(var1, var2, var3 + 1, var4);
if(var11 >= 8) { if (var11 >= 8) {
var10 = var11; var10 = var11;
} else { } else {
var10 = var11 + 8; var10 = var11 + 8;
} }
} }
if(this.field_659_a >= 2 && this.blockMaterial == Material.water) { if (this.field_659_a >= 2 && this.blockMaterial == Material.water) {
if(var1.getBlockMaterial(var2, var3 - 1, var4).isSolid()) { if (var1.getBlockMaterial(var2, var3 - 1, var4).isSolid()) {
var10 = 0; var10 = 0;
} else if(var1.getBlockMaterial(var2, var3 - 1, var4) == this.blockMaterial && var1.getBlockMetadata(var2, var3, var4) == 0) { } else if (var1.getBlockMaterial(var2, var3 - 1, var4) == this.blockMaterial && var1.getBlockMetadata(var2, var3, var4) == 0) {
var10 = 0; var10 = 0;
} }
} }
if(this.blockMaterial == Material.lava && var6 < 8 && var10 < 8 && var10 > var6 && var5.nextInt(4) != 0) { if (this.blockMaterial == Material.lava && var6 < 8 && var10 < 8 && var10 > var6 && var5.nextInt(4) != 0) {
var10 = var6; var10 = var6;
var8 = false; var8 = false;
} }
if(var10 != var6) { if (var10 != var6) {
var6 = var10; var6 = var10;
if(var10 < 0) { if (var10 < 0) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} else { } else {
var1.setBlockMetadataWithNotify(var2, var3, var4, var10); var1.setBlockMetadataWithNotify(var2, var3, var4, var10);
var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate()); var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate());
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
} }
} else if(var8) { } else if (var8) {
this.func_30004_i(var1, var2, var3, var4); this.func_30004_i(var1, var2, var3, var4);
} }
} else { } else {
this.func_30004_i(var1, var2, var3, var4); this.func_30004_i(var1, var2, var3, var4);
} }
if(this.func_312_l(var1, var2, var3 - 1, var4)) { if (this.func_312_l(var1, var2, var3 - 1, var4)) {
if(var6 >= 8) { if (var6 >= 8) {
var1.setBlockAndMetadataWithNotify(var2, var3 - 1, var4, this.blockID, var6); var1.setBlockAndMetadataWithNotify(var2, var3 - 1, var4, this.blockID, var6);
} else { } else {
var1.setBlockAndMetadataWithNotify(var2, var3 - 1, var4, this.blockID, var6 + 8); var1.setBlockAndMetadataWithNotify(var2, var3 - 1, var4, this.blockID, var6 + 8);
} }
} else if(var6 >= 0 && (var6 == 0 || this.func_309_k(var1, var2, var3 - 1, var4))) { } else if (var6 >= 0 && (var6 == 0 || this.func_309_k(var1, var2, var3 - 1, var4))) {
boolean[] var13 = this.func_4035_j(var1, var2, var3, var4); boolean[] var13 = this.func_4035_j(var1, var2, var3, var4);
var10 = var6 + var7; var10 = var6 + var7;
if(var6 >= 8) { if (var6 >= 8) {
var10 = 1; var10 = 1;
} }
if(var10 >= 8) { if (var10 >= 8) {
return; return;
} }
if(var13[0]) { if (var13[0]) {
this.func_311_f(var1, var2 - 1, var3, var4, var10); this.func_311_f(var1, var2 - 1, var3, var4, var10);
} }
if(var13[1]) { if (var13[1]) {
this.func_311_f(var1, var2 + 1, var3, var4, var10); this.func_311_f(var1, var2 + 1, var3, var4, var10);
} }
if(var13[2]) { if (var13[2]) {
this.func_311_f(var1, var2, var3, var4 - 1, var10); this.func_311_f(var1, var2, var3, var4 - 1, var10);
} }
if(var13[3]) { if (var13[3]) {
this.func_311_f(var1, var2, var3, var4 + 1, var10); this.func_311_f(var1, var2, var3, var4 + 1, var10);
} }
} }
@ -116,10 +117,10 @@ public class BlockFlowing extends BlockFluid {
} }
private void func_311_f(World var1, int var2, int var3, int var4, int var5) { private void func_311_f(World var1, int var2, int var3, int var4, int var5) {
if(this.func_312_l(var1, var2, var3, var4)) { if (this.func_312_l(var1, var2, var3, var4)) {
int var6 = var1.getBlockId(var2, var3, var4); int var6 = var1.getBlockId(var2, var3, var4);
if(var6 > 0) { if (var6 > 0) {
if(this.blockMaterial == Material.lava) { if (this.blockMaterial == Material.lava) {
this.func_300_h(var1, var2, var3, var4); this.func_300_h(var1, var2, var3, var4);
} else { } else {
Block.blocksList[var6].dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); Block.blocksList[var6].dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
@ -134,34 +135,34 @@ public class BlockFlowing extends BlockFluid {
private int func_4034_a(World var1, int var2, int var3, int var4, int var5, int var6) { private int func_4034_a(World var1, int var2, int var3, int var4, int var5, int var6) {
int var7 = 1000; int var7 = 1000;
for(int var8 = 0; var8 < 4; ++var8) { for (int var8 = 0; var8 < 4; ++var8) {
if((var8 != 0 || var6 != 1) && (var8 != 1 || var6 != 0) && (var8 != 2 || var6 != 3) && (var8 != 3 || var6 != 2)) { if ((var8 != 0 || var6 != 1) && (var8 != 1 || var6 != 0) && (var8 != 2 || var6 != 3) && (var8 != 3 || var6 != 2)) {
int var9 = var2; int var9 = var2;
int var11 = var4; int var11 = var4;
if(var8 == 0) { if (var8 == 0) {
var9 = var2 - 1; var9 = var2 - 1;
} }
if(var8 == 1) { if (var8 == 1) {
++var9; ++var9;
} }
if(var8 == 2) { if (var8 == 2) {
var11 = var4 - 1; var11 = var4 - 1;
} }
if(var8 == 3) { if (var8 == 3) {
++var11; ++var11;
} }
if(!this.func_309_k(var1, var9, var3, var11) && (var1.getBlockMaterial(var9, var3, var11) != this.blockMaterial || var1.getBlockMetadata(var9, var3, var11) != 0)) { if (!this.func_309_k(var1, var9, var3, var11) && (var1.getBlockMaterial(var9, var3, var11) != this.blockMaterial || var1.getBlockMetadata(var9, var3, var11) != 0)) {
if(!this.func_309_k(var1, var9, var3 - 1, var11)) { if (!this.func_309_k(var1, var9, var3 - 1, var11)) {
return var5; return var5;
} }
if(var5 < 4) { if (var5 < 4) {
int var12 = this.func_4034_a(var1, var9, var3, var11, var5 + 1, var8); int var12 = this.func_4034_a(var1, var9, var3, var11, var5 + 1, var8);
if(var12 < var7) { if (var12 < var7) {
var7 = var12; var7 = var12;
} }
} }
@ -175,28 +176,28 @@ public class BlockFlowing extends BlockFluid {
private boolean[] func_4035_j(World var1, int var2, int var3, int var4) { private boolean[] func_4035_j(World var1, int var2, int var3, int var4) {
int var5; int var5;
int var6; int var6;
for(var5 = 0; var5 < 4; ++var5) { for (var5 = 0; var5 < 4; ++var5) {
this.field_660_c[var5] = 1000; this.field_660_c[var5] = 1000;
var6 = var2; var6 = var2;
int var8 = var4; int var8 = var4;
if(var5 == 0) { if (var5 == 0) {
var6 = var2 - 1; var6 = var2 - 1;
} }
if(var5 == 1) { if (var5 == 1) {
++var6; ++var6;
} }
if(var5 == 2) { if (var5 == 2) {
var8 = var4 - 1; var8 = var4 - 1;
} }
if(var5 == 3) { if (var5 == 3) {
++var8; ++var8;
} }
if(!this.func_309_k(var1, var6, var3, var8) && (var1.getBlockMaterial(var6, var3, var8) != this.blockMaterial || var1.getBlockMetadata(var6, var3, var8) != 0)) { if (!this.func_309_k(var1, var6, var3, var8) && (var1.getBlockMaterial(var6, var3, var8) != this.blockMaterial || var1.getBlockMetadata(var6, var3, var8) != 0)) {
if(!this.func_309_k(var1, var6, var3 - 1, var8)) { if (!this.func_309_k(var1, var6, var3 - 1, var8)) {
this.field_660_c[var5] = 0; this.field_660_c[var5] = 0;
} else { } else {
this.field_660_c[var5] = this.func_4034_a(var1, var6, var3, var8, 1, var5); this.field_660_c[var5] = this.func_4034_a(var1, var6, var3, var8, 1, var5);
@ -206,13 +207,13 @@ public class BlockFlowing extends BlockFluid {
var5 = this.field_660_c[0]; var5 = this.field_660_c[0];
for(var6 = 1; var6 < 4; ++var6) { for (var6 = 1; var6 < 4; ++var6) {
if(this.field_660_c[var6] < var5) { if (this.field_660_c[var6] < var5) {
var5 = this.field_660_c[var6]; var5 = this.field_660_c[var6];
} }
} }
for(var6 = 0; var6 < 4; ++var6) { for (var6 = 0; var6 < 4; ++var6) {
this.field_658_b[var6] = this.field_660_c[var6] == var5; this.field_658_b[var6] = this.field_660_c[var6] == var5;
} }
@ -221,8 +222,8 @@ public class BlockFlowing extends BlockFluid {
private boolean func_309_k(World var1, int var2, int var3, int var4) { private boolean func_309_k(World var1, int var2, int var3, int var4) {
int var5 = var1.getBlockId(var2, var3, var4); int var5 = var1.getBlockId(var2, var3, var4);
if(var5 != Block.doorWood.blockID && var5 != Block.doorSteel.blockID && var5 != Block.signPost.blockID && var5 != Block.ladder.blockID && var5 != Block.reed.blockID) { if (var5 != Block.doorWood.blockID && var5 != Block.doorSteel.blockID && var5 != Block.signPost.blockID && var5 != Block.ladder.blockID && var5 != Block.reed.blockID) {
if(var5 == 0) { if (var5 == 0) {
return false; return false;
} else { } else {
Material var6 = Block.blocksList[var5].blockMaterial; Material var6 = Block.blocksList[var5].blockMaterial;
@ -235,14 +236,14 @@ public class BlockFlowing extends BlockFluid {
protected int func_307_e(World var1, int var2, int var3, int var4, int var5) { protected int func_307_e(World var1, int var2, int var3, int var4, int var5) {
int var6 = this.func_301_g(var1, var2, var3, var4); int var6 = this.func_301_g(var1, var2, var3, var4);
if(var6 < 0) { if (var6 < 0) {
return var5; return var5;
} else { } else {
if(var6 == 0) { if (var6 == 0) {
++this.field_659_a; ++this.field_659_a;
} }
if(var6 >= 8) { if (var6 >= 8) {
var6 = 0; var6 = 0;
} }
@ -257,7 +258,7 @@ public class BlockFlowing extends BlockFluid {
public void onBlockAdded(World var1, int var2, int var3, int var4) { public void onBlockAdded(World var1, int var2, int var3, int var4) {
super.onBlockAdded(var1, var2, var3, var4); super.onBlockAdded(var1, var2, var3, var4);
if(var1.getBlockId(var2, var3, var4) == this.blockID) { if (var1.getBlockId(var2, var3, var4) == this.blockID) {
var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate()); var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate());
} }

79
src/net/minecraft/block/BlockFluid.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
@ -8,6 +7,8 @@ import net.minecraft.math.Vec3D;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public abstract class BlockFluid extends Block { public abstract class BlockFluid extends Block {
protected BlockFluid(int var1, Material var2) { protected BlockFluid(int var1, Material var2) {
super(var1, (var2 == Material.lava ? 14 : 12) * 16 + 13, var2); super(var1, (var2 == Material.lava ? 14 : 12) * 16 + 13, var2);
@ -18,11 +19,11 @@ public abstract class BlockFluid extends Block {
} }
public static float setFluidHeight(int var0) { public static float setFluidHeight(int var0) {
if(var0 >= 8) { if (var0 >= 8) {
var0 = 0; var0 = 0;
} }
float var1 = (float)(var0 + 1) / 9.0F; float var1 = (float) (var0 + 1) / 9.0F;
return var1; return var1;
} }
@ -35,11 +36,11 @@ public abstract class BlockFluid extends Block {
} }
protected int func_303_b(IBlockAccess var1, int var2, int var3, int var4) { protected int func_303_b(IBlockAccess var1, int var2, int var3, int var4) {
if(var1.getBlockMaterial(var2, var3, var4) != this.blockMaterial) { if (var1.getBlockMaterial(var2, var3, var4) != this.blockMaterial) {
return -1; return -1;
} else { } else {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
if(var5 >= 8) { if (var5 >= 8) {
var5 = 0; var5 = 0;
} }
@ -80,76 +81,76 @@ public abstract class BlockFluid extends Block {
Vec3D var5 = Vec3D.createVector(0.0D, 0.0D, 0.0D); Vec3D var5 = Vec3D.createVector(0.0D, 0.0D, 0.0D);
int var6 = this.func_303_b(var1, var2, var3, var4); int var6 = this.func_303_b(var1, var2, var3, var4);
for(int var7 = 0; var7 < 4; ++var7) { for (int var7 = 0; var7 < 4; ++var7) {
int var8 = var2; int var8 = var2;
int var10 = var4; int var10 = var4;
if(var7 == 0) { if (var7 == 0) {
var8 = var2 - 1; var8 = var2 - 1;
} }
if(var7 == 1) { if (var7 == 1) {
var10 = var4 - 1; var10 = var4 - 1;
} }
if(var7 == 2) { if (var7 == 2) {
++var8; ++var8;
} }
if(var7 == 3) { if (var7 == 3) {
++var10; ++var10;
} }
int var11 = this.func_303_b(var1, var8, var3, var10); int var11 = this.func_303_b(var1, var8, var3, var10);
int var12; int var12;
if(var11 < 0) { if (var11 < 0) {
if(!var1.getBlockMaterial(var8, var3, var10).getIsSolid()) { if (!var1.getBlockMaterial(var8, var3, var10).getIsSolid()) {
var11 = this.func_303_b(var1, var8, var3 - 1, var10); var11 = this.func_303_b(var1, var8, var3 - 1, var10);
if(var11 >= 0) { if (var11 >= 0) {
var12 = var11 - (var6 - 8); var12 = var11 - (var6 - 8);
var5 = var5.addVector((double)((var8 - var2) * var12), (double)((var3 - var3) * var12), (double)((var10 - var4) * var12)); var5 = var5.addVector((double) ((var8 - var2) * var12), (double) ((var3 - var3) * var12), (double) ((var10 - var4) * var12));
} }
} }
} else if(var11 >= 0) { } else if (var11 >= 0) {
var12 = var11 - var6; var12 = var11 - var6;
var5 = var5.addVector((double)((var8 - var2) * var12), (double)((var3 - var3) * var12), (double)((var10 - var4) * var12)); var5 = var5.addVector((double) ((var8 - var2) * var12), (double) ((var3 - var3) * var12), (double) ((var10 - var4) * var12));
} }
} }
if(var1.getBlockMetadata(var2, var3, var4) >= 8) { if (var1.getBlockMetadata(var2, var3, var4) >= 8) {
boolean var13 = false; boolean var13 = false;
if(var13 || this.shouldSideBeRendered(var1, var2, var3, var4 - 1, 2)) { if (var13 || this.shouldSideBeRendered(var1, var2, var3, var4 - 1, 2)) {
var13 = true; var13 = true;
} }
if(var13 || this.shouldSideBeRendered(var1, var2, var3, var4 + 1, 3)) { if (var13 || this.shouldSideBeRendered(var1, var2, var3, var4 + 1, 3)) {
var13 = true; var13 = true;
} }
if(var13 || this.shouldSideBeRendered(var1, var2 - 1, var3, var4, 4)) { if (var13 || this.shouldSideBeRendered(var1, var2 - 1, var3, var4, 4)) {
var13 = true; var13 = true;
} }
if(var13 || this.shouldSideBeRendered(var1, var2 + 1, var3, var4, 5)) { if (var13 || this.shouldSideBeRendered(var1, var2 + 1, var3, var4, 5)) {
var13 = true; var13 = true;
} }
if(var13 || this.shouldSideBeRendered(var1, var2, var3 + 1, var4 - 1, 2)) { if (var13 || this.shouldSideBeRendered(var1, var2, var3 + 1, var4 - 1, 2)) {
var13 = true; var13 = true;
} }
if(var13 || this.shouldSideBeRendered(var1, var2, var3 + 1, var4 + 1, 3)) { if (var13 || this.shouldSideBeRendered(var1, var2, var3 + 1, var4 + 1, 3)) {
var13 = true; var13 = true;
} }
if(var13 || this.shouldSideBeRendered(var1, var2 - 1, var3 + 1, var4, 4)) { if (var13 || this.shouldSideBeRendered(var1, var2 - 1, var3 + 1, var4, 4)) {
var13 = true; var13 = true;
} }
if(var13 || this.shouldSideBeRendered(var1, var2 + 1, var3 + 1, var4, 5)) { if (var13 || this.shouldSideBeRendered(var1, var2 + 1, var3 + 1, var4, 5)) {
var13 = true; var13 = true;
} }
if(var13) { if (var13) {
var5 = var5.normalize().addVector(0.0D, -6.0D, 0.0D); var5 = var5.normalize().addVector(0.0D, -6.0D, 0.0D);
} }
} }
@ -182,34 +183,34 @@ public abstract class BlockFluid extends Block {
} }
private void checkForHarden(World var1, int var2, int var3, int var4) { private void checkForHarden(World var1, int var2, int var3, int var4) {
if(var1.getBlockId(var2, var3, var4) == this.blockID) { if (var1.getBlockId(var2, var3, var4) == this.blockID) {
if(this.blockMaterial == Material.lava) { if (this.blockMaterial == Material.lava) {
boolean var5 = false; boolean var5 = false;
if(var5 || var1.getBlockMaterial(var2, var3, var4 - 1) == Material.water) { if (var5 || var1.getBlockMaterial(var2, var3, var4 - 1) == Material.water) {
var5 = true; var5 = true;
} }
if(var5 || var1.getBlockMaterial(var2, var3, var4 + 1) == Material.water) { if (var5 || var1.getBlockMaterial(var2, var3, var4 + 1) == Material.water) {
var5 = true; var5 = true;
} }
if(var5 || var1.getBlockMaterial(var2 - 1, var3, var4) == Material.water) { if (var5 || var1.getBlockMaterial(var2 - 1, var3, var4) == Material.water) {
var5 = true; var5 = true;
} }
if(var5 || var1.getBlockMaterial(var2 + 1, var3, var4) == Material.water) { if (var5 || var1.getBlockMaterial(var2 + 1, var3, var4) == Material.water) {
var5 = true; var5 = true;
} }
if(var5 || var1.getBlockMaterial(var2, var3 + 1, var4) == Material.water) { if (var5 || var1.getBlockMaterial(var2, var3 + 1, var4) == Material.water) {
var5 = true; var5 = true;
} }
if(var5) { if (var5) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if(var6 == 0) { if (var6 == 0) {
var1.setBlockWithNotify(var2, var3, var4, Block.obsidian.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.obsidian.blockID);
} else if(var6 <= 4) { } else if (var6 <= 4) {
var1.setBlockWithNotify(var2, var3, var4, Block.cobblestone.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.cobblestone.blockID);
} }
@ -221,10 +222,10 @@ public abstract class BlockFluid extends Block {
} }
protected void func_300_h(World var1, int var2, int var3, int var4) { protected void func_300_h(World var1, int var2, int var3, int var4) {
var1.playSoundEffect((double)((float)var2 + 0.5F), (double)((float)var3 + 0.5F), (double)((float)var4 + 0.5F), "random.fizz", 0.5F, 2.6F + (var1.rand.nextFloat() - var1.rand.nextFloat()) * 0.8F); var1.playSoundEffect((double) ((float) var2 + 0.5F), (double) ((float) var3 + 0.5F), (double) ((float) var4 + 0.5F), "random.fizz", 0.5F, 2.6F + (var1.rand.nextFloat() - var1.rand.nextFloat()) * 0.8F);
for(int var5 = 0; var5 < 8; ++var5) { for (int var5 = 0; var5 < 8; ++var5) {
var1.spawnParticle("largesmoke", (double)var2 + Math.random(), (double)var3 + 1.2D, (double)var4 + Math.random(), 0.0D, 0.0D, 0.0D); var1.spawnParticle("largesmoke", (double) var2 + Math.random(), (double) var3 + 1.2D, (double) var4 + Math.random(), 0.0D, 0.0D, 0.0D);
} }
} }

49
src/net/minecraft/block/BlockFurnace.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.tile.TileEntity; import net.minecraft.block.tile.TileEntity;
import net.minecraft.block.tile.TileEntityFurnace; import net.minecraft.block.tile.TileEntityFurnace;
@ -11,6 +10,8 @@ import net.minecraft.item.crafting.ItemStack;
import net.minecraft.math.MathHelper; import net.minecraft.math.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockFurnace extends BlockContainer { public class BlockFurnace extends BlockContainer {
private Random field_28033_a = new Random(); private Random field_28033_a = new Random();
private final boolean isActive; private final boolean isActive;
@ -32,25 +33,25 @@ public class BlockFurnace extends BlockContainer {
} }
private void setDefaultDirection(World var1, int var2, int var3, int var4) { private void setDefaultDirection(World var1, int var2, int var3, int var4) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
int var5 = var1.getBlockId(var2, var3, var4 - 1); int var5 = var1.getBlockId(var2, var3, var4 - 1);
int var6 = var1.getBlockId(var2, var3, var4 + 1); int var6 = var1.getBlockId(var2, var3, var4 + 1);
int var7 = var1.getBlockId(var2 - 1, var3, var4); int var7 = var1.getBlockId(var2 - 1, var3, var4);
int var8 = var1.getBlockId(var2 + 1, var3, var4); int var8 = var1.getBlockId(var2 + 1, var3, var4);
byte var9 = 3; byte var9 = 3;
if(Block.opaqueCubeLookup[var5] && !Block.opaqueCubeLookup[var6]) { if (Block.opaqueCubeLookup[var5] && !Block.opaqueCubeLookup[var6]) {
var9 = 3; var9 = 3;
} }
if(Block.opaqueCubeLookup[var6] && !Block.opaqueCubeLookup[var5]) { if (Block.opaqueCubeLookup[var6] && !Block.opaqueCubeLookup[var5]) {
var9 = 2; var9 = 2;
} }
if(Block.opaqueCubeLookup[var7] && !Block.opaqueCubeLookup[var8]) { if (Block.opaqueCubeLookup[var7] && !Block.opaqueCubeLookup[var8]) {
var9 = 5; var9 = 5;
} }
if(Block.opaqueCubeLookup[var8] && !Block.opaqueCubeLookup[var7]) { if (Block.opaqueCubeLookup[var8] && !Block.opaqueCubeLookup[var7]) {
var9 = 4; var9 = 4;
} }
@ -63,10 +64,10 @@ public class BlockFurnace extends BlockContainer {
} }
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) { public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(var1.singleplayerWorld) { if (var1.singleplayerWorld) {
return true; return true;
} else { } else {
TileEntityFurnace var6 = (TileEntityFurnace)var1.getBlockTileEntity(var2, var3, var4); TileEntityFurnace var6 = (TileEntityFurnace) var1.getBlockTileEntity(var2, var3, var4);
var5.displayGUIFurnace(var6); var5.displayGUIFurnace(var6);
return true; return true;
} }
@ -76,7 +77,7 @@ public class BlockFurnace extends BlockContainer {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
TileEntity var6 = var1.getBlockTileEntity(var2, var3, var4); TileEntity var6 = var1.getBlockTileEntity(var2, var3, var4);
field_28034_c = true; field_28034_c = true;
if(var0) { if (var0) {
var1.setBlockWithNotify(var2, var3, var4, Block.stoneOvenActive.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.stoneOvenActive.blockID);
} else { } else {
var1.setBlockWithNotify(var2, var3, var4, Block.stoneOvenIdle.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.stoneOvenIdle.blockID);
@ -93,48 +94,48 @@ public class BlockFurnace extends BlockContainer {
} }
public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) { public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) {
int var6 = MathHelper.floor_double((double)(var5.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int var6 = MathHelper.floor_double((double) (var5.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
if(var6 == 0) { if (var6 == 0) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 2); var1.setBlockMetadataWithNotify(var2, var3, var4, 2);
} }
if(var6 == 1) { if (var6 == 1) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 5); var1.setBlockMetadataWithNotify(var2, var3, var4, 5);
} }
if(var6 == 2) { if (var6 == 2) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 3); var1.setBlockMetadataWithNotify(var2, var3, var4, 3);
} }
if(var6 == 3) { if (var6 == 3) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 4); var1.setBlockMetadataWithNotify(var2, var3, var4, 4);
} }
} }
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
if(!field_28034_c) { if (!field_28034_c) {
TileEntityFurnace var5 = (TileEntityFurnace)var1.getBlockTileEntity(var2, var3, var4); TileEntityFurnace var5 = (TileEntityFurnace) var1.getBlockTileEntity(var2, var3, var4);
for(int var6 = 0; var6 < var5.getSizeInventory(); ++var6) { for (int var6 = 0; var6 < var5.getSizeInventory(); ++var6) {
ItemStack var7 = var5.getStackInSlot(var6); ItemStack var7 = var5.getStackInSlot(var6);
if(var7 != null) { if (var7 != null) {
float var8 = this.field_28033_a.nextFloat() * 0.8F + 0.1F; float var8 = this.field_28033_a.nextFloat() * 0.8F + 0.1F;
float var9 = this.field_28033_a.nextFloat() * 0.8F + 0.1F; float var9 = this.field_28033_a.nextFloat() * 0.8F + 0.1F;
float var10 = this.field_28033_a.nextFloat() * 0.8F + 0.1F; float var10 = this.field_28033_a.nextFloat() * 0.8F + 0.1F;
while(var7.stackSize > 0) { while (var7.stackSize > 0) {
int var11 = this.field_28033_a.nextInt(21) + 10; int var11 = this.field_28033_a.nextInt(21) + 10;
if(var11 > var7.stackSize) { if (var11 > var7.stackSize) {
var11 = var7.stackSize; var11 = var7.stackSize;
} }
var7.stackSize -= var11; var7.stackSize -= var11;
EntityItem var12 = new EntityItem(var1, (double)((float)var2 + var8), (double)((float)var3 + var9), (double)((float)var4 + var10), new ItemStack(var7.itemID, var11, var7.getItemDamage())); EntityItem var12 = new EntityItem(var1, (double) ((float) var2 + var8), (double) ((float) var3 + var9), (double) ((float) var4 + var10), new ItemStack(var7.itemID, var11, var7.getItemDamage()));
float var13 = 0.05F; float var13 = 0.05F;
var12.motionX = (double)((float)this.field_28033_a.nextGaussian() * var13); var12.motionX = (double) ((float) this.field_28033_a.nextGaussian() * var13);
var12.motionY = (double)((float)this.field_28033_a.nextGaussian() * var13 + 0.2F); var12.motionY = (double) ((float) this.field_28033_a.nextGaussian() * var13 + 0.2F);
var12.motionZ = (double)((float)this.field_28033_a.nextGaussian() * var13); var12.motionZ = (double) ((float) this.field_28033_a.nextGaussian() * var13);
var1.entityJoinedWorld(var12); var1.entityJoinedWorld(var12);
} }
} }

3
src/net/minecraft/block/BlockGlass.java
View file

@ -1,8 +1,9 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import java.util.Random;
public class BlockGlass extends BlockBreakable { public class BlockGlass extends BlockBreakable {
public BlockGlass(int var1, int var2, Material var3, boolean var4) { public BlockGlass(int var1, int var2, Material var3, boolean var4) {
super(var1, var2, var3, var4); super(var1, var2, var3, var4);

3
src/net/minecraft/block/BlockGlowStone.java
View file

@ -1,9 +1,10 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import java.util.Random;
public class BlockGlowStone extends Block { public class BlockGlowStone extends Block {
public BlockGlowStone(int var1, int var2, Material var3) { public BlockGlowStone(int var1, int var2, Material var3) {
super(var1, var2, var3); super(var1, var2, var3);

13
src/net/minecraft/block/BlockGrass.java
View file

@ -1,9 +1,10 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockGrass extends Block { public class BlockGrass extends Block {
protected BlockGrass(int var1) { protected BlockGrass(int var1) {
super(var1, Material.grass); super(var1, Material.grass);
@ -12,19 +13,19 @@ public class BlockGrass extends Block {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
if(var1.getBlockLightValue(var2, var3 + 1, var4) < 4 && Block.lightOpacity[var1.getBlockId(var2, var3 + 1, var4)] > 2) { if (var1.getBlockLightValue(var2, var3 + 1, var4) < 4 && Block.lightOpacity[var1.getBlockId(var2, var3 + 1, var4)] > 2) {
if(var5.nextInt(4) != 0) { if (var5.nextInt(4) != 0) {
return; return;
} }
var1.setBlockWithNotify(var2, var3, var4, Block.dirt.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.dirt.blockID);
} else if(var1.getBlockLightValue(var2, var3 + 1, var4) >= 9) { } else if (var1.getBlockLightValue(var2, var3 + 1, var4) >= 9) {
int var6 = var2 + var5.nextInt(3) - 1; int var6 = var2 + var5.nextInt(3) - 1;
int var7 = var3 + var5.nextInt(5) - 3; int var7 = var3 + var5.nextInt(5) - 3;
int var8 = var4 + var5.nextInt(3) - 1; int var8 = var4 + var5.nextInt(3) - 1;
int var9 = var1.getBlockId(var6, var7 + 1, var8); int var9 = var1.getBlockId(var6, var7 + 1, var8);
if(var1.getBlockId(var6, var7, var8) == Block.dirt.blockID && var1.getBlockLightValue(var6, var7 + 1, var8) >= 4 && Block.lightOpacity[var9] <= 2) { if (var1.getBlockId(var6, var7, var8) == Block.dirt.blockID && var1.getBlockLightValue(var6, var7 + 1, var8) >= 4 && Block.lightOpacity[var9] <= 2) {
var1.setBlockWithNotify(var6, var7, var8, Block.grass.blockID); var1.setBlockWithNotify(var6, var7, var8, Block.grass.blockID);
} }
} }

3
src/net/minecraft/block/BlockGravel.java
View file

@ -1,8 +1,9 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import java.util.Random;
public class BlockGravel extends BlockSand { public class BlockGravel extends BlockSand {
public BlockGravel(int var1, int var2) { public BlockGravel(int var1, int var2) {
super(var1, var2); super(var1, var2);

7
src/net/minecraft/block/BlockIce.java
View file

@ -1,11 +1,12 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
import net.minecraft.world.EnumLightSource; import net.minecraft.world.EnumLightSource;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockIce extends BlockBreakable { public class BlockIce extends BlockBreakable {
public BlockIce(int var1, int var2) { public BlockIce(int var1, int var2) {
super(var1, var2, Material.ice, false); super(var1, var2, Material.ice, false);
@ -16,7 +17,7 @@ public class BlockIce extends BlockBreakable {
public void harvestBlock(World var1, EntityPlayer var2, int var3, int var4, int var5, int var6) { public void harvestBlock(World var1, EntityPlayer var2, int var3, int var4, int var5, int var6) {
super.harvestBlock(var1, var2, var3, var4, var5, var6); super.harvestBlock(var1, var2, var3, var4, var5, var6);
Material var7 = var1.getBlockMaterial(var3, var4 - 1, var5); Material var7 = var1.getBlockMaterial(var3, var4 - 1, var5);
if(var7.getIsSolid() || var7.getIsLiquid()) { if (var7.getIsSolid() || var7.getIsLiquid()) {
var1.setBlockWithNotify(var3, var4, var5, Block.waterMoving.blockID); var1.setBlockWithNotify(var3, var4, var5, Block.waterMoving.blockID);
} }
@ -27,7 +28,7 @@ public class BlockIce extends BlockBreakable {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(var1.getSavedLightValue(EnumLightSource.Block, var2, var3, var4) > 11 - Block.lightOpacity[this.blockID]) { if (var1.getSavedLightValue(EnumLightSource.Block, var2, var3, var4) > 11 - Block.lightOpacity[this.blockID]) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, Block.waterStill.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.waterStill.blockID);
} }

24
src/net/minecraft/block/BlockJukeBox.java
View file

@ -18,7 +18,7 @@ public class BlockJukeBox extends BlockContainer {
} }
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) { public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(var1.getBlockMetadata(var2, var3, var4) == 0) { if (var1.getBlockMetadata(var2, var3, var4) == 0) {
return false; return false;
} else { } else {
this.func_28035_b_(var1, var2, var3, var4); this.func_28035_b_(var1, var2, var3, var4);
@ -27,8 +27,8 @@ public class BlockJukeBox extends BlockContainer {
} }
public void ejectRecord(World var1, int var2, int var3, int var4, int var5) { public void ejectRecord(World var1, int var2, int var3, int var4, int var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
TileEntityRecordPlayer var6 = (TileEntityRecordPlayer)var1.getBlockTileEntity(var2, var3, var4); TileEntityRecordPlayer var6 = (TileEntityRecordPlayer) var1.getBlockTileEntity(var2, var3, var4);
var6.field_28009_a = var5; var6.field_28009_a = var5;
var6.onInventoryChanged(); var6.onInventoryChanged();
var1.setBlockMetadataWithNotify(var2, var3, var4, 1); var1.setBlockMetadataWithNotify(var2, var3, var4, 1);
@ -36,20 +36,20 @@ public class BlockJukeBox extends BlockContainer {
} }
public void func_28035_b_(World var1, int var2, int var3, int var4) { public void func_28035_b_(World var1, int var2, int var3, int var4) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
TileEntityRecordPlayer var5 = (TileEntityRecordPlayer)var1.getBlockTileEntity(var2, var3, var4); TileEntityRecordPlayer var5 = (TileEntityRecordPlayer) var1.getBlockTileEntity(var2, var3, var4);
int var6 = var5.field_28009_a; int var6 = var5.field_28009_a;
if(var6 != 0) { if (var6 != 0) {
var1.func_28097_e(1005, var2, var3, var4, 0); var1.func_28097_e(1005, var2, var3, var4, 0);
var1.playRecord((String)null, var2, var3, var4); var1.playRecord((String) null, var2, var3, var4);
var5.field_28009_a = 0; var5.field_28009_a = 0;
var5.onInventoryChanged(); var5.onInventoryChanged();
var1.setBlockMetadataWithNotify(var2, var3, var4, 0); var1.setBlockMetadataWithNotify(var2, var3, var4, 0);
float var8 = 0.7F; float var8 = 0.7F;
double var9 = (double)(var1.rand.nextFloat() * var8) + (double)(1.0F - var8) * 0.5D; double var9 = (double) (var1.rand.nextFloat() * var8) + (double) (1.0F - var8) * 0.5D;
double var11 = (double)(var1.rand.nextFloat() * var8) + (double)(1.0F - var8) * 0.2D + 0.6D; double var11 = (double) (var1.rand.nextFloat() * var8) + (double) (1.0F - var8) * 0.2D + 0.6D;
double var13 = (double)(var1.rand.nextFloat() * var8) + (double)(1.0F - var8) * 0.5D; double var13 = (double) (var1.rand.nextFloat() * var8) + (double) (1.0F - var8) * 0.5D;
EntityItem var15 = new EntityItem(var1, (double)var2 + var9, (double)var3 + var11, (double)var4 + var13, new ItemStack(var6, 1, 0)); EntityItem var15 = new EntityItem(var1, (double) var2 + var9, (double) var3 + var11, (double) var4 + var13, new ItemStack(var6, 1, 0));
var15.delayBeforeCanPickup = 10; var15.delayBeforeCanPickup = 10;
var1.entityJoinedWorld(var15); var1.entityJoinedWorld(var15);
} }
@ -62,7 +62,7 @@ public class BlockJukeBox extends BlockContainer {
} }
public void dropBlockAsItemWithChance(World var1, int var2, int var3, int var4, int var5, float var6) { public void dropBlockAsItemWithChance(World var1, int var2, int var3, int var4, int var5, float var6) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
super.dropBlockAsItemWithChance(var1, var2, var3, var4, var5, var6); super.dropBlockAsItemWithChance(var1, var2, var3, var4, var5, var6);
} }
} }

29
src/net/minecraft/block/BlockLadder.java
View file

@ -1,10 +1,11 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockLadder extends Block { public class BlockLadder extends Block {
protected BlockLadder(int var1, int var2) { protected BlockLadder(int var1, int var2) {
super(var1, var2, Material.circuits); super(var1, var2, Material.circuits);
@ -13,19 +14,19 @@ public class BlockLadder extends Block {
public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) { public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
float var6 = 2.0F / 16.0F; float var6 = 2.0F / 16.0F;
if(var5 == 2) { if (var5 == 2) {
this.setBlockBounds(0.0F, 0.0F, 1.0F - var6, 1.0F, 1.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 1.0F - var6, 1.0F, 1.0F, 1.0F);
} }
if(var5 == 3) { if (var5 == 3) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var6); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var6);
} }
if(var5 == 4) { if (var5 == 4) {
this.setBlockBounds(1.0F - var6, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); this.setBlockBounds(1.0F - var6, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
} }
if(var5 == 5) { if (var5 == 5) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, var6, 1.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, var6, 1.0F, 1.0F);
} }
@ -46,19 +47,19 @@ public class BlockLadder extends Block {
public void onBlockPlaced(World var1, int var2, int var3, int var4, int var5) { public void onBlockPlaced(World var1, int var2, int var3, int var4, int var5) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if((var6 == 0 || var5 == 2) && var1.isBlockNormalCube(var2, var3, var4 + 1)) { if ((var6 == 0 || var5 == 2) && var1.isBlockNormalCube(var2, var3, var4 + 1)) {
var6 = 2; var6 = 2;
} }
if((var6 == 0 || var5 == 3) && var1.isBlockNormalCube(var2, var3, var4 - 1)) { if ((var6 == 0 || var5 == 3) && var1.isBlockNormalCube(var2, var3, var4 - 1)) {
var6 = 3; var6 = 3;
} }
if((var6 == 0 || var5 == 4) && var1.isBlockNormalCube(var2 + 1, var3, var4)) { if ((var6 == 0 || var5 == 4) && var1.isBlockNormalCube(var2 + 1, var3, var4)) {
var6 = 4; var6 = 4;
} }
if((var6 == 0 || var5 == 5) && var1.isBlockNormalCube(var2 - 1, var3, var4)) { if ((var6 == 0 || var5 == 5) && var1.isBlockNormalCube(var2 - 1, var3, var4)) {
var6 = 5; var6 = 5;
} }
@ -68,23 +69,23 @@ public class BlockLadder extends Block {
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
boolean var7 = false; boolean var7 = false;
if(var6 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1)) { if (var6 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1)) {
var7 = true; var7 = true;
} }
if(var6 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1)) { if (var6 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1)) {
var7 = true; var7 = true;
} }
if(var6 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4)) { if (var6 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4)) {
var7 = true; var7 = true;
} }
if(var6 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)) { if (var6 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)) {
var7 = true; var7 = true;
} }
if(!var7) { if (!var7) {
this.dropBlockAsItem(var1, var2, var3, var4, var6); this.dropBlockAsItem(var1, var2, var3, var4, var6);
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }

61
src/net/minecraft/block/BlockLeaves.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
@ -9,6 +8,8 @@ import net.minecraft.item.crafting.ItemStack;
import net.minecraft.statistics.StatList; import net.minecraft.statistics.StatList;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockLeaves extends BlockLeavesBase { public class BlockLeaves extends BlockLeavesBase {
private int baseIndexInPNG; private int baseIndexInPNG;
int[] adjacentTreeBlocks; int[] adjacentTreeBlocks;
@ -22,12 +23,12 @@ public class BlockLeaves extends BlockLeavesBase {
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
byte var5 = 1; byte var5 = 1;
int var6 = var5 + 1; int var6 = var5 + 1;
if(var1.checkChunksExist(var2 - var6, var3 - var6, var4 - var6, var2 + var6, var3 + var6, var4 + var6)) { if (var1.checkChunksExist(var2 - var6, var3 - var6, var4 - var6, var2 + var6, var3 + var6, var4 + var6)) {
for(int var7 = -var5; var7 <= var5; ++var7) { for (int var7 = -var5; var7 <= var5; ++var7) {
for(int var8 = -var5; var8 <= var5; ++var8) { for (int var8 = -var5; var8 <= var5; ++var8) {
for(int var9 = -var5; var9 <= var5; ++var9) { for (int var9 = -var5; var9 <= var5; ++var9) {
int var10 = var1.getBlockId(var2 + var7, var3 + var8, var4 + var9); int var10 = var1.getBlockId(var2 + var7, var3 + var8, var4 + var9);
if(var10 == Block.leaves.blockID) { if (var10 == Block.leaves.blockID) {
int var11 = var1.getBlockMetadata(var2 + var7, var3 + var8, var4 + var9); int var11 = var1.getBlockMetadata(var2 + var7, var3 + var8, var4 + var9);
var1.setBlockMetadata(var2 + var7, var3 + var8, var4 + var9, var11 | 8); var1.setBlockMetadata(var2 + var7, var3 + var8, var4 + var9, var11 | 8);
} }
@ -39,60 +40,60 @@ public class BlockLeaves extends BlockLeavesBase {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if((var6 & 8) != 0) { if ((var6 & 8) != 0) {
byte var7 = 4; byte var7 = 4;
int var8 = var7 + 1; int var8 = var7 + 1;
byte var9 = 32; byte var9 = 32;
int var10 = var9 * var9; int var10 = var9 * var9;
int var11 = var9 / 2; int var11 = var9 / 2;
if(this.adjacentTreeBlocks == null) { if (this.adjacentTreeBlocks == null) {
this.adjacentTreeBlocks = new int[var9 * var9 * var9]; this.adjacentTreeBlocks = new int[var9 * var9 * var9];
} }
int var12; int var12;
if(var1.checkChunksExist(var2 - var8, var3 - var8, var4 - var8, var2 + var8, var3 + var8, var4 + var8)) { if (var1.checkChunksExist(var2 - var8, var3 - var8, var4 - var8, var2 + var8, var3 + var8, var4 + var8)) {
var12 = -var7; var12 = -var7;
label111: label111:
while(true) { while (true) {
int var13; int var13;
int var14; int var14;
int var15; int var15;
if(var12 > var7) { if (var12 > var7) {
var12 = 1; var12 = 1;
while(true) { while (true) {
if(var12 > 4) { if (var12 > 4) {
break label111; break label111;
} }
for(var13 = -var7; var13 <= var7; ++var13) { for (var13 = -var7; var13 <= var7; ++var13) {
for(var14 = -var7; var14 <= var7; ++var14) { for (var14 = -var7; var14 <= var7; ++var14) {
for(var15 = -var7; var15 <= var7; ++var15) { for (var15 = -var7; var15 <= var7; ++var15) {
if(this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11) * var9 + var15 + var11] == var12 - 1) { if (this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11) * var9 + var15 + var11] == var12 - 1) {
if(this.adjacentTreeBlocks[(var13 + var11 - 1) * var10 + (var14 + var11) * var9 + var15 + var11] == -2) { if (this.adjacentTreeBlocks[(var13 + var11 - 1) * var10 + (var14 + var11) * var9 + var15 + var11] == -2) {
this.adjacentTreeBlocks[(var13 + var11 - 1) * var10 + (var14 + var11) * var9 + var15 + var11] = var12; this.adjacentTreeBlocks[(var13 + var11 - 1) * var10 + (var14 + var11) * var9 + var15 + var11] = var12;
} }
if(this.adjacentTreeBlocks[(var13 + var11 + 1) * var10 + (var14 + var11) * var9 + var15 + var11] == -2) { if (this.adjacentTreeBlocks[(var13 + var11 + 1) * var10 + (var14 + var11) * var9 + var15 + var11] == -2) {
this.adjacentTreeBlocks[(var13 + var11 + 1) * var10 + (var14 + var11) * var9 + var15 + var11] = var12; this.adjacentTreeBlocks[(var13 + var11 + 1) * var10 + (var14 + var11) * var9 + var15 + var11] = var12;
} }
if(this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11 - 1) * var9 + var15 + var11] == -2) { if (this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11 - 1) * var9 + var15 + var11] == -2) {
this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11 - 1) * var9 + var15 + var11] = var12; this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11 - 1) * var9 + var15 + var11] = var12;
} }
if(this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11 + 1) * var9 + var15 + var11] == -2) { if (this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11 + 1) * var9 + var15 + var11] == -2) {
this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11 + 1) * var9 + var15 + var11] = var12; this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11 + 1) * var9 + var15 + var11] = var12;
} }
if(this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11) * var9 + (var15 + var11 - 1)] == -2) { if (this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11) * var9 + (var15 + var11 - 1)] == -2) {
this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11) * var9 + (var15 + var11 - 1)] = var12; this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11) * var9 + (var15 + var11 - 1)] = var12;
} }
if(this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11) * var9 + var15 + var11 + 1] == -2) { if (this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11) * var9 + var15 + var11 + 1] == -2) {
this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11) * var9 + var15 + var11 + 1] = var12; this.adjacentTreeBlocks[(var13 + var11) * var10 + (var14 + var11) * var9 + var15 + var11 + 1] = var12;
} }
} }
@ -104,12 +105,12 @@ public class BlockLeaves extends BlockLeavesBase {
} }
} }
for(var13 = -var7; var13 <= var7; ++var13) { for (var13 = -var7; var13 <= var7; ++var13) {
for(var14 = -var7; var14 <= var7; ++var14) { for (var14 = -var7; var14 <= var7; ++var14) {
var15 = var1.getBlockId(var2 + var12, var3 + var13, var4 + var14); var15 = var1.getBlockId(var2 + var12, var3 + var13, var4 + var14);
if(var15 == Block.wood.blockID) { if (var15 == Block.wood.blockID) {
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0; this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
} else if(var15 == Block.leaves.blockID) { } else if (var15 == Block.leaves.blockID) {
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2; this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
} else { } else {
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -1; this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -1;
@ -122,7 +123,7 @@ public class BlockLeaves extends BlockLeavesBase {
} }
var12 = this.adjacentTreeBlocks[var11 * var10 + var11 * var9 + var11]; var12 = this.adjacentTreeBlocks[var11 * var10 + var11 * var9 + var11];
if(var12 >= 0) { if (var12 >= 0) {
var1.setBlockMetadata(var2, var3, var4, var6 & -9); var1.setBlockMetadata(var2, var3, var4, var6 & -9);
} else { } else {
this.removeLeaves(var1, var2, var3, var4); this.removeLeaves(var1, var2, var3, var4);
@ -146,7 +147,7 @@ public class BlockLeaves extends BlockLeavesBase {
} }
public void harvestBlock(World var1, EntityPlayer var2, int var3, int var4, int var5, int var6) { public void harvestBlock(World var1, EntityPlayer var2, int var3, int var4, int var5, int var6) {
if(!var1.singleplayerWorld && var2.getCurrentEquippedItem() != null && var2.getCurrentEquippedItem().itemID == Item.field_31022_bc.shiftedIndex) { if (!var1.singleplayerWorld && var2.getCurrentEquippedItem() != null && var2.getCurrentEquippedItem().itemID == Item.field_31022_bc.shiftedIndex) {
var2.addStat(StatList.mineBlockStatArray[this.blockID], 1); var2.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(var1, var3, var4, var5, new ItemStack(Block.leaves.blockID, 1, var6 & 3)); this.dropBlockAsItem_do(var1, var3, var4, var5, new ItemStack(Block.leaves.blockID, 1, var6 & 3));
} else { } else {

62
src/net/minecraft/block/BlockLever.java
View file

@ -36,27 +36,27 @@ public class BlockLever extends Block {
int var7 = var6 & 8; int var7 = var6 & 8;
var6 &= 7; var6 &= 7;
var6 = -1; var6 = -1;
if(var5 == 1 && var1.isBlockNormalCube(var2, var3 - 1, var4)) { if (var5 == 1 && var1.isBlockNormalCube(var2, var3 - 1, var4)) {
var6 = 5 + var1.rand.nextInt(2); var6 = 5 + var1.rand.nextInt(2);
} }
if(var5 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1)) { if (var5 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1)) {
var6 = 4; var6 = 4;
} }
if(var5 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1)) { if (var5 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1)) {
var6 = 3; var6 = 3;
} }
if(var5 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4)) { if (var5 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4)) {
var6 = 2; var6 = 2;
} }
if(var5 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)) { if (var5 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)) {
var6 = 1; var6 = 1;
} }
if(var6 == -1) { if (var6 == -1) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} else { } else {
@ -65,34 +65,34 @@ public class BlockLever extends Block {
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(this.checkIfAttachedToBlock(var1, var2, var3, var4)) { if (this.checkIfAttachedToBlock(var1, var2, var3, var4)) {
int var6 = var1.getBlockMetadata(var2, var3, var4) & 7; int var6 = var1.getBlockMetadata(var2, var3, var4) & 7;
boolean var7 = false; boolean var7 = false;
if(!var1.isBlockNormalCube(var2 - 1, var3, var4) && var6 == 1) { if (!var1.isBlockNormalCube(var2 - 1, var3, var4) && var6 == 1) {
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2 + 1, var3, var4) && var6 == 2) { if (!var1.isBlockNormalCube(var2 + 1, var3, var4) && var6 == 2) {
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2, var3, var4 - 1) && var6 == 3) { if (!var1.isBlockNormalCube(var2, var3, var4 - 1) && var6 == 3) {
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2, var3, var4 + 1) && var6 == 4) { if (!var1.isBlockNormalCube(var2, var3, var4 + 1) && var6 == 4) {
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2, var3 - 1, var4) && var6 == 5) { if (!var1.isBlockNormalCube(var2, var3 - 1, var4) && var6 == 5) {
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2, var3 - 1, var4) && var6 == 6) { if (!var1.isBlockNormalCube(var2, var3 - 1, var4) && var6 == 6) {
var7 = true; var7 = true;
} }
if(var7) { if (var7) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
@ -101,7 +101,7 @@ public class BlockLever extends Block {
} }
private boolean checkIfAttachedToBlock(World var1, int var2, int var3, int var4) { private boolean checkIfAttachedToBlock(World var1, int var2, int var3, int var4) {
if(!this.canPlaceBlockAt(var1, var2, var3, var4)) { if (!this.canPlaceBlockAt(var1, var2, var3, var4)) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
return false; return false;
@ -113,13 +113,13 @@ public class BlockLever extends Block {
public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) { public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4) & 7; int var5 = var1.getBlockMetadata(var2, var3, var4) & 7;
float var6 = 3.0F / 16.0F; float var6 = 3.0F / 16.0F;
if(var5 == 1) { if (var5 == 1) {
this.setBlockBounds(0.0F, 0.2F, 0.5F - var6, var6 * 2.0F, 0.8F, 0.5F + var6); this.setBlockBounds(0.0F, 0.2F, 0.5F - var6, var6 * 2.0F, 0.8F, 0.5F + var6);
} else if(var5 == 2) { } else if (var5 == 2) {
this.setBlockBounds(1.0F - var6 * 2.0F, 0.2F, 0.5F - var6, 1.0F, 0.8F, 0.5F + var6); this.setBlockBounds(1.0F - var6 * 2.0F, 0.2F, 0.5F - var6, 1.0F, 0.8F, 0.5F + var6);
} else if(var5 == 3) { } else if (var5 == 3) {
this.setBlockBounds(0.5F - var6, 0.2F, 0.0F, 0.5F + var6, 0.8F, var6 * 2.0F); this.setBlockBounds(0.5F - var6, 0.2F, 0.0F, 0.5F + var6, 0.8F, var6 * 2.0F);
} else if(var5 == 4) { } else if (var5 == 4) {
this.setBlockBounds(0.5F - var6, 0.2F, 1.0F - var6 * 2.0F, 0.5F + var6, 0.8F, 1.0F); this.setBlockBounds(0.5F - var6, 0.2F, 1.0F - var6 * 2.0F, 0.5F + var6, 0.8F, 1.0F);
} else { } else {
var6 = 0.25F; var6 = 0.25F;
@ -133,7 +133,7 @@ public class BlockLever extends Block {
} }
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) { public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(var1.singleplayerWorld) { if (var1.singleplayerWorld) {
return true; return true;
} else { } else {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
@ -141,15 +141,15 @@ public class BlockLever extends Block {
int var8 = 8 - (var6 & 8); int var8 = 8 - (var6 & 8);
var1.setBlockMetadataWithNotify(var2, var3, var4, var7 + var8); var1.setBlockMetadataWithNotify(var2, var3, var4, var7 + var8);
var1.markBlocksDirty(var2, var3, var4, var2, var3, var4); var1.markBlocksDirty(var2, var3, var4, var2, var3, var4);
var1.playSoundEffect((double)var2 + 0.5D, (double)var3 + 0.5D, (double)var4 + 0.5D, "random.click", 0.3F, var8 > 0 ? 0.6F : 0.5F); var1.playSoundEffect((double) var2 + 0.5D, (double) var3 + 0.5D, (double) var4 + 0.5D, "random.click", 0.3F, var8 > 0 ? 0.6F : 0.5F);
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
if(var7 == 1) { if (var7 == 1) {
var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID);
} else if(var7 == 2) { } else if (var7 == 2) {
var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID);
} else if(var7 == 3) { } else if (var7 == 3) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID);
} else if(var7 == 4) { } else if (var7 == 4) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID);
} else { } else {
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
@ -161,16 +161,16 @@ public class BlockLever extends Block {
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
if((var5 & 8) > 0) { if ((var5 & 8) > 0) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
int var6 = var5 & 7; int var6 = var5 & 7;
if(var6 == 1) { if (var6 == 1) {
var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID);
} else if(var6 == 2) { } else if (var6 == 2) {
var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID);
} else if(var6 == 3) { } else if (var6 == 3) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID);
} else if(var6 == 4) { } else if (var6 == 4) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID);
} else { } else {
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
@ -186,7 +186,7 @@ public class BlockLever extends Block {
public boolean isIndirectlyPoweringTo(World var1, int var2, int var3, int var4, int var5) { public boolean isIndirectlyPoweringTo(World var1, int var2, int var3, int var4, int var5) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if((var6 & 8) == 0) { if ((var6 & 8) == 0) {
return false; return false;
} else { } else {
int var7 = var6 & 7; int var7 = var6 & 7;

3
src/net/minecraft/block/BlockLockedChest.java
View file

@ -1,9 +1,10 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockLockedChest extends Block { public class BlockLockedChest extends Block {
protected BlockLockedChest(int var1) { protected BlockLockedChest(int var1) {
super(var1, Material.wood); super(var1, Material.wood);

15
src/net/minecraft/block/BlockLog.java
View file

@ -1,10 +1,11 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockLog extends Block { public class BlockLog extends Block {
protected BlockLog(int var1) { protected BlockLog(int var1) {
super(var1, Material.wood); super(var1, Material.wood);
@ -26,14 +27,14 @@ public class BlockLog extends Block {
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
byte var5 = 4; byte var5 = 4;
int var6 = var5 + 1; int var6 = var5 + 1;
if(var1.checkChunksExist(var2 - var6, var3 - var6, var4 - var6, var2 + var6, var3 + var6, var4 + var6)) { if (var1.checkChunksExist(var2 - var6, var3 - var6, var4 - var6, var2 + var6, var3 + var6, var4 + var6)) {
for(int var7 = -var5; var7 <= var5; ++var7) { for (int var7 = -var5; var7 <= var5; ++var7) {
for(int var8 = -var5; var8 <= var5; ++var8) { for (int var8 = -var5; var8 <= var5; ++var8) {
for(int var9 = -var5; var9 <= var5; ++var9) { for (int var9 = -var5; var9 <= var5; ++var9) {
int var10 = var1.getBlockId(var2 + var7, var3 + var8, var4 + var9); int var10 = var1.getBlockId(var2 + var7, var3 + var8, var4 + var9);
if(var10 == Block.leaves.blockID) { if (var10 == Block.leaves.blockID) {
int var11 = var1.getBlockMetadata(var2 + var7, var3 + var8, var4 + var9); int var11 = var1.getBlockMetadata(var2 + var7, var3 + var8, var4 + var9);
if((var11 & 8) == 0) { if ((var11 & 8) == 0) {
var1.setBlockMetadata(var2 + var7, var3 + var8, var4 + var9, var11 | 8); var1.setBlockMetadata(var2 + var7, var3 + var8, var4 + var9, var11 | 8);
} }
} }

3
src/net/minecraft/block/BlockMobSpawner.java
View file

@ -1,10 +1,11 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.tile.TileEntity; import net.minecraft.block.tile.TileEntity;
import net.minecraft.block.tile.TileEntityMobSpawner; import net.minecraft.block.tile.TileEntityMobSpawner;
import java.util.Random;
public class BlockMobSpawner extends BlockContainer { public class BlockMobSpawner extends BlockContainer {
protected BlockMobSpawner(int var1, int var2) { protected BlockMobSpawner(int var1, int var2) {
super(var1, var2, Material.rock); super(var1, var2, Material.rock);

9
src/net/minecraft/block/BlockMushroom.java
View file

@ -1,8 +1,9 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockMushroom extends BlockFlower { public class BlockMushroom extends BlockFlower {
protected BlockMushroom(int var1, int var2) { protected BlockMushroom(int var1, int var2) {
super(var1, var2); super(var1, var2);
@ -12,14 +13,14 @@ public class BlockMushroom extends BlockFlower {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(var5.nextInt(100) == 0) { if (var5.nextInt(100) == 0) {
int var6 = var2 + var5.nextInt(3) - 1; int var6 = var2 + var5.nextInt(3) - 1;
int var7 = var3 + var5.nextInt(2) - var5.nextInt(2); int var7 = var3 + var5.nextInt(2) - var5.nextInt(2);
int var8 = var4 + var5.nextInt(3) - 1; int var8 = var4 + var5.nextInt(3) - 1;
if(var1.isAirBlock(var6, var7, var8) && this.canBlockStay(var1, var6, var7, var8)) { if (var1.isAirBlock(var6, var7, var8) && this.canBlockStay(var1, var6, var7, var8)) {
int var10000 = var2 + (var5.nextInt(3) - 1); int var10000 = var2 + (var5.nextInt(3) - 1);
var10000 = var4 + (var5.nextInt(3) - 1); var10000 = var4 + (var5.nextInt(3) - 1);
if(var1.isAirBlock(var6, var7, var8) && this.canBlockStay(var1, var6, var7, var8)) { if (var1.isAirBlock(var6, var7, var8) && this.canBlockStay(var1, var6, var7, var8)) {
var1.setBlockWithNotify(var6, var7, var8, this.blockID); var1.setBlockWithNotify(var6, var7, var8, this.blockID);
} }
} }

30
src/net/minecraft/block/BlockNote.java
View file

@ -16,11 +16,11 @@ public class BlockNote extends BlockContainer {
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(var5 > 0 && Block.blocksList[var5].canProvidePower()) { if (var5 > 0 && Block.blocksList[var5].canProvidePower()) {
boolean var6 = var1.isBlockGettingPowered(var2, var3, var4); boolean var6 = var1.isBlockGettingPowered(var2, var3, var4);
TileEntityNote var7 = (TileEntityNote)var1.getBlockTileEntity(var2, var3, var4); TileEntityNote var7 = (TileEntityNote) var1.getBlockTileEntity(var2, var3, var4);
if(var7.previousRedstoneState != var6) { if (var7.previousRedstoneState != var6) {
if(var6) { if (var6) {
var7.triggerNote(var1, var2, var3, var4); var7.triggerNote(var1, var2, var3, var4);
} }
@ -31,10 +31,10 @@ public class BlockNote extends BlockContainer {
} }
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) { public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(var1.singleplayerWorld) { if (var1.singleplayerWorld) {
return true; return true;
} else { } else {
TileEntityNote var6 = (TileEntityNote)var1.getBlockTileEntity(var2, var3, var4); TileEntityNote var6 = (TileEntityNote) var1.getBlockTileEntity(var2, var3, var4);
var6.changePitch(); var6.changePitch();
var6.triggerNote(var1, var2, var3, var4); var6.triggerNote(var1, var2, var3, var4);
return true; return true;
@ -42,8 +42,8 @@ public class BlockNote extends BlockContainer {
} }
public void onBlockClicked(World var1, int var2, int var3, int var4, EntityPlayer var5) { public void onBlockClicked(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
TileEntityNote var6 = (TileEntityNote)var1.getBlockTileEntity(var2, var3, var4); TileEntityNote var6 = (TileEntityNote) var1.getBlockTileEntity(var2, var3, var4);
var6.triggerNote(var1, var2, var3, var4); var6.triggerNote(var1, var2, var3, var4);
} }
} }
@ -53,25 +53,25 @@ public class BlockNote extends BlockContainer {
} }
public void playBlock(World var1, int var2, int var3, int var4, int var5, int var6) { public void playBlock(World var1, int var2, int var3, int var4, int var5, int var6) {
float var7 = (float)Math.pow(2.0D, (double)(var6 - 12) / 12.0D); float var7 = (float) Math.pow(2.0D, (double) (var6 - 12) / 12.0D);
String var8 = "harp"; String var8 = "harp";
if(var5 == 1) { if (var5 == 1) {
var8 = "bd"; var8 = "bd";
} }
if(var5 == 2) { if (var5 == 2) {
var8 = "snare"; var8 = "snare";
} }
if(var5 == 3) { if (var5 == 3) {
var8 = "hat"; var8 = "hat";
} }
if(var5 == 4) { if (var5 == 4) {
var8 = "bassattack"; var8 = "bassattack";
} }
var1.playSoundEffect((double)var2 + 0.5D, (double)var3 + 0.5D, (double)var4 + 0.5D, "note." + var8, 3.0F, var7); var1.playSoundEffect((double) var2 + 0.5D, (double) var3 + 0.5D, (double) var4 + 0.5D, "note." + var8, 3.0F, var7);
var1.spawnParticle("note", (double)var2 + 0.5D, (double)var3 + 1.2D, (double)var4 + 0.5D, (double)var6 / 24.0D, 0.0D, 0.0D); var1.spawnParticle("note", (double) var2 + 0.5D, (double) var3 + 1.2D, (double) var4 + 0.5D, (double) var6 / 24.0D, 0.0D, 0.0D);
} }
} }

3
src/net/minecraft/block/BlockOre.java
View file

@ -1,9 +1,10 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import java.util.Random;
public class BlockOre extends Block { public class BlockOre extends Block {
public BlockOre(int var1, int var2) { public BlockOre(int var1, int var2) {
super(var1, var2, Material.rock); super(var1, var2, Material.rock);

105
src/net/minecraft/block/BlockPistonBase.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.ArrayList;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.tile.TileEntity; import net.minecraft.block.tile.TileEntity;
import net.minecraft.block.tile.TileEntityPiston; import net.minecraft.block.tile.TileEntityPiston;
@ -12,6 +11,8 @@ import net.minecraft.util.PistonBlockTextures;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.ArrayList;
public class BlockPistonBase extends Block { public class BlockPistonBase extends Block {
private boolean isSticky; private boolean isSticky;
private boolean ignoreUpdates; private boolean ignoreUpdates;
@ -37,23 +38,23 @@ public class BlockPistonBase extends Block {
} }
public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) { public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) {
int var6 = determineOrientation(var1, var2, var3, var4, (EntityPlayer)var5); int var6 = determineOrientation(var1, var2, var3, var4, (EntityPlayer) var5);
var1.setBlockMetadataWithNotify(var2, var3, var4, var6); var1.setBlockMetadataWithNotify(var2, var3, var4, var6);
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
this.updatePistonState(var1, var2, var3, var4); this.updatePistonState(var1, var2, var3, var4);
} }
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(!var1.singleplayerWorld && !this.ignoreUpdates) { if (!var1.singleplayerWorld && !this.ignoreUpdates) {
this.updatePistonState(var1, var2, var3, var4); this.updatePistonState(var1, var2, var3, var4);
} }
} }
public void onBlockAdded(World var1, int var2, int var3, int var4) { public void onBlockAdded(World var1, int var2, int var3, int var4) {
if(!var1.singleplayerWorld && var1.getBlockTileEntity(var2, var3, var4) == null) { if (!var1.singleplayerWorld && var1.getBlockTileEntity(var2, var3, var4) == null) {
this.updatePistonState(var1, var2, var3, var4); this.updatePistonState(var1, var2, var3, var4);
} }
@ -63,13 +64,13 @@ public class BlockPistonBase extends Block {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
int var6 = getOrientation(var5); int var6 = getOrientation(var5);
boolean var7 = this.isPowered(var1, var2, var3, var4, var6); boolean var7 = this.isPowered(var1, var2, var3, var4, var6);
if(var5 != 7) { if (var5 != 7) {
if(var7 && !isExtended(var5)) { if (var7 && !isExtended(var5)) {
if(canExtend(var1, var2, var3, var4, var6)) { if (canExtend(var1, var2, var3, var4, var6)) {
var1.setBlockMetadata(var2, var3, var4, var6 | 8); var1.setBlockMetadata(var2, var3, var4, var6 | 8);
var1.playNoteAt(var2, var3, var4, 0, var6); var1.playNoteAt(var2, var3, var4, 0, var6);
} }
} else if(!var7 && isExtended(var5)) { } else if (!var7 && isExtended(var5)) {
var1.setBlockMetadata(var2, var3, var4, var6); var1.setBlockMetadata(var2, var3, var4, var6);
var1.playNoteAt(var2, var3, var4, 1, var6); var1.playNoteAt(var2, var3, var4, 1, var6);
} }
@ -83,31 +84,31 @@ public class BlockPistonBase extends Block {
public void playBlock(World var1, int var2, int var3, int var4, int var5, int var6) { public void playBlock(World var1, int var2, int var3, int var4, int var5, int var6) {
this.ignoreUpdates = true; this.ignoreUpdates = true;
if(var5 == 0) { if (var5 == 0) {
if(this.tryExtend(var1, var2, var3, var4, var6)) { if (this.tryExtend(var1, var2, var3, var4, var6)) {
var1.setBlockMetadataWithNotify(var2, var3, var4, var6 | 8); var1.setBlockMetadataWithNotify(var2, var3, var4, var6 | 8);
var1.playSoundEffect((double)var2 + 0.5D, (double)var3 + 0.5D, (double)var4 + 0.5D, "tile.piston.out", 0.5F, var1.rand.nextFloat() * 0.25F + 0.6F); var1.playSoundEffect((double) var2 + 0.5D, (double) var3 + 0.5D, (double) var4 + 0.5D, "tile.piston.out", 0.5F, var1.rand.nextFloat() * 0.25F + 0.6F);
} }
} else if(var5 == 1) { } else if (var5 == 1) {
TileEntity var8 = var1.getBlockTileEntity(var2 + PistonBlockTextures.field_31051_b[var6], var3 + PistonBlockTextures.field_31054_c[var6], var4 + PistonBlockTextures.field_31053_d[var6]); TileEntity var8 = var1.getBlockTileEntity(var2 + PistonBlockTextures.field_31051_b[var6], var3 + PistonBlockTextures.field_31054_c[var6], var4 + PistonBlockTextures.field_31053_d[var6]);
if(var8 != null && var8 instanceof TileEntityPiston) { if (var8 != null && var8 instanceof TileEntityPiston) {
((TileEntityPiston)var8).clearPistonTileEntity(); ((TileEntityPiston) var8).clearPistonTileEntity();
} }
var1.setBlockAndMetadata(var2, var3, var4, Block.pistonMoving.blockID, var6); var1.setBlockAndMetadata(var2, var3, var4, Block.pistonMoving.blockID, var6);
var1.setBlockTileEntity(var2, var3, var4, BlockPistonMoving.getTileEntity(this.blockID, var6, var6, false, true)); var1.setBlockTileEntity(var2, var3, var4, BlockPistonMoving.getTileEntity(this.blockID, var6, var6, false, true));
if(this.isSticky) { if (this.isSticky) {
int var9 = var2 + PistonBlockTextures.field_31051_b[var6] * 2; int var9 = var2 + PistonBlockTextures.field_31051_b[var6] * 2;
int var10 = var3 + PistonBlockTextures.field_31054_c[var6] * 2; int var10 = var3 + PistonBlockTextures.field_31054_c[var6] * 2;
int var11 = var4 + PistonBlockTextures.field_31053_d[var6] * 2; int var11 = var4 + PistonBlockTextures.field_31053_d[var6] * 2;
int var12 = var1.getBlockId(var9, var10, var11); int var12 = var1.getBlockId(var9, var10, var11);
int var13 = var1.getBlockMetadata(var9, var10, var11); int var13 = var1.getBlockMetadata(var9, var10, var11);
boolean var14 = false; boolean var14 = false;
if(var12 == Block.pistonMoving.blockID) { if (var12 == Block.pistonMoving.blockID) {
TileEntity var15 = var1.getBlockTileEntity(var9, var10, var11); TileEntity var15 = var1.getBlockTileEntity(var9, var10, var11);
if(var15 != null && var15 instanceof TileEntityPiston) { if (var15 != null && var15 instanceof TileEntityPiston) {
TileEntityPiston var16 = (TileEntityPiston)var15; TileEntityPiston var16 = (TileEntityPiston) var15;
if(var16.func_31008_d() == var6 && var16.func_31010_c()) { if (var16.func_31008_d() == var6 && var16.func_31010_c()) {
var16.clearPistonTileEntity(); var16.clearPistonTileEntity();
var12 = var16.getStoredBlockID(); var12 = var16.getStoredBlockID();
var13 = var16.func_31005_e(); var13 = var16.func_31005_e();
@ -116,8 +117,8 @@ public class BlockPistonBase extends Block {
} }
} }
if(var14 || var12 <= 0 || !canPushBlock(var12, var1, var9, var10, var11, false) || Block.blocksList[var12].getMobilityFlag() != 0 && var12 != Block.pistonBase.blockID && var12 != Block.pistonStickyBase.blockID) { if (var14 || var12 <= 0 || !canPushBlock(var12, var1, var9, var10, var11, false) || Block.blocksList[var12].getMobilityFlag() != 0 && var12 != Block.pistonBase.blockID && var12 != Block.pistonStickyBase.blockID) {
if(!var14) { if (!var14) {
this.ignoreUpdates = false; this.ignoreUpdates = false;
var1.setBlockWithNotify(var2 + PistonBlockTextures.field_31051_b[var6], var3 + PistonBlockTextures.field_31054_c[var6], var4 + PistonBlockTextures.field_31053_d[var6], 0); var1.setBlockWithNotify(var2 + PistonBlockTextures.field_31051_b[var6], var3 + PistonBlockTextures.field_31054_c[var6], var4 + PistonBlockTextures.field_31053_d[var6], 0);
this.ignoreUpdates = true; this.ignoreUpdates = true;
@ -138,7 +139,7 @@ public class BlockPistonBase extends Block {
this.ignoreUpdates = true; this.ignoreUpdates = true;
} }
var1.playSoundEffect((double)var2 + 0.5D, (double)var3 + 0.5D, (double)var4 + 0.5D, "tile.piston.in", 0.5F, var1.rand.nextFloat() * 0.15F + 0.6F); var1.playSoundEffect((double) var2 + 0.5D, (double) var3 + 0.5D, (double) var4 + 0.5D, "tile.piston.in", 0.5F, var1.rand.nextFloat() * 0.15F + 0.6F);
} }
this.ignoreUpdates = false; this.ignoreUpdates = false;
@ -146,8 +147,8 @@ public class BlockPistonBase extends Block {
public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) { public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
if(isExtended(var5)) { if (isExtended(var5)) {
switch(getOrientation(var5)) { switch (getOrientation(var5)) {
case 0: case 0:
this.setBlockBounds(0.0F, 0.25F, 0.0F, 1.0F, 1.0F, 1.0F); this.setBlockBounds(0.0F, 0.25F, 0.0F, 1.0F, 1.0F, 1.0F);
break; break;
@ -190,38 +191,38 @@ public class BlockPistonBase extends Block {
} }
private static int determineOrientation(World var0, int var1, int var2, int var3, EntityPlayer var4) { private static int determineOrientation(World var0, int var1, int var2, int var3, EntityPlayer var4) {
if(MathHelper.abs((float)var4.posX - (float)var1) < 2.0F && MathHelper.abs((float)var4.posZ - (float)var3) < 2.0F) { if (MathHelper.abs((float) var4.posX - (float) var1) < 2.0F && MathHelper.abs((float) var4.posZ - (float) var3) < 2.0F) {
double var5 = var4.posY + 1.82D - (double)var4.yOffset; double var5 = var4.posY + 1.82D - (double) var4.yOffset;
if(var5 - (double)var2 > 2.0D) { if (var5 - (double) var2 > 2.0D) {
return 1; return 1;
} }
if((double)var2 - var5 > 0.0D) { if ((double) var2 - var5 > 0.0D) {
return 0; return 0;
} }
} }
int var7 = MathHelper.floor_double((double)(var4.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int var7 = MathHelper.floor_double((double) (var4.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
return var7 == 0 ? 2 : (var7 == 1 ? 5 : (var7 == 2 ? 3 : (var7 == 3 ? 4 : 0))); return var7 == 0 ? 2 : (var7 == 1 ? 5 : (var7 == 2 ? 3 : (var7 == 3 ? 4 : 0)));
} }
private static boolean canPushBlock(int var0, World var1, int var2, int var3, int var4, boolean var5) { private static boolean canPushBlock(int var0, World var1, int var2, int var3, int var4, boolean var5) {
if(var0 == Block.obsidian.blockID) { if (var0 == Block.obsidian.blockID) {
return false; return false;
} else { } else {
if(var0 != Block.pistonBase.blockID && var0 != Block.pistonStickyBase.blockID) { if (var0 != Block.pistonBase.blockID && var0 != Block.pistonStickyBase.blockID) {
if(Block.blocksList[var0].getHardness() == -1.0F) { if (Block.blocksList[var0].getHardness() == -1.0F) {
return false; return false;
} }
if(Block.blocksList[var0].getMobilityFlag() == 2) { if (Block.blocksList[var0].getMobilityFlag() == 2) {
return false; return false;
} }
if(!var5 && Block.blocksList[var0].getMobilityFlag() == 1) { if (!var5 && Block.blocksList[var0].getMobilityFlag() == 1) {
return false; return false;
} }
} else if(isExtended(var1.getBlockMetadata(var2, var3, var4))) { } else if (isExtended(var1.getBlockMetadata(var2, var3, var4))) {
return false; return false;
} }
@ -236,20 +237,20 @@ public class BlockPistonBase extends Block {
int var7 = var3 + PistonBlockTextures.field_31053_d[var4]; int var7 = var3 + PistonBlockTextures.field_31053_d[var4];
int var8 = 0; int var8 = 0;
while(true) { while (true) {
if(var8 < 13) { if (var8 < 13) {
if(var6 <= 0 || var6 >= 127) { if (var6 <= 0 || var6 >= 127) {
return false; return false;
} }
int var9 = var0.getBlockId(var5, var6, var7); int var9 = var0.getBlockId(var5, var6, var7);
if(var9 != 0) { if (var9 != 0) {
if(!canPushBlock(var9, var0, var5, var6, var7, true)) { if (!canPushBlock(var9, var0, var5, var6, var7, true)) {
return false; return false;
} }
if(Block.blocksList[var9].getMobilityFlag() != 1) { if (Block.blocksList[var9].getMobilityFlag() != 1) {
if(var8 == 12) { if (var8 == 12) {
return false; return false;
} }
@ -272,21 +273,21 @@ public class BlockPistonBase extends Block {
int var8 = var4 + PistonBlockTextures.field_31053_d[var5]; int var8 = var4 + PistonBlockTextures.field_31053_d[var5];
int var9 = 0; int var9 = 0;
while(true) { while (true) {
int var10; int var10;
if(var9 < 13) { if (var9 < 13) {
if(var7 <= 0 || var7 >= 127) { if (var7 <= 0 || var7 >= 127) {
return false; return false;
} }
var10 = var1.getBlockId(var6, var7, var8); var10 = var1.getBlockId(var6, var7, var8);
if(var10 != 0) { if (var10 != 0) {
if(!canPushBlock(var10, var1, var6, var7, var8, true)) { if (!canPushBlock(var10, var1, var6, var7, var8, true)) {
return false; return false;
} }
if(Block.blocksList[var10].getMobilityFlag() != 1) { if (Block.blocksList[var10].getMobilityFlag() != 1) {
if(var9 == 12) { if (var9 == 12) {
return false; return false;
} }
@ -302,13 +303,13 @@ public class BlockPistonBase extends Block {
} }
} }
while(var6 != var2 || var7 != var3 || var8 != var4) { while (var6 != var2 || var7 != var3 || var8 != var4) {
var9 = var6 - PistonBlockTextures.field_31051_b[var5]; var9 = var6 - PistonBlockTextures.field_31051_b[var5];
var10 = var7 - PistonBlockTextures.field_31054_c[var5]; var10 = var7 - PistonBlockTextures.field_31054_c[var5];
int var11 = var8 - PistonBlockTextures.field_31053_d[var5]; int var11 = var8 - PistonBlockTextures.field_31053_d[var5];
int var12 = var1.getBlockId(var9, var10, var11); int var12 = var1.getBlockId(var9, var10, var11);
int var13 = var1.getBlockMetadata(var9, var10, var11); int var13 = var1.getBlockMetadata(var9, var10, var11);
if(var12 == this.blockID && var9 == var2 && var10 == var3 && var11 == var4) { if (var12 == this.blockID && var9 == var2 && var10 == var3 && var11 == var4) {
var1.setBlockAndMetadata(var6, var7, var8, Block.pistonMoving.blockID, var5 | (this.isSticky ? 8 : 0)); var1.setBlockAndMetadata(var6, var7, var8, Block.pistonMoving.blockID, var5 | (this.isSticky ? 8 : 0));
var1.setBlockTileEntity(var6, var7, var8, BlockPistonMoving.getTileEntity(Block.pistonExtension.blockID, var5 | (this.isSticky ? 8 : 0), var5, true, false)); var1.setBlockTileEntity(var6, var7, var8, BlockPistonMoving.getTileEntity(Block.pistonExtension.blockID, var5 | (this.isSticky ? 8 : 0), var5, true, false));
} else { } else {

15
src/net/minecraft/block/BlockPistonExtension.java
View file

@ -1,13 +1,14 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.ArrayList;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.util.PistonBlockTextures; import net.minecraft.util.PistonBlockTextures;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.Random;
public class BlockPistonExtension extends Block { public class BlockPistonExtension extends Block {
private int field_31046_a = -1; private int field_31046_a = -1;
@ -25,9 +26,9 @@ public class BlockPistonExtension extends Block {
var3 += PistonBlockTextures.field_31054_c[var6]; var3 += PistonBlockTextures.field_31054_c[var6];
var4 += PistonBlockTextures.field_31053_d[var6]; var4 += PistonBlockTextures.field_31053_d[var6];
int var7 = var1.getBlockId(var2, var3, var4); int var7 = var1.getBlockId(var2, var3, var4);
if(var7 == Block.pistonBase.blockID || var7 == Block.pistonStickyBase.blockID) { if (var7 == Block.pistonBase.blockID || var7 == Block.pistonStickyBase.blockID) {
var5 = var1.getBlockMetadata(var2, var3, var4); var5 = var1.getBlockMetadata(var2, var3, var4);
if(BlockPistonBase.isExtended(var5)) { if (BlockPistonBase.isExtended(var5)) {
Block.blocksList[var7].dropBlockAsItem(var1, var2, var3, var4, var5); Block.blocksList[var7].dropBlockAsItem(var1, var2, var3, var4, var5);
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
@ -62,7 +63,7 @@ public class BlockPistonExtension extends Block {
public void getCollidingBoundingBoxes(World var1, int var2, int var3, int var4, AxisAlignedBB var5, ArrayList var6) { public void getCollidingBoundingBoxes(World var1, int var2, int var3, int var4, AxisAlignedBB var5, ArrayList var6) {
int var7 = var1.getBlockMetadata(var2, var3, var4); int var7 = var1.getBlockMetadata(var2, var3, var4);
switch(func_31045_b(var7)) { switch (func_31045_b(var7)) {
case 0: case 0:
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.25F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.25F, 1.0F);
super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6); super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6);
@ -105,7 +106,7 @@ public class BlockPistonExtension extends Block {
public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) { public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
switch(func_31045_b(var5)) { switch (func_31045_b(var5)) {
case 0: case 0:
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.25F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.25F, 1.0F);
break; break;
@ -130,7 +131,7 @@ public class BlockPistonExtension extends Block {
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
int var6 = func_31045_b(var1.getBlockMetadata(var2, var3, var4)); int var6 = func_31045_b(var1.getBlockMetadata(var2, var3, var4));
int var7 = var1.getBlockId(var2 - PistonBlockTextures.field_31051_b[var6], var3 - PistonBlockTextures.field_31054_c[var6], var4 - PistonBlockTextures.field_31053_d[var6]); int var7 = var1.getBlockId(var2 - PistonBlockTextures.field_31051_b[var6], var3 - PistonBlockTextures.field_31054_c[var6], var4 - PistonBlockTextures.field_31053_d[var6]);
if(var7 != Block.pistonBase.blockID && var7 != Block.pistonStickyBase.blockID) { if (var7 != Block.pistonBase.blockID && var7 != Block.pistonStickyBase.blockID) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} else { } else {
Block.blocksList[var7].onNeighborBlockChange(var1, var2 - PistonBlockTextures.field_31051_b[var6], var3 - PistonBlockTextures.field_31054_c[var6], var4 - PistonBlockTextures.field_31053_d[var6], var5); Block.blocksList[var7].onNeighborBlockChange(var1, var2 - PistonBlockTextures.field_31051_b[var6], var3 - PistonBlockTextures.field_31054_c[var6], var4 - PistonBlockTextures.field_31053_d[var6], var5);

55
src/net/minecraft/block/BlockPistonMoving.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.tile.TileEntity; import net.minecraft.block.tile.TileEntity;
import net.minecraft.block.tile.TileEntityPiston; import net.minecraft.block.tile.TileEntityPiston;
@ -10,6 +9,8 @@ import net.minecraft.util.PistonBlockTextures;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockPistonMoving extends BlockContainer { public class BlockPistonMoving extends BlockContainer {
public BlockPistonMoving(int var1) { public BlockPistonMoving(int var1) {
super(var1, Material.piston); super(var1, Material.piston);
@ -25,8 +26,8 @@ public class BlockPistonMoving extends BlockContainer {
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
TileEntity var5 = var1.getBlockTileEntity(var2, var3, var4); TileEntity var5 = var1.getBlockTileEntity(var2, var3, var4);
if(var5 != null && var5 instanceof TileEntityPiston) { if (var5 != null && var5 instanceof TileEntityPiston) {
((TileEntityPiston)var5).clearPistonTileEntity(); ((TileEntityPiston) var5).clearPistonTileEntity();
} else { } else {
super.onBlockRemoval(var1, var2, var3, var4); super.onBlockRemoval(var1, var2, var3, var4);
} }
@ -50,7 +51,7 @@ public class BlockPistonMoving extends BlockContainer {
} }
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) { public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(!var1.singleplayerWorld && var1.getBlockTileEntity(var2, var3, var4) == null) { if (!var1.singleplayerWorld && var1.getBlockTileEntity(var2, var3, var4) == null) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
return true; return true;
} else { } else {
@ -63,16 +64,16 @@ public class BlockPistonMoving extends BlockContainer {
} }
public void dropBlockAsItemWithChance(World var1, int var2, int var3, int var4, int var5, float var6) { public void dropBlockAsItemWithChance(World var1, int var2, int var3, int var4, int var5, float var6) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
TileEntityPiston var7 = this.getTileEntityAtLocation(var1, var2, var3, var4); TileEntityPiston var7 = this.getTileEntityAtLocation(var1, var2, var3, var4);
if(var7 != null) { if (var7 != null) {
Block.blocksList[var7.getStoredBlockID()].dropBlockAsItem(var1, var2, var3, var4, var7.func_31005_e()); Block.blocksList[var7.getStoredBlockID()].dropBlockAsItem(var1, var2, var3, var4, var7.func_31005_e());
} }
} }
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(!var1.singleplayerWorld && var1.getBlockTileEntity(var2, var3, var4) == null) { if (!var1.singleplayerWorld && var1.getBlockTileEntity(var2, var3, var4) == null) {
} }
} }
@ -83,11 +84,11 @@ public class BlockPistonMoving extends BlockContainer {
public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) { public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) {
TileEntityPiston var5 = this.getTileEntityAtLocation(var1, var2, var3, var4); TileEntityPiston var5 = this.getTileEntityAtLocation(var1, var2, var3, var4);
if(var5 == null) { if (var5 == null) {
return null; return null;
} else { } else {
float var6 = var5.func_31007_a(0.0F); float var6 = var5.func_31007_a(0.0F);
if(var5.func_31010_c()) { if (var5.func_31010_c()) {
var6 = 1.0F - var6; var6 = 1.0F - var6;
} }
@ -97,41 +98,41 @@ public class BlockPistonMoving extends BlockContainer {
public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) { public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) {
TileEntityPiston var5 = this.getTileEntityAtLocation(var1, var2, var3, var4); TileEntityPiston var5 = this.getTileEntityAtLocation(var1, var2, var3, var4);
if(var5 != null) { if (var5 != null) {
Block var6 = Block.blocksList[var5.getStoredBlockID()]; Block var6 = Block.blocksList[var5.getStoredBlockID()];
if(var6 == null || var6 == this) { if (var6 == null || var6 == this) {
return; return;
} }
var6.setBlockBoundsBasedOnState(var1, var2, var3, var4); var6.setBlockBoundsBasedOnState(var1, var2, var3, var4);
float var7 = var5.func_31007_a(0.0F); float var7 = var5.func_31007_a(0.0F);
if(var5.func_31010_c()) { if (var5.func_31010_c()) {
var7 = 1.0F - var7; var7 = 1.0F - var7;
} }
int var8 = var5.func_31008_d(); int var8 = var5.func_31008_d();
this.minX = var6.minX - (double)((float)PistonBlockTextures.field_31051_b[var8] * var7); this.minX = var6.minX - (double) ((float) PistonBlockTextures.field_31051_b[var8] * var7);
this.minY = var6.minY - (double)((float)PistonBlockTextures.field_31054_c[var8] * var7); this.minY = var6.minY - (double) ((float) PistonBlockTextures.field_31054_c[var8] * var7);
this.minZ = var6.minZ - (double)((float)PistonBlockTextures.field_31053_d[var8] * var7); this.minZ = var6.minZ - (double) ((float) PistonBlockTextures.field_31053_d[var8] * var7);
this.maxX = var6.maxX - (double)((float)PistonBlockTextures.field_31051_b[var8] * var7); this.maxX = var6.maxX - (double) ((float) PistonBlockTextures.field_31051_b[var8] * var7);
this.maxY = var6.maxY - (double)((float)PistonBlockTextures.field_31054_c[var8] * var7); this.maxY = var6.maxY - (double) ((float) PistonBlockTextures.field_31054_c[var8] * var7);
this.maxZ = var6.maxZ - (double)((float)PistonBlockTextures.field_31053_d[var8] * var7); this.maxZ = var6.maxZ - (double) ((float) PistonBlockTextures.field_31053_d[var8] * var7);
} }
} }
public AxisAlignedBB func_31032_a(World var1, int var2, int var3, int var4, int var5, float var6, int var7) { public AxisAlignedBB func_31032_a(World var1, int var2, int var3, int var4, int var5, float var6, int var7) {
if(var5 != 0 && var5 != this.blockID) { if (var5 != 0 && var5 != this.blockID) {
AxisAlignedBB var8 = Block.blocksList[var5].getCollisionBoundingBoxFromPool(var1, var2, var3, var4); AxisAlignedBB var8 = Block.blocksList[var5].getCollisionBoundingBoxFromPool(var1, var2, var3, var4);
if(var8 == null) { if (var8 == null) {
return null; return null;
} else { } else {
var8.minX -= (double)((float)PistonBlockTextures.field_31051_b[var7] * var6); var8.minX -= (double) ((float) PistonBlockTextures.field_31051_b[var7] * var6);
var8.maxX -= (double)((float)PistonBlockTextures.field_31051_b[var7] * var6); var8.maxX -= (double) ((float) PistonBlockTextures.field_31051_b[var7] * var6);
var8.minY -= (double)((float)PistonBlockTextures.field_31054_c[var7] * var6); var8.minY -= (double) ((float) PistonBlockTextures.field_31054_c[var7] * var6);
var8.maxY -= (double)((float)PistonBlockTextures.field_31054_c[var7] * var6); var8.maxY -= (double) ((float) PistonBlockTextures.field_31054_c[var7] * var6);
var8.minZ -= (double)((float)PistonBlockTextures.field_31053_d[var7] * var6); var8.minZ -= (double) ((float) PistonBlockTextures.field_31053_d[var7] * var6);
var8.maxZ -= (double)((float)PistonBlockTextures.field_31053_d[var7] * var6); var8.maxZ -= (double) ((float) PistonBlockTextures.field_31053_d[var7] * var6);
return var8; return var8;
} }
} else { } else {
@ -141,6 +142,6 @@ public class BlockPistonMoving extends BlockContainer {
private TileEntityPiston getTileEntityAtLocation(IBlockAccess var1, int var2, int var3, int var4) { private TileEntityPiston getTileEntityAtLocation(IBlockAccess var1, int var2, int var3, int var4) {
TileEntity var5 = var1.getBlockTileEntity(var2, var3, var4); TileEntity var5 = var1.getBlockTileEntity(var2, var3, var4);
return var5 != null && var5 instanceof TileEntityPiston ? (TileEntityPiston)var5 : null; return var5 != null && var5 instanceof TileEntityPiston ? (TileEntityPiston) var5 : null;
} }
} }

45
src/net/minecraft/block/BlockPortal.java
View file

@ -1,12 +1,13 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockPortal extends BlockBreakable { public class BlockPortal extends BlockBreakable {
public BlockPortal(int var1, int var2) { public BlockPortal(int var1, int var2) {
super(var1, var2, Material.portal, false); super(var1, var2, Material.portal, false);
@ -19,7 +20,7 @@ public class BlockPortal extends BlockBreakable {
public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) { public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) {
float var5; float var5;
float var6; float var6;
if(var1.getBlockId(var2 - 1, var3, var4) != this.blockID && var1.getBlockId(var2 + 1, var3, var4) != this.blockID) { if (var1.getBlockId(var2 - 1, var3, var4) != this.blockID && var1.getBlockId(var2 + 1, var3, var4) != this.blockID) {
var5 = 2.0F / 16.0F; var5 = 2.0F / 16.0F;
var6 = 0.5F; var6 = 0.5F;
this.setBlockBounds(0.5F - var5, 0.0F, 0.5F - var6, 0.5F + var5, 1.0F, 0.5F + var6); this.setBlockBounds(0.5F - var5, 0.0F, 0.5F - var6, 0.5F + var5, 1.0F, 0.5F + var6);
@ -42,34 +43,34 @@ public class BlockPortal extends BlockBreakable {
public boolean tryToCreatePortal(World var1, int var2, int var3, int var4) { public boolean tryToCreatePortal(World var1, int var2, int var3, int var4) {
byte var5 = 0; byte var5 = 0;
byte var6 = 0; byte var6 = 0;
if(var1.getBlockId(var2 - 1, var3, var4) == Block.obsidian.blockID || var1.getBlockId(var2 + 1, var3, var4) == Block.obsidian.blockID) { if (var1.getBlockId(var2 - 1, var3, var4) == Block.obsidian.blockID || var1.getBlockId(var2 + 1, var3, var4) == Block.obsidian.blockID) {
var5 = 1; var5 = 1;
} }
if(var1.getBlockId(var2, var3, var4 - 1) == Block.obsidian.blockID || var1.getBlockId(var2, var3, var4 + 1) == Block.obsidian.blockID) { if (var1.getBlockId(var2, var3, var4 - 1) == Block.obsidian.blockID || var1.getBlockId(var2, var3, var4 + 1) == Block.obsidian.blockID) {
var6 = 1; var6 = 1;
} }
if(var5 == var6) { if (var5 == var6) {
return false; return false;
} else { } else {
if(var1.getBlockId(var2 - var5, var3, var4 - var6) == 0) { if (var1.getBlockId(var2 - var5, var3, var4 - var6) == 0) {
var2 -= var5; var2 -= var5;
var4 -= var6; var4 -= var6;
} }
int var7; int var7;
int var8; int var8;
for(var7 = -1; var7 <= 2; ++var7) { for (var7 = -1; var7 <= 2; ++var7) {
for(var8 = -1; var8 <= 3; ++var8) { for (var8 = -1; var8 <= 3; ++var8) {
boolean var9 = var7 == -1 || var7 == 2 || var8 == -1 || var8 == 3; boolean var9 = var7 == -1 || var7 == 2 || var8 == -1 || var8 == 3;
if(var7 != -1 && var7 != 2 || var8 != -1 && var8 != 3) { if (var7 != -1 && var7 != 2 || var8 != -1 && var8 != 3) {
int var10 = var1.getBlockId(var2 + var5 * var7, var3 + var8, var4 + var6 * var7); int var10 = var1.getBlockId(var2 + var5 * var7, var3 + var8, var4 + var6 * var7);
if(var9) { if (var9) {
if(var10 != Block.obsidian.blockID) { if (var10 != Block.obsidian.blockID) {
return false; return false;
} }
} else if(var10 != 0 && var10 != Block.fire.blockID) { } else if (var10 != 0 && var10 != Block.fire.blockID) {
return false; return false;
} }
} }
@ -78,8 +79,8 @@ public class BlockPortal extends BlockBreakable {
var1.editingBlocks = true; var1.editingBlocks = true;
for(var7 = 0; var7 < 2; ++var7) { for (var7 = 0; var7 < 2; ++var7) {
for(var8 = 0; var8 < 3; ++var8) { for (var8 = 0; var8 < 3; ++var8) {
var1.setBlockWithNotify(var2 + var5 * var7, var3 + var8, var4 + var6 * var7, Block.portal.blockID); var1.setBlockWithNotify(var2 + var5 * var7, var3 + var8, var4 + var6 * var7, Block.portal.blockID);
} }
} }
@ -92,28 +93,28 @@ public class BlockPortal extends BlockBreakable {
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
byte var6 = 0; byte var6 = 0;
byte var7 = 1; byte var7 = 1;
if(var1.getBlockId(var2 - 1, var3, var4) == this.blockID || var1.getBlockId(var2 + 1, var3, var4) == this.blockID) { if (var1.getBlockId(var2 - 1, var3, var4) == this.blockID || var1.getBlockId(var2 + 1, var3, var4) == this.blockID) {
var6 = 1; var6 = 1;
var7 = 0; var7 = 0;
} }
int var8; int var8;
for(var8 = var3; var1.getBlockId(var2, var8 - 1, var4) == this.blockID; --var8) { for (var8 = var3; var1.getBlockId(var2, var8 - 1, var4) == this.blockID; --var8) {
} }
if(var1.getBlockId(var2, var8 - 1, var4) != Block.obsidian.blockID) { if (var1.getBlockId(var2, var8 - 1, var4) != Block.obsidian.blockID) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} else { } else {
int var9; int var9;
for(var9 = 1; var9 < 4 && var1.getBlockId(var2, var8 + var9, var4) == this.blockID; ++var9) { for (var9 = 1; var9 < 4 && var1.getBlockId(var2, var8 + var9, var4) == this.blockID; ++var9) {
} }
if(var9 == 3 && var1.getBlockId(var2, var8 + var9, var4) == Block.obsidian.blockID) { if (var9 == 3 && var1.getBlockId(var2, var8 + var9, var4) == Block.obsidian.blockID) {
boolean var10 = var1.getBlockId(var2 - 1, var3, var4) == this.blockID || var1.getBlockId(var2 + 1, var3, var4) == this.blockID; boolean var10 = var1.getBlockId(var2 - 1, var3, var4) == this.blockID || var1.getBlockId(var2 + 1, var3, var4) == this.blockID;
boolean var11 = var1.getBlockId(var2, var3, var4 - 1) == this.blockID || var1.getBlockId(var2, var3, var4 + 1) == this.blockID; boolean var11 = var1.getBlockId(var2, var3, var4 - 1) == this.blockID || var1.getBlockId(var2, var3, var4 + 1) == this.blockID;
if(var10 && var11) { if (var10 && var11) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} else if((var1.getBlockId(var2 + var6, var3, var4 + var7) != Block.obsidian.blockID || var1.getBlockId(var2 - var6, var3, var4 - var7) != this.blockID) && (var1.getBlockId(var2 - var6, var3, var4 - var7) != Block.obsidian.blockID || var1.getBlockId(var2 + var6, var3, var4 + var7) != this.blockID)) { } else if ((var1.getBlockId(var2 + var6, var3, var4 + var7) != Block.obsidian.blockID || var1.getBlockId(var2 - var6, var3, var4 - var7) != this.blockID) && (var1.getBlockId(var2 - var6, var3, var4 - var7) != Block.obsidian.blockID || var1.getBlockId(var2 + var6, var3, var4 + var7) != this.blockID)) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
} else { } else {
@ -127,7 +128,7 @@ public class BlockPortal extends BlockBreakable {
} }
public void onEntityCollidedWithBlock(World var1, int var2, int var3, int var4, Entity var5) { public void onEntityCollidedWithBlock(World var1, int var2, int var3, int var4, Entity var5) {
if(var5.ridingEntity == null && var5.riddenByEntity == null) { if (var5.ridingEntity == null && var5.riddenByEntity == null) {
var5.setInPortal(); var5.setInPortal();
} }

45
src/net/minecraft/block/BlockPressurePlate.java
View file

@ -1,7 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.List;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
@ -11,6 +9,9 @@ import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class BlockPressurePlate extends Block { public class BlockPressurePlate extends Block {
private EnumMobType triggerMobType; private EnumMobType triggerMobType;
@ -47,11 +48,11 @@ public class BlockPressurePlate extends Block {
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
boolean var6 = false; boolean var6 = false;
if(!var1.isBlockNormalCube(var2, var3 - 1, var4)) { if (!var1.isBlockNormalCube(var2, var3 - 1, var4)) {
var6 = true; var6 = true;
} }
if(var6) { if (var6) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
@ -59,16 +60,16 @@ public class BlockPressurePlate extends Block {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
if(var1.getBlockMetadata(var2, var3, var4) != 0) { if (var1.getBlockMetadata(var2, var3, var4) != 0) {
this.setStateIfMobInteractsWithPlate(var1, var2, var3, var4); this.setStateIfMobInteractsWithPlate(var1, var2, var3, var4);
} }
} }
} }
public void onEntityCollidedWithBlock(World var1, int var2, int var3, int var4, Entity var5) { public void onEntityCollidedWithBlock(World var1, int var2, int var3, int var4, Entity var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
if(var1.getBlockMetadata(var2, var3, var4) != 1) { if (var1.getBlockMetadata(var2, var3, var4) != 1) {
this.setStateIfMobInteractsWithPlate(var1, var2, var3, var4); this.setStateIfMobInteractsWithPlate(var1, var2, var3, var4);
} }
} }
@ -79,39 +80,39 @@ public class BlockPressurePlate extends Block {
boolean var6 = false; boolean var6 = false;
float var7 = 2.0F / 16.0F; float var7 = 2.0F / 16.0F;
List var8 = null; List var8 = null;
if(this.triggerMobType == EnumMobType.everything) { if (this.triggerMobType == EnumMobType.everything) {
var8 = var1.getEntitiesWithinAABBExcludingEntity((Entity)null, AxisAlignedBB.getBoundingBoxFromPool((double)((float)var2 + var7), (double)var3, (double)((float)var4 + var7), (double)((float)(var2 + 1) - var7), (double)var3 + 0.25D, (double)((float)(var4 + 1) - var7))); var8 = var1.getEntitiesWithinAABBExcludingEntity((Entity) null, AxisAlignedBB.getBoundingBoxFromPool((double) ((float) var2 + var7), (double) var3, (double) ((float) var4 + var7), (double) ((float) (var2 + 1) - var7), (double) var3 + 0.25D, (double) ((float) (var4 + 1) - var7)));
} }
if(this.triggerMobType == EnumMobType.mobs) { if (this.triggerMobType == EnumMobType.mobs) {
var8 = var1.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBoxFromPool((double)((float)var2 + var7), (double)var3, (double)((float)var4 + var7), (double)((float)(var2 + 1) - var7), (double)var3 + 0.25D, (double)((float)(var4 + 1) - var7))); var8 = var1.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBoxFromPool((double) ((float) var2 + var7), (double) var3, (double) ((float) var4 + var7), (double) ((float) (var2 + 1) - var7), (double) var3 + 0.25D, (double) ((float) (var4 + 1) - var7)));
} }
if(this.triggerMobType == EnumMobType.players) { if (this.triggerMobType == EnumMobType.players) {
var8 = var1.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBoxFromPool((double)((float)var2 + var7), (double)var3, (double)((float)var4 + var7), (double)((float)(var2 + 1) - var7), (double)var3 + 0.25D, (double)((float)(var4 + 1) - var7))); var8 = var1.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBoxFromPool((double) ((float) var2 + var7), (double) var3, (double) ((float) var4 + var7), (double) ((float) (var2 + 1) - var7), (double) var3 + 0.25D, (double) ((float) (var4 + 1) - var7)));
} }
if(var8.size() > 0) { if (var8.size() > 0) {
var6 = true; var6 = true;
} }
if(var6 && !var5) { if (var6 && !var5) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 1); var1.setBlockMetadataWithNotify(var2, var3, var4, 1);
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
var1.markBlocksDirty(var2, var3, var4, var2, var3, var4); var1.markBlocksDirty(var2, var3, var4, var2, var3, var4);
var1.playSoundEffect((double)var2 + 0.5D, (double)var3 + 0.1D, (double)var4 + 0.5D, "random.click", 0.3F, 0.6F); var1.playSoundEffect((double) var2 + 0.5D, (double) var3 + 0.1D, (double) var4 + 0.5D, "random.click", 0.3F, 0.6F);
} }
if(!var6 && var5) { if (!var6 && var5) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 0); var1.setBlockMetadataWithNotify(var2, var3, var4, 0);
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
var1.markBlocksDirty(var2, var3, var4, var2, var3, var4); var1.markBlocksDirty(var2, var3, var4, var2, var3, var4);
var1.playSoundEffect((double)var2 + 0.5D, (double)var3 + 0.1D, (double)var4 + 0.5D, "random.click", 0.3F, 0.5F); var1.playSoundEffect((double) var2 + 0.5D, (double) var3 + 0.1D, (double) var4 + 0.5D, "random.click", 0.3F, 0.5F);
} }
if(var6) { if (var6) {
var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate()); var1.scheduleUpdateTick(var2, var3, var4, this.blockID, this.tickRate());
} }
@ -119,7 +120,7 @@ public class BlockPressurePlate extends Block {
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
if(var5 > 0) { if (var5 > 0) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
} }
@ -130,7 +131,7 @@ public class BlockPressurePlate extends Block {
public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) { public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) {
boolean var5 = var1.getBlockMetadata(var2, var3, var4) == 1; boolean var5 = var1.getBlockMetadata(var2, var3, var4) == 1;
float var6 = 1.0F / 16.0F; float var6 = 1.0F / 16.0F;
if(var5) { if (var5) {
this.setBlockBounds(var6, 0.0F, var6, 1.0F - var6, 0.03125F, 1.0F - var6); this.setBlockBounds(var6, 0.0F, var6, 1.0F - var6, 0.03125F, 1.0F - var6);
} else { } else {
this.setBlockBounds(var6, 0.0F, var6, 1.0F - var6, 1.0F / 16.0F, 1.0F - var6); this.setBlockBounds(var6, 0.0F, var6, 1.0F - var6, 1.0F / 16.0F, 1.0F - var6);

8
src/net/minecraft/block/BlockPumpkin.java
View file

@ -16,13 +16,13 @@ public class BlockPumpkin extends Block {
} }
public int getBlockTextureFromSideAndMetadata(int var1, int var2) { public int getBlockTextureFromSideAndMetadata(int var1, int var2) {
if(var1 == 1) { if (var1 == 1) {
return this.blockIndexInTexture; return this.blockIndexInTexture;
} else if(var1 == 0) { } else if (var1 == 0) {
return this.blockIndexInTexture; return this.blockIndexInTexture;
} else { } else {
int var3 = this.blockIndexInTexture + 1 + 16; int var3 = this.blockIndexInTexture + 1 + 16;
if(this.blockType) { if (this.blockType) {
++var3; ++var3;
} }
@ -44,7 +44,7 @@ public class BlockPumpkin extends Block {
} }
public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) { public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) {
int var6 = MathHelper.floor_double((double)(var5.rotationYaw * 4.0F / 360.0F) + 2.5D) & 3; int var6 = MathHelper.floor_double((double) (var5.rotationYaw * 4.0F / 360.0F) + 2.5D) & 3;
var1.setBlockMetadataWithNotify(var2, var3, var4, var6); var1.setBlockMetadataWithNotify(var2, var3, var4, var6);
} }
} }

69
src/net/minecraft/block/BlockRail.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.math.Vec3D; import net.minecraft.math.Vec3D;
@ -8,6 +7,8 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockRail extends Block { public class BlockRail extends Block {
private final boolean field_27034_a; private final boolean field_27034_a;
@ -45,7 +46,7 @@ public class BlockRail extends Block {
public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) { public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
if(var5 >= 2 && var5 <= 5) { if (var5 >= 2 && var5 <= 5) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 10.0F / 16.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 10.0F / 16.0F, 1.0F);
} else { } else {
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 2.0F / 16.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 2.0F / 16.0F, 1.0F);
@ -54,11 +55,11 @@ public class BlockRail extends Block {
} }
public int getBlockTextureFromSideAndMetadata(int var1, int var2) { public int getBlockTextureFromSideAndMetadata(int var1, int var2) {
if(this.field_27034_a) { if (this.field_27034_a) {
if(this.blockID == Block.railPowered.blockID && (var2 & 8) == 0) { if (this.blockID == Block.railPowered.blockID && (var2 & 8) == 0) {
return this.blockIndexInTexture - 16; return this.blockIndexInTexture - 16;
} }
} else if(var2 >= 6) { } else if (var2 >= 6) {
return this.blockIndexInTexture - 16; return this.blockIndexInTexture - 16;
} }
@ -78,63 +79,63 @@ public class BlockRail extends Block {
} }
public void onBlockAdded(World var1, int var2, int var3, int var4) { public void onBlockAdded(World var1, int var2, int var3, int var4) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
this.func_4038_g(var1, var2, var3, var4, true); this.func_4038_g(var1, var2, var3, var4, true);
} }
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
int var7 = var6; int var7 = var6;
if(this.field_27034_a) { if (this.field_27034_a) {
var7 = var6 & 7; var7 = var6 & 7;
} }
boolean var8 = false; boolean var8 = false;
if(!var1.isBlockNormalCube(var2, var3 - 1, var4)) { if (!var1.isBlockNormalCube(var2, var3 - 1, var4)) {
var8 = true; var8 = true;
} }
if(var7 == 2 && !var1.isBlockNormalCube(var2 + 1, var3, var4)) { if (var7 == 2 && !var1.isBlockNormalCube(var2 + 1, var3, var4)) {
var8 = true; var8 = true;
} }
if(var7 == 3 && !var1.isBlockNormalCube(var2 - 1, var3, var4)) { if (var7 == 3 && !var1.isBlockNormalCube(var2 - 1, var3, var4)) {
var8 = true; var8 = true;
} }
if(var7 == 4 && !var1.isBlockNormalCube(var2, var3, var4 - 1)) { if (var7 == 4 && !var1.isBlockNormalCube(var2, var3, var4 - 1)) {
var8 = true; var8 = true;
} }
if(var7 == 5 && !var1.isBlockNormalCube(var2, var3, var4 + 1)) { if (var7 == 5 && !var1.isBlockNormalCube(var2, var3, var4 + 1)) {
var8 = true; var8 = true;
} }
if(var8) { if (var8) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} else if(this.blockID == Block.railPowered.blockID) { } else if (this.blockID == Block.railPowered.blockID) {
boolean var9 = var1.isBlockIndirectlyGettingPowered(var2, var3, var4) || var1.isBlockIndirectlyGettingPowered(var2, var3 + 1, var4); boolean var9 = var1.isBlockIndirectlyGettingPowered(var2, var3, var4) || var1.isBlockIndirectlyGettingPowered(var2, var3 + 1, var4);
var9 = var9 || this.func_27032_a(var1, var2, var3, var4, var6, true, 0) || this.func_27032_a(var1, var2, var3, var4, var6, false, 0); var9 = var9 || this.func_27032_a(var1, var2, var3, var4, var6, true, 0) || this.func_27032_a(var1, var2, var3, var4, var6, false, 0);
boolean var10 = false; boolean var10 = false;
if(var9 && (var6 & 8) == 0) { if (var9 && (var6 & 8) == 0) {
var1.setBlockMetadataWithNotify(var2, var3, var4, var7 | 8); var1.setBlockMetadataWithNotify(var2, var3, var4, var7 | 8);
var10 = true; var10 = true;
} else if(!var9 && (var6 & 8) != 0) { } else if (!var9 && (var6 & 8) != 0) {
var1.setBlockMetadataWithNotify(var2, var3, var4, var7); var1.setBlockMetadataWithNotify(var2, var3, var4, var7);
var10 = true; var10 = true;
} }
if(var10) { if (var10) {
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
if(var7 == 2 || var7 == 3 || var7 == 4 || var7 == 5) { if (var7 == 2 || var7 == 3 || var7 == 4 || var7 == 5) {
var1.notifyBlocksOfNeighborChange(var2, var3 + 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 + 1, var4, this.blockID);
} }
} }
} else if(var5 > 0 && Block.blocksList[var5].canProvidePower() && !this.field_27034_a && RailLogic.getNAdjacentTracks(new RailLogic(this, var1, var2, var3, var4)) == 3) { } else if (var5 > 0 && Block.blocksList[var5].canProvidePower() && !this.field_27034_a && RailLogic.getNAdjacentTracks(new RailLogic(this, var1, var2, var3, var4)) == 3) {
this.func_4038_g(var1, var2, var3, var4, false); this.func_4038_g(var1, var2, var3, var4, false);
} }
@ -142,34 +143,34 @@ public class BlockRail extends Block {
} }
private void func_4038_g(World var1, int var2, int var3, int var4, boolean var5) { private void func_4038_g(World var1, int var2, int var3, int var4, boolean var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
(new RailLogic(this, var1, var2, var3, var4)).func_596_a(var1.isBlockIndirectlyGettingPowered(var2, var3, var4), var5); (new RailLogic(this, var1, var2, var3, var4)).func_596_a(var1.isBlockIndirectlyGettingPowered(var2, var3, var4), var5);
} }
} }
private boolean func_27032_a(World var1, int var2, int var3, int var4, int var5, boolean var6, int var7) { private boolean func_27032_a(World var1, int var2, int var3, int var4, int var5, boolean var6, int var7) {
if(var7 >= 8) { if (var7 >= 8) {
return false; return false;
} else { } else {
int var8 = var5 & 7; int var8 = var5 & 7;
boolean var9 = true; boolean var9 = true;
switch(var8) { switch (var8) {
case 0: case 0:
if(var6) { if (var6) {
++var4; ++var4;
} else { } else {
--var4; --var4;
} }
break; break;
case 1: case 1:
if(var6) { if (var6) {
--var2; --var2;
} else { } else {
++var2; ++var2;
} }
break; break;
case 2: case 2:
if(var6) { if (var6) {
--var2; --var2;
} else { } else {
++var2; ++var2;
@ -180,7 +181,7 @@ public class BlockRail extends Block {
var8 = 1; var8 = 1;
break; break;
case 3: case 3:
if(var6) { if (var6) {
--var2; --var2;
++var3; ++var3;
var9 = false; var9 = false;
@ -191,7 +192,7 @@ public class BlockRail extends Block {
var8 = 1; var8 = 1;
break; break;
case 4: case 4:
if(var6) { if (var6) {
++var4; ++var4;
} else { } else {
--var4; --var4;
@ -202,7 +203,7 @@ public class BlockRail extends Block {
var8 = 0; var8 = 0;
break; break;
case 5: case 5:
if(var6) { if (var6) {
++var4; ++var4;
++var3; ++var3;
var9 = false; var9 = false;
@ -219,19 +220,19 @@ public class BlockRail extends Block {
private boolean func_27031_a(World var1, int var2, int var3, int var4, boolean var5, int var6, int var7) { private boolean func_27031_a(World var1, int var2, int var3, int var4, boolean var5, int var6, int var7) {
int var8 = var1.getBlockId(var2, var3, var4); int var8 = var1.getBlockId(var2, var3, var4);
if(var8 == Block.railPowered.blockID) { if (var8 == Block.railPowered.blockID) {
int var9 = var1.getBlockMetadata(var2, var3, var4); int var9 = var1.getBlockMetadata(var2, var3, var4);
int var10 = var9 & 7; int var10 = var9 & 7;
if(var7 == 1 && (var10 == 0 || var10 == 4 || var10 == 5)) { if (var7 == 1 && (var10 == 0 || var10 == 4 || var10 == 5)) {
return false; return false;
} }
if(var7 == 0 && (var10 == 1 || var10 == 2 || var10 == 3)) { if (var7 == 0 && (var10 == 1 || var10 == 2 || var10 == 3)) {
return false; return false;
} }
if((var9 & 8) != 0) { if ((var9 & 8) != 0) {
if(!var1.isBlockIndirectlyGettingPowered(var2, var3, var4) && !var1.isBlockIndirectlyGettingPowered(var2, var3 + 1, var4)) { if (!var1.isBlockIndirectlyGettingPowered(var2, var3, var4) && !var1.isBlockIndirectlyGettingPowered(var2, var3 + 1, var4)) {
return this.func_27032_a(var1, var2, var3, var4, var9, var5, var6 + 1); return this.func_27032_a(var1, var2, var3, var4, var9, var5, var6 + 1);
} }

43
src/net/minecraft/block/BlockRedstoneOre.java
View file

@ -1,18 +1,19 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockRedstoneOre extends Block { public class BlockRedstoneOre extends Block {
private boolean field_665_a; private boolean field_665_a;
public BlockRedstoneOre(int var1, int var2, boolean var3) { public BlockRedstoneOre(int var1, int var2, boolean var3) {
super(var1, var2, Material.rock); super(var1, var2, Material.rock);
if(var3) { if (var3) {
this.setTickOnLoad(true); this.setTickOnLoad(true);
} }
@ -40,14 +41,14 @@ public class BlockRedstoneOre extends Block {
private void func_321_g(World var1, int var2, int var3, int var4) { private void func_321_g(World var1, int var2, int var3, int var4) {
this.func_320_h(var1, var2, var3, var4); this.func_320_h(var1, var2, var3, var4);
if(this.blockID == Block.oreRedstone.blockID) { if (this.blockID == Block.oreRedstone.blockID) {
var1.setBlockWithNotify(var2, var3, var4, Block.oreRedstoneGlowing.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.oreRedstoneGlowing.blockID);
} }
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(this.blockID == Block.oreRedstoneGlowing.blockID) { if (this.blockID == Block.oreRedstoneGlowing.blockID) {
var1.setBlockWithNotify(var2, var3, var4, Block.oreRedstone.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.oreRedstone.blockID);
} }
@ -65,35 +66,35 @@ public class BlockRedstoneOre extends Block {
Random var5 = var1.rand; Random var5 = var1.rand;
double var6 = 1.0D / 16.0D; double var6 = 1.0D / 16.0D;
for(int var8 = 0; var8 < 6; ++var8) { for (int var8 = 0; var8 < 6; ++var8) {
double var9 = (double)((float)var2 + var5.nextFloat()); double var9 = (double) ((float) var2 + var5.nextFloat());
double var11 = (double)((float)var3 + var5.nextFloat()); double var11 = (double) ((float) var3 + var5.nextFloat());
double var13 = (double)((float)var4 + var5.nextFloat()); double var13 = (double) ((float) var4 + var5.nextFloat());
if(var8 == 0 && !var1.isBlockOpaqueCube(var2, var3 + 1, var4)) { if (var8 == 0 && !var1.isBlockOpaqueCube(var2, var3 + 1, var4)) {
var11 = (double)(var3 + 1) + var6; var11 = (double) (var3 + 1) + var6;
} }
if(var8 == 1 && !var1.isBlockOpaqueCube(var2, var3 - 1, var4)) { if (var8 == 1 && !var1.isBlockOpaqueCube(var2, var3 - 1, var4)) {
var11 = (double)(var3 + 0) - var6; var11 = (double) (var3 + 0) - var6;
} }
if(var8 == 2 && !var1.isBlockOpaqueCube(var2, var3, var4 + 1)) { if (var8 == 2 && !var1.isBlockOpaqueCube(var2, var3, var4 + 1)) {
var13 = (double)(var4 + 1) + var6; var13 = (double) (var4 + 1) + var6;
} }
if(var8 == 3 && !var1.isBlockOpaqueCube(var2, var3, var4 - 1)) { if (var8 == 3 && !var1.isBlockOpaqueCube(var2, var3, var4 - 1)) {
var13 = (double)(var4 + 0) - var6; var13 = (double) (var4 + 0) - var6;
} }
if(var8 == 4 && !var1.isBlockOpaqueCube(var2 + 1, var3, var4)) { if (var8 == 4 && !var1.isBlockOpaqueCube(var2 + 1, var3, var4)) {
var9 = (double)(var2 + 1) + var6; var9 = (double) (var2 + 1) + var6;
} }
if(var8 == 5 && !var1.isBlockOpaqueCube(var2 - 1, var3, var4)) { if (var8 == 5 && !var1.isBlockOpaqueCube(var2 - 1, var3, var4)) {
var9 = (double)(var2 + 0) - var6; var9 = (double) (var2 + 0) - var6;
} }
if(var9 < (double)var2 || var9 > (double)(var2 + 1) || var11 < 0.0D || var11 > (double)(var3 + 1) || var13 < (double)var4 || var13 > (double)(var4 + 1)) { if (var9 < (double) var2 || var9 > (double) (var2 + 1) || var11 < 0.0D || var11 > (double) (var3 + 1) || var13 < (double) var4 || var13 > (double) (var4 + 1)) {
var1.spawnParticle("reddust", var9, var11, var13, 0.0D, 0.0D, 0.0D); var1.spawnParticle("reddust", var9, var11, var13, 0.0D, 0.0D, 0.0D);
} }
} }

23
src/net/minecraft/block/BlockRedstoneRepeater.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
@ -9,6 +8,8 @@ import net.minecraft.math.MathHelper;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockRedstoneRepeater extends Block { public class BlockRedstoneRepeater extends Block {
public static final double[] field_22014_a = new double[]{-0.0625D, 1.0D / 16.0D, 0.1875D, 0.3125D}; public static final double[] field_22014_a = new double[]{-0.0625D, 1.0D / 16.0D, 0.1875D, 0.3125D};
private static final int[] field_22013_b = new int[]{1, 2, 3, 4}; private static final int[] field_22013_b = new int[]{1, 2, 3, 4};
@ -35,11 +36,11 @@ public class BlockRedstoneRepeater extends Block {
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
boolean var7 = this.func_22012_g(var1, var2, var3, var4, var6); boolean var7 = this.func_22012_g(var1, var2, var3, var4, var6);
if(this.field_22015_c && !var7) { if (this.field_22015_c && !var7) {
var1.setBlockAndMetadataWithNotify(var2, var3, var4, Block.redstoneRepeaterIdle.blockID, var6); var1.setBlockAndMetadataWithNotify(var2, var3, var4, Block.redstoneRepeaterIdle.blockID, var6);
} else if(!this.field_22015_c) { } else if (!this.field_22015_c) {
var1.setBlockAndMetadataWithNotify(var2, var3, var4, Block.redstoneRepeaterActive.blockID, var6); var1.setBlockAndMetadataWithNotify(var2, var3, var4, Block.redstoneRepeaterActive.blockID, var6);
if(!var7) { if (!var7) {
int var8 = (var6 & 12) >> 2; int var8 = (var6 & 12) >> 2;
var1.scheduleUpdateTick(var2, var3, var4, Block.redstoneRepeaterActive.blockID, field_22013_b[var8] * 2); var1.scheduleUpdateTick(var2, var3, var4, Block.redstoneRepeaterActive.blockID, field_22013_b[var8] * 2);
} }
@ -60,7 +61,7 @@ public class BlockRedstoneRepeater extends Block {
} }
public boolean isPoweringTo(IBlockAccess var1, int var2, int var3, int var4, int var5) { public boolean isPoweringTo(IBlockAccess var1, int var2, int var3, int var4, int var5) {
if(!this.field_22015_c) { if (!this.field_22015_c) {
return false; return false;
} else { } else {
int var6 = var1.getBlockMetadata(var2, var3, var4) & 3; int var6 = var1.getBlockMetadata(var2, var3, var4) & 3;
@ -69,16 +70,16 @@ public class BlockRedstoneRepeater extends Block {
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(!this.canBlockStay(var1, var2, var3, var4)) { if (!this.canBlockStay(var1, var2, var3, var4)) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} else { } else {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
boolean var7 = this.func_22012_g(var1, var2, var3, var4, var6); boolean var7 = this.func_22012_g(var1, var2, var3, var4, var6);
int var8 = (var6 & 12) >> 2; int var8 = (var6 & 12) >> 2;
if(this.field_22015_c && !var7) { if (this.field_22015_c && !var7) {
var1.scheduleUpdateTick(var2, var3, var4, this.blockID, field_22013_b[var8] * 2); var1.scheduleUpdateTick(var2, var3, var4, this.blockID, field_22013_b[var8] * 2);
} else if(!this.field_22015_c && var7) { } else if (!this.field_22015_c && var7) {
var1.scheduleUpdateTick(var2, var3, var4, this.blockID, field_22013_b[var8] * 2); var1.scheduleUpdateTick(var2, var3, var4, this.blockID, field_22013_b[var8] * 2);
} }
@ -87,7 +88,7 @@ public class BlockRedstoneRepeater extends Block {
private boolean func_22012_g(World var1, int var2, int var3, int var4, int var5) { private boolean func_22012_g(World var1, int var2, int var3, int var4, int var5) {
int var6 = var5 & 3; int var6 = var5 & 3;
switch(var6) { switch (var6) {
case 0: case 0:
return var1.isBlockIndirectlyProvidingPowerTo(var2, var3, var4 + 1, 3) || var1.getBlockId(var2, var3, var4 + 1) == Block.redstoneWire.blockID && var1.getBlockMetadata(var2, var3, var4 + 1) > 0; return var1.isBlockIndirectlyProvidingPowerTo(var2, var3, var4 + 1, 3) || var1.getBlockId(var2, var3, var4 + 1) == Block.redstoneWire.blockID && var1.getBlockMetadata(var2, var3, var4 + 1) > 0;
case 1: case 1:
@ -114,10 +115,10 @@ public class BlockRedstoneRepeater extends Block {
} }
public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) { public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) {
int var6 = ((MathHelper.floor_double((double)(var5.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4; int var6 = ((MathHelper.floor_double((double) (var5.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4;
var1.setBlockMetadataWithNotify(var2, var3, var4, var6); var1.setBlockMetadataWithNotify(var2, var3, var4, var6);
boolean var7 = this.func_22012_g(var1, var2, var3, var4, var6); boolean var7 = this.func_22012_g(var1, var2, var3, var4, var6);
if(var7) { if (var7) {
var1.scheduleUpdateTick(var2, var3, var4, this.blockID, 1); var1.scheduleUpdateTick(var2, var3, var4, this.blockID, 1);
} }

43
src/net/minecraft/block/BlockRedstoneTorch.java
View file

@ -1,10 +1,11 @@
package net.minecraft.block; package net.minecraft.block;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public class BlockRedstoneTorch extends BlockTorch { public class BlockRedstoneTorch extends BlockTorch {
private boolean torchActive = false; private boolean torchActive = false;
@ -15,17 +16,17 @@ public class BlockRedstoneTorch extends BlockTorch {
} }
private boolean checkForBurnout(World var1, int var2, int var3, int var4, boolean var5) { private boolean checkForBurnout(World var1, int var2, int var3, int var4, boolean var5) {
if(var5) { if (var5) {
torchUpdates.add(new RedstoneUpdateInfo(var2, var3, var4, var1.getWorldTime())); torchUpdates.add(new RedstoneUpdateInfo(var2, var3, var4, var1.getWorldTime()));
} }
int var6 = 0; int var6 = 0;
for(int var7 = 0; var7 < torchUpdates.size(); ++var7) { for (int var7 = 0; var7 < torchUpdates.size(); ++var7) {
RedstoneUpdateInfo var8 = (RedstoneUpdateInfo)torchUpdates.get(var7); RedstoneUpdateInfo var8 = (RedstoneUpdateInfo) torchUpdates.get(var7);
if(var8.x == var2 && var8.y == var3 && var8.z == var4) { if (var8.x == var2 && var8.y == var3 && var8.z == var4) {
++var6; ++var6;
if(var6 >= 8) { if (var6 >= 8) {
return true; return true;
} }
} }
@ -45,11 +46,11 @@ public class BlockRedstoneTorch extends BlockTorch {
} }
public void onBlockAdded(World var1, int var2, int var3, int var4) { public void onBlockAdded(World var1, int var2, int var3, int var4) {
if(var1.getBlockMetadata(var2, var3, var4) == 0) { if (var1.getBlockMetadata(var2, var3, var4) == 0) {
super.onBlockAdded(var1, var2, var3, var4); super.onBlockAdded(var1, var2, var3, var4);
} }
if(this.torchActive) { if (this.torchActive) {
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2, var3 + 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 + 1, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID);
@ -61,7 +62,7 @@ public class BlockRedstoneTorch extends BlockTorch {
} }
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
if(this.torchActive) { if (this.torchActive) {
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2, var3 + 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 + 1, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID);
@ -73,7 +74,7 @@ public class BlockRedstoneTorch extends BlockTorch {
} }
public boolean isPoweringTo(IBlockAccess var1, int var2, int var3, int var4, int var5) { public boolean isPoweringTo(IBlockAccess var1, int var2, int var3, int var4, int var5) {
if(!this.torchActive) { if (!this.torchActive) {
return false; return false;
} else { } else {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
@ -89,25 +90,25 @@ public class BlockRedstoneTorch extends BlockTorch {
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
boolean var6 = this.func_30003_g(var1, var2, var3, var4); boolean var6 = this.func_30003_g(var1, var2, var3, var4);
while(torchUpdates.size() > 0 && var1.getWorldTime() - ((RedstoneUpdateInfo)torchUpdates.get(0)).updateTime > 100L) { while (torchUpdates.size() > 0 && var1.getWorldTime() - ((RedstoneUpdateInfo) torchUpdates.get(0)).updateTime > 100L) {
torchUpdates.remove(0); torchUpdates.remove(0);
} }
if(this.torchActive) { if (this.torchActive) {
if(var6) { if (var6) {
var1.setBlockAndMetadataWithNotify(var2, var3, var4, Block.torchRedstoneIdle.blockID, var1.getBlockMetadata(var2, var3, var4)); var1.setBlockAndMetadataWithNotify(var2, var3, var4, Block.torchRedstoneIdle.blockID, var1.getBlockMetadata(var2, var3, var4));
if(this.checkForBurnout(var1, var2, var3, var4, true)) { if (this.checkForBurnout(var1, var2, var3, var4, true)) {
var1.playSoundEffect((double)((float)var2 + 0.5F), (double)((float)var3 + 0.5F), (double)((float)var4 + 0.5F), "random.fizz", 0.5F, 2.6F + (var1.rand.nextFloat() - var1.rand.nextFloat()) * 0.8F); var1.playSoundEffect((double) ((float) var2 + 0.5F), (double) ((float) var3 + 0.5F), (double) ((float) var4 + 0.5F), "random.fizz", 0.5F, 2.6F + (var1.rand.nextFloat() - var1.rand.nextFloat()) * 0.8F);
for(int var7 = 0; var7 < 5; ++var7) { for (int var7 = 0; var7 < 5; ++var7) {
double var8 = (double)var2 + var5.nextDouble() * 0.6D + 0.2D; double var8 = (double) var2 + var5.nextDouble() * 0.6D + 0.2D;
double var10 = (double)var3 + var5.nextDouble() * 0.6D + 0.2D; double var10 = (double) var3 + var5.nextDouble() * 0.6D + 0.2D;
double var12 = (double)var4 + var5.nextDouble() * 0.6D + 0.2D; double var12 = (double) var4 + var5.nextDouble() * 0.6D + 0.2D;
var1.spawnParticle("smoke", var8, var10, var12, 0.0D, 0.0D, 0.0D); var1.spawnParticle("smoke", var8, var10, var12, 0.0D, 0.0D, 0.0D);
} }
} }
} }
} else if(!var6 && !this.checkForBurnout(var1, var2, var3, var4, false)) { } else if (!var6 && !this.checkForBurnout(var1, var2, var3, var4, false)) {
var1.setBlockAndMetadataWithNotify(var2, var3, var4, Block.torchRedstoneActive.blockID, var1.getBlockMetadata(var2, var3, var4)); var1.setBlockAndMetadataWithNotify(var2, var3, var4, Block.torchRedstoneActive.blockID, var1.getBlockMetadata(var2, var3, var4));
} }

111
src/net/minecraft/block/BlockRedstoneWire.java
View file

@ -1,9 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Random;
import java.util.Set;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
@ -12,6 +8,11 @@ import net.minecraft.util.ModelBed;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Random;
import java.util.Set;
public class BlockRedstoneWire extends Block { public class BlockRedstoneWire extends Block {
private boolean wiresProvidePower = true; private boolean wiresProvidePower = true;
private Set field_21032_b = new HashSet(); private Set field_21032_b = new HashSet();
@ -46,8 +47,8 @@ public class BlockRedstoneWire extends Block {
ArrayList var5 = new ArrayList(this.field_21032_b); ArrayList var5 = new ArrayList(this.field_21032_b);
this.field_21032_b.clear(); this.field_21032_b.clear();
for(int var6 = 0; var6 < var5.size(); ++var6) { for (int var6 = 0; var6 < var5.size(); ++var6) {
ChunkPosition var7 = (ChunkPosition)var5.get(var6); ChunkPosition var7 = (ChunkPosition) var5.get(var6);
var1.notifyBlocksOfNeighborChange(var7.x, var7.y, var7.z, this.blockID); var1.notifyBlocksOfNeighborChange(var7.x, var7.y, var7.z, this.blockID);
} }
@ -62,101 +63,101 @@ public class BlockRedstoneWire extends Block {
int var11; int var11;
int var12; int var12;
int var13; int var13;
if(var10) { if (var10) {
var9 = 15; var9 = 15;
} else { } else {
for(var11 = 0; var11 < 4; ++var11) { for (var11 = 0; var11 < 4; ++var11) {
var12 = var2; var12 = var2;
var13 = var4; var13 = var4;
if(var11 == 0) { if (var11 == 0) {
var12 = var2 - 1; var12 = var2 - 1;
} }
if(var11 == 1) { if (var11 == 1) {
++var12; ++var12;
} }
if(var11 == 2) { if (var11 == 2) {
var13 = var4 - 1; var13 = var4 - 1;
} }
if(var11 == 3) { if (var11 == 3) {
++var13; ++var13;
} }
if(var12 != var5 || var3 != var6 || var13 != var7) { if (var12 != var5 || var3 != var6 || var13 != var7) {
var9 = this.getMaxCurrentStrength(var1, var12, var3, var13, var9); var9 = this.getMaxCurrentStrength(var1, var12, var3, var13, var9);
} }
if(var1.isBlockNormalCube(var12, var3, var13) && !var1.isBlockNormalCube(var2, var3 + 1, var4)) { if (var1.isBlockNormalCube(var12, var3, var13) && !var1.isBlockNormalCube(var2, var3 + 1, var4)) {
if(var12 != var5 || var3 + 1 != var6 || var13 != var7) { if (var12 != var5 || var3 + 1 != var6 || var13 != var7) {
var9 = this.getMaxCurrentStrength(var1, var12, var3 + 1, var13, var9); var9 = this.getMaxCurrentStrength(var1, var12, var3 + 1, var13, var9);
} }
} else if(!var1.isBlockNormalCube(var12, var3, var13) && (var12 != var5 || var3 - 1 != var6 || var13 != var7)) { } else if (!var1.isBlockNormalCube(var12, var3, var13) && (var12 != var5 || var3 - 1 != var6 || var13 != var7)) {
var9 = this.getMaxCurrentStrength(var1, var12, var3 - 1, var13, var9); var9 = this.getMaxCurrentStrength(var1, var12, var3 - 1, var13, var9);
} }
} }
if(var9 > 0) { if (var9 > 0) {
--var9; --var9;
} else { } else {
var9 = 0; var9 = 0;
} }
} }
if(var8 != var9) { if (var8 != var9) {
var1.editingBlocks = true; var1.editingBlocks = true;
var1.setBlockMetadataWithNotify(var2, var3, var4, var9); var1.setBlockMetadataWithNotify(var2, var3, var4, var9);
var1.markBlocksDirty(var2, var3, var4, var2, var3, var4); var1.markBlocksDirty(var2, var3, var4, var2, var3, var4);
var1.editingBlocks = false; var1.editingBlocks = false;
for(var11 = 0; var11 < 4; ++var11) { for (var11 = 0; var11 < 4; ++var11) {
var12 = var2; var12 = var2;
var13 = var4; var13 = var4;
int var14 = var3 - 1; int var14 = var3 - 1;
if(var11 == 0) { if (var11 == 0) {
var12 = var2 - 1; var12 = var2 - 1;
} }
if(var11 == 1) { if (var11 == 1) {
++var12; ++var12;
} }
if(var11 == 2) { if (var11 == 2) {
var13 = var4 - 1; var13 = var4 - 1;
} }
if(var11 == 3) { if (var11 == 3) {
++var13; ++var13;
} }
if(var1.isBlockNormalCube(var12, var3, var13)) { if (var1.isBlockNormalCube(var12, var3, var13)) {
var14 += 2; var14 += 2;
} }
boolean var15 = false; boolean var15 = false;
int var16 = this.getMaxCurrentStrength(var1, var12, var3, var13, -1); int var16 = this.getMaxCurrentStrength(var1, var12, var3, var13, -1);
var9 = var1.getBlockMetadata(var2, var3, var4); var9 = var1.getBlockMetadata(var2, var3, var4);
if(var9 > 0) { if (var9 > 0) {
--var9; --var9;
} }
if(var16 >= 0 && var16 != var9) { if (var16 >= 0 && var16 != var9) {
this.func_21031_a(var1, var12, var3, var13, var2, var3, var4); this.func_21031_a(var1, var12, var3, var13, var2, var3, var4);
} }
var16 = this.getMaxCurrentStrength(var1, var12, var14, var13, -1); var16 = this.getMaxCurrentStrength(var1, var12, var14, var13, -1);
var9 = var1.getBlockMetadata(var2, var3, var4); var9 = var1.getBlockMetadata(var2, var3, var4);
if(var9 > 0) { if (var9 > 0) {
--var9; --var9;
} }
if(var16 >= 0 && var16 != var9) { if (var16 >= 0 && var16 != var9) {
this.func_21031_a(var1, var12, var14, var13, var2, var3, var4); this.func_21031_a(var1, var12, var14, var13, var2, var3, var4);
} }
} }
if(var8 == 0 || var9 == 0) { if (var8 == 0 || var9 == 0) {
this.field_21032_b.add(new ChunkPosition(var2, var3, var4)); this.field_21032_b.add(new ChunkPosition(var2, var3, var4));
this.field_21032_b.add(new ChunkPosition(var2 - 1, var3, var4)); this.field_21032_b.add(new ChunkPosition(var2 - 1, var3, var4));
this.field_21032_b.add(new ChunkPosition(var2 + 1, var3, var4)); this.field_21032_b.add(new ChunkPosition(var2 + 1, var3, var4));
@ -170,7 +171,7 @@ public class BlockRedstoneWire extends Block {
} }
private void notifyWireNeighborsOfNeighborChange(World var1, int var2, int var3, int var4) { private void notifyWireNeighborsOfNeighborChange(World var1, int var2, int var3, int var4) {
if(var1.getBlockId(var2, var3, var4) == this.blockID) { if (var1.getBlockId(var2, var3, var4) == this.blockID) {
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID);
@ -183,7 +184,7 @@ public class BlockRedstoneWire extends Block {
public void onBlockAdded(World var1, int var2, int var3, int var4) { public void onBlockAdded(World var1, int var2, int var3, int var4) {
super.onBlockAdded(var1, var2, var3, var4); super.onBlockAdded(var1, var2, var3, var4);
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
this.updateAndPropagateCurrentStrength(var1, var2, var3, var4); this.updateAndPropagateCurrentStrength(var1, var2, var3, var4);
var1.notifyBlocksOfNeighborChange(var2, var3 + 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 + 1, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
@ -191,25 +192,25 @@ public class BlockRedstoneWire extends Block {
this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3, var4); this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3, var4);
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3, var4 - 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3, var4 - 1);
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3, var4 + 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3, var4 + 1);
if(var1.isBlockNormalCube(var2 - 1, var3, var4)) { if (var1.isBlockNormalCube(var2 - 1, var3, var4)) {
this.notifyWireNeighborsOfNeighborChange(var1, var2 - 1, var3 + 1, var4); this.notifyWireNeighborsOfNeighborChange(var1, var2 - 1, var3 + 1, var4);
} else { } else {
this.notifyWireNeighborsOfNeighborChange(var1, var2 - 1, var3 - 1, var4); this.notifyWireNeighborsOfNeighborChange(var1, var2 - 1, var3 - 1, var4);
} }
if(var1.isBlockNormalCube(var2 + 1, var3, var4)) { if (var1.isBlockNormalCube(var2 + 1, var3, var4)) {
this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3 + 1, var4); this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3 + 1, var4);
} else { } else {
this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3 - 1, var4); this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3 - 1, var4);
} }
if(var1.isBlockNormalCube(var2, var3, var4 - 1)) { if (var1.isBlockNormalCube(var2, var3, var4 - 1)) {
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 + 1, var4 - 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 + 1, var4 - 1);
} else { } else {
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 - 1, var4 - 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 - 1, var4 - 1);
} }
if(var1.isBlockNormalCube(var2, var3, var4 + 1)) { if (var1.isBlockNormalCube(var2, var3, var4 + 1)) {
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 + 1, var4 + 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 + 1, var4 + 1);
} else { } else {
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 - 1, var4 + 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 - 1, var4 + 1);
@ -220,7 +221,7 @@ public class BlockRedstoneWire extends Block {
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
super.onBlockRemoval(var1, var2, var3, var4); super.onBlockRemoval(var1, var2, var3, var4);
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
var1.notifyBlocksOfNeighborChange(var2, var3 + 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 + 1, var4, this.blockID);
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID); var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
this.updateAndPropagateCurrentStrength(var1, var2, var3, var4); this.updateAndPropagateCurrentStrength(var1, var2, var3, var4);
@ -228,25 +229,25 @@ public class BlockRedstoneWire extends Block {
this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3, var4); this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3, var4);
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3, var4 - 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3, var4 - 1);
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3, var4 + 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3, var4 + 1);
if(var1.isBlockNormalCube(var2 - 1, var3, var4)) { if (var1.isBlockNormalCube(var2 - 1, var3, var4)) {
this.notifyWireNeighborsOfNeighborChange(var1, var2 - 1, var3 + 1, var4); this.notifyWireNeighborsOfNeighborChange(var1, var2 - 1, var3 + 1, var4);
} else { } else {
this.notifyWireNeighborsOfNeighborChange(var1, var2 - 1, var3 - 1, var4); this.notifyWireNeighborsOfNeighborChange(var1, var2 - 1, var3 - 1, var4);
} }
if(var1.isBlockNormalCube(var2 + 1, var3, var4)) { if (var1.isBlockNormalCube(var2 + 1, var3, var4)) {
this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3 + 1, var4); this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3 + 1, var4);
} else { } else {
this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3 - 1, var4); this.notifyWireNeighborsOfNeighborChange(var1, var2 + 1, var3 - 1, var4);
} }
if(var1.isBlockNormalCube(var2, var3, var4 - 1)) { if (var1.isBlockNormalCube(var2, var3, var4 - 1)) {
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 + 1, var4 - 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 + 1, var4 - 1);
} else { } else {
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 - 1, var4 - 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 - 1, var4 - 1);
} }
if(var1.isBlockNormalCube(var2, var3, var4 + 1)) { if (var1.isBlockNormalCube(var2, var3, var4 + 1)) {
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 + 1, var4 + 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 + 1, var4 + 1);
} else { } else {
this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 - 1, var4 + 1); this.notifyWireNeighborsOfNeighborChange(var1, var2, var3 - 1, var4 + 1);
@ -256,7 +257,7 @@ public class BlockRedstoneWire extends Block {
} }
private int getMaxCurrentStrength(World var1, int var2, int var3, int var4, int var5) { private int getMaxCurrentStrength(World var1, int var2, int var3, int var4, int var5) {
if(var1.getBlockId(var2, var3, var4) != this.blockID) { if (var1.getBlockId(var2, var3, var4) != this.blockID) {
return var5; return var5;
} else { } else {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
@ -265,10 +266,10 @@ public class BlockRedstoneWire extends Block {
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
boolean var7 = this.canPlaceBlockAt(var1, var2, var3, var4); boolean var7 = this.canPlaceBlockAt(var1, var2, var3, var4);
if(!var7) { if (!var7) {
this.dropBlockAsItem(var1, var2, var3, var4, var6); this.dropBlockAsItem(var1, var2, var3, var4, var6);
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} else { } else {
@ -288,31 +289,31 @@ public class BlockRedstoneWire extends Block {
} }
public boolean isPoweringTo(IBlockAccess var1, int var2, int var3, int var4, int var5) { public boolean isPoweringTo(IBlockAccess var1, int var2, int var3, int var4, int var5) {
if(!this.wiresProvidePower) { if (!this.wiresProvidePower) {
return false; return false;
} else if(var1.getBlockMetadata(var2, var3, var4) == 0) { } else if (var1.getBlockMetadata(var2, var3, var4) == 0) {
return false; return false;
} else if(var5 == 1) { } else if (var5 == 1) {
return true; return true;
} else { } else {
boolean var6 = isPowerProviderOrWire(var1, var2 - 1, var3, var4, 1) || !var1.isBlockNormalCube(var2 - 1, var3, var4) && isPowerProviderOrWire(var1, var2 - 1, var3 - 1, var4, -1); boolean var6 = isPowerProviderOrWire(var1, var2 - 1, var3, var4, 1) || !var1.isBlockNormalCube(var2 - 1, var3, var4) && isPowerProviderOrWire(var1, var2 - 1, var3 - 1, var4, -1);
boolean var7 = isPowerProviderOrWire(var1, var2 + 1, var3, var4, 3) || !var1.isBlockNormalCube(var2 + 1, var3, var4) && isPowerProviderOrWire(var1, var2 + 1, var3 - 1, var4, -1); boolean var7 = isPowerProviderOrWire(var1, var2 + 1, var3, var4, 3) || !var1.isBlockNormalCube(var2 + 1, var3, var4) && isPowerProviderOrWire(var1, var2 + 1, var3 - 1, var4, -1);
boolean var8 = isPowerProviderOrWire(var1, var2, var3, var4 - 1, 2) || !var1.isBlockNormalCube(var2, var3, var4 - 1) && isPowerProviderOrWire(var1, var2, var3 - 1, var4 - 1, -1); boolean var8 = isPowerProviderOrWire(var1, var2, var3, var4 - 1, 2) || !var1.isBlockNormalCube(var2, var3, var4 - 1) && isPowerProviderOrWire(var1, var2, var3 - 1, var4 - 1, -1);
boolean var9 = isPowerProviderOrWire(var1, var2, var3, var4 + 1, 0) || !var1.isBlockNormalCube(var2, var3, var4 + 1) && isPowerProviderOrWire(var1, var2, var3 - 1, var4 + 1, -1); boolean var9 = isPowerProviderOrWire(var1, var2, var3, var4 + 1, 0) || !var1.isBlockNormalCube(var2, var3, var4 + 1) && isPowerProviderOrWire(var1, var2, var3 - 1, var4 + 1, -1);
if(!var1.isBlockNormalCube(var2, var3 + 1, var4)) { if (!var1.isBlockNormalCube(var2, var3 + 1, var4)) {
if(var1.isBlockNormalCube(var2 - 1, var3, var4) && isPowerProviderOrWire(var1, var2 - 1, var3 + 1, var4, -1)) { if (var1.isBlockNormalCube(var2 - 1, var3, var4) && isPowerProviderOrWire(var1, var2 - 1, var3 + 1, var4, -1)) {
var6 = true; var6 = true;
} }
if(var1.isBlockNormalCube(var2 + 1, var3, var4) && isPowerProviderOrWire(var1, var2 + 1, var3 + 1, var4, -1)) { if (var1.isBlockNormalCube(var2 + 1, var3, var4) && isPowerProviderOrWire(var1, var2 + 1, var3 + 1, var4, -1)) {
var7 = true; var7 = true;
} }
if(var1.isBlockNormalCube(var2, var3, var4 - 1) && isPowerProviderOrWire(var1, var2, var3 + 1, var4 - 1, -1)) { if (var1.isBlockNormalCube(var2, var3, var4 - 1) && isPowerProviderOrWire(var1, var2, var3 + 1, var4 - 1, -1)) {
var8 = true; var8 = true;
} }
if(var1.isBlockNormalCube(var2, var3, var4 + 1) && isPowerProviderOrWire(var1, var2, var3 + 1, var4 + 1, -1)) { if (var1.isBlockNormalCube(var2, var3, var4 + 1) && isPowerProviderOrWire(var1, var2, var3 + 1, var4 + 1, -1)) {
var9 = true; var9 = true;
} }
} }
@ -327,13 +328,13 @@ public class BlockRedstoneWire extends Block {
public static boolean isPowerProviderOrWire(IBlockAccess var0, int var1, int var2, int var3, int var4) { public static boolean isPowerProviderOrWire(IBlockAccess var0, int var1, int var2, int var3, int var4) {
int var5 = var0.getBlockId(var1, var2, var3); int var5 = var0.getBlockId(var1, var2, var3);
if(var5 == Block.redstoneWire.blockID) { if (var5 == Block.redstoneWire.blockID) {
return true; return true;
} else if(var5 == 0) { } else if (var5 == 0) {
return false; return false;
} else if(Block.blocksList[var5].canProvidePower()) { } else if (Block.blocksList[var5].canProvidePower()) {
return true; return true;
} else if(var5 != Block.redstoneRepeaterIdle.blockID && var5 != Block.redstoneRepeaterActive.blockID) { } else if (var5 != Block.redstoneRepeaterIdle.blockID && var5 != Block.redstoneRepeaterActive.blockID) {
return false; return false;
} else { } else {
int var6 = var0.getBlockMetadata(var1, var2, var3); int var6 = var0.getBlockMetadata(var1, var2, var3);

13
src/net/minecraft/block/BlockReed.java
View file

@ -1,11 +1,12 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockReed extends Block { public class BlockReed extends Block {
protected BlockReed(int var1, int var2) { protected BlockReed(int var1, int var2) {
super(var1, Material.plants); super(var1, Material.plants);
@ -16,14 +17,14 @@ public class BlockReed extends Block {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(var1.isAirBlock(var2, var3 + 1, var4)) { if (var1.isAirBlock(var2, var3 + 1, var4)) {
int var6; int var6;
for(var6 = 1; var1.getBlockId(var2, var3 - var6, var4) == this.blockID; ++var6) { for (var6 = 1; var1.getBlockId(var2, var3 - var6, var4) == this.blockID; ++var6) {
} }
if(var6 < 3) { if (var6 < 3) {
int var7 = var1.getBlockMetadata(var2, var3, var4); int var7 = var1.getBlockMetadata(var2, var3, var4);
if(var7 == 15) { if (var7 == 15) {
var1.setBlockWithNotify(var2, var3 + 1, var4, this.blockID); var1.setBlockWithNotify(var2, var3 + 1, var4, this.blockID);
var1.setBlockMetadataWithNotify(var2, var3, var4, 0); var1.setBlockMetadataWithNotify(var2, var3, var4, 0);
} else { } else {
@ -44,7 +45,7 @@ public class BlockReed extends Block {
} }
protected final void checkBlockCoordValid(World var1, int var2, int var3, int var4) { protected final void checkBlockCoordValid(World var1, int var2, int var3, int var4) {
if(!this.canBlockStay(var1, var2, var3, var4)) { if (!this.canBlockStay(var1, var2, var3, var4)) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }

17
src/net/minecraft/block/BlockSand.java
View file

@ -1,10 +1,11 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityFallingSand; import net.minecraft.entity.EntityFallingSand;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockSand extends Block { public class BlockSand extends Block {
public static boolean fallInstantly = false; public static boolean fallInstantly = false;
@ -25,19 +26,19 @@ public class BlockSand extends Block {
} }
private void tryToFall(World var1, int var2, int var3, int var4) { private void tryToFall(World var1, int var2, int var3, int var4) {
if(canFallBelow(var1, var2, var3 - 1, var4) && var3 >= 0) { if (canFallBelow(var1, var2, var3 - 1, var4) && var3 >= 0) {
byte var8 = 32; byte var8 = 32;
if(!fallInstantly && var1.checkChunksExist(var2 - var8, var3 - var8, var4 - var8, var2 + var8, var3 + var8, var4 + var8)) { if (!fallInstantly && var1.checkChunksExist(var2 - var8, var3 - var8, var4 - var8, var2 + var8, var3 + var8, var4 + var8)) {
EntityFallingSand var9 = new EntityFallingSand(var1, (double)((float)var2 + 0.5F), (double)((float)var3 + 0.5F), (double)((float)var4 + 0.5F), this.blockID); EntityFallingSand var9 = new EntityFallingSand(var1, (double) ((float) var2 + 0.5F), (double) ((float) var3 + 0.5F), (double) ((float) var4 + 0.5F), this.blockID);
var1.entityJoinedWorld(var9); var1.entityJoinedWorld(var9);
} else { } else {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
while(canFallBelow(var1, var2, var3 - 1, var4) && var3 > 0) { while (canFallBelow(var1, var2, var3 - 1, var4) && var3 > 0) {
--var3; --var3;
} }
if(var3 > 0) { if (var3 > 0) {
var1.setBlockWithNotify(var2, var3, var4, this.blockID); var1.setBlockWithNotify(var2, var3, var4, this.blockID);
} }
} }
@ -51,9 +52,9 @@ public class BlockSand extends Block {
public static boolean canFallBelow(World var0, int var1, int var2, int var3) { public static boolean canFallBelow(World var0, int var1, int var2, int var3) {
int var4 = var0.getBlockId(var1, var2, var3); int var4 = var0.getBlockId(var1, var2, var3);
if(var4 == 0) { if (var4 == 0) {
return true; return true;
} else if(var4 == Block.fire.blockID) { } else if (var4 == Block.fire.blockID) {
return true; return true;
} else { } else {
Material var5 = Block.blocksList[var4].blockMaterial; Material var5 = Block.blocksList[var4].blockMaterial;

23
src/net/minecraft/block/BlockSapling.java
View file

@ -1,12 +1,9 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.generators.WorldGenBigTree; import net.minecraft.world.generators.*;
import net.minecraft.world.generators.WorldGenForest;
import net.minecraft.world.generators.WorldGenTaiga2; import java.util.Random;
import net.minecraft.world.generators.WorldGenTrees;
import net.minecraft.world.generators.WorldGenerator;
public class BlockSapling extends BlockFlower { public class BlockSapling extends BlockFlower {
protected BlockSapling(int var1, int var2) { protected BlockSapling(int var1, int var2) {
@ -16,11 +13,11 @@ public class BlockSapling extends BlockFlower {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
super.updateTick(var1, var2, var3, var4, var5); super.updateTick(var1, var2, var3, var4, var5);
if(var1.getBlockLightValue(var2, var3 + 1, var4) >= 9 && var5.nextInt(30) == 0) { if (var1.getBlockLightValue(var2, var3 + 1, var4) >= 9 && var5.nextInt(30) == 0) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if((var6 & 8) == 0) { if ((var6 & 8) == 0) {
var1.setBlockMetadataWithNotify(var2, var3, var4, var6 | 8); var1.setBlockMetadataWithNotify(var2, var3, var4, var6 | 8);
} else { } else {
this.growTree(var1, var2, var3, var4, var5); this.growTree(var1, var2, var3, var4, var5);
@ -39,18 +36,18 @@ public class BlockSapling extends BlockFlower {
int var6 = var1.getBlockMetadata(var2, var3, var4) & 3; int var6 = var1.getBlockMetadata(var2, var3, var4) & 3;
var1.setBlock(var2, var3, var4, 0); var1.setBlock(var2, var3, var4, 0);
Object var7 = null; Object var7 = null;
if(var6 == 1) { if (var6 == 1) {
var7 = new WorldGenTaiga2(); var7 = new WorldGenTaiga2();
} else if(var6 == 2) { } else if (var6 == 2) {
var7 = new WorldGenForest(); var7 = new WorldGenForest();
} else { } else {
var7 = new WorldGenTrees(); var7 = new WorldGenTrees();
if(var5.nextInt(10) == 0) { if (var5.nextInt(10) == 0) {
var7 = new WorldGenBigTree(); var7 = new WorldGenBigTree();
} }
} }
if(!((WorldGenerator)var7).generate(var1, var5, var2, var3, var4)) { if (!((WorldGenerator) var7).generate(var1, var5, var2, var3, var4)) {
var1.setBlockAndMetadata(var2, var3, var4, this.blockID, var6); var1.setBlockAndMetadata(var2, var3, var4, this.blockID, var6);
} }

29
src/net/minecraft/block/BlockSign.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.tile.TileEntity; import net.minecraft.block.tile.TileEntity;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -8,6 +7,8 @@ import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockSign extends BlockContainer { public class BlockSign extends BlockContainer {
private Class signEntityClass; private Class signEntityClass;
private boolean isFreestanding; private boolean isFreestanding;
@ -27,7 +28,7 @@ public class BlockSign extends BlockContainer {
} }
public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) { public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) {
if(!this.isFreestanding) { if (!this.isFreestanding) {
int var5 = var1.getBlockMetadata(var2, var3, var4); int var5 = var1.getBlockMetadata(var2, var3, var4);
float var6 = 9.0F / 32.0F; float var6 = 9.0F / 32.0F;
float var7 = 25.0F / 32.0F; float var7 = 25.0F / 32.0F;
@ -35,19 +36,19 @@ public class BlockSign extends BlockContainer {
float var9 = 1.0F; float var9 = 1.0F;
float var10 = 2.0F / 16.0F; float var10 = 2.0F / 16.0F;
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
if(var5 == 2) { if (var5 == 2) {
this.setBlockBounds(var8, var6, 1.0F - var10, var9, var7, 1.0F); this.setBlockBounds(var8, var6, 1.0F - var10, var9, var7, 1.0F);
} }
if(var5 == 3) { if (var5 == 3) {
this.setBlockBounds(var8, var6, 0.0F, var9, var7, var10); this.setBlockBounds(var8, var6, 0.0F, var9, var7, var10);
} }
if(var5 == 4) { if (var5 == 4) {
this.setBlockBounds(1.0F - var10, var6, var8, 1.0F, var7, var9); this.setBlockBounds(1.0F - var10, var6, var8, 1.0F, var7, var9);
} }
if(var5 == 5) { if (var5 == 5) {
this.setBlockBounds(0.0F, var6, var8, var10, var7, var9); this.setBlockBounds(0.0F, var6, var8, var10, var7, var9);
} }
@ -64,7 +65,7 @@ public class BlockSign extends BlockContainer {
protected TileEntity getBlockEntity() { protected TileEntity getBlockEntity() {
try { try {
return (TileEntity)this.signEntityClass.newInstance(); return (TileEntity) this.signEntityClass.newInstance();
} catch (Exception var2) { } catch (Exception var2) {
throw new RuntimeException(var2); throw new RuntimeException(var2);
} }
@ -76,31 +77,31 @@ public class BlockSign extends BlockContainer {
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
boolean var6 = false; boolean var6 = false;
if(this.isFreestanding) { if (this.isFreestanding) {
if(!var1.getBlockMaterial(var2, var3 - 1, var4).isSolid()) { if (!var1.getBlockMaterial(var2, var3 - 1, var4).isSolid()) {
var6 = true; var6 = true;
} }
} else { } else {
int var7 = var1.getBlockMetadata(var2, var3, var4); int var7 = var1.getBlockMetadata(var2, var3, var4);
var6 = true; var6 = true;
if(var7 == 2 && var1.getBlockMaterial(var2, var3, var4 + 1).isSolid()) { if (var7 == 2 && var1.getBlockMaterial(var2, var3, var4 + 1).isSolid()) {
var6 = false; var6 = false;
} }
if(var7 == 3 && var1.getBlockMaterial(var2, var3, var4 - 1).isSolid()) { if (var7 == 3 && var1.getBlockMaterial(var2, var3, var4 - 1).isSolid()) {
var6 = false; var6 = false;
} }
if(var7 == 4 && var1.getBlockMaterial(var2 + 1, var3, var4).isSolid()) { if (var7 == 4 && var1.getBlockMaterial(var2 + 1, var3, var4).isSolid()) {
var6 = false; var6 = false;
} }
if(var7 == 5 && var1.getBlockMaterial(var2 - 1, var3, var4).isSolid()) { if (var7 == 5 && var1.getBlockMaterial(var2 - 1, var3, var4).isSolid()) {
var6 = false; var6 = false;
} }
} }
if(var6) { if (var6) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }

19
src/net/minecraft/block/BlockSnow.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityItem; import net.minecraft.entity.EntityItem;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
@ -12,6 +11,8 @@ import net.minecraft.world.EnumLightSource;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockSnow extends Block { public class BlockSnow extends Block {
protected BlockSnow(int var1, int var2) { protected BlockSnow(int var1, int var2) {
super(var1, var2, Material.snow); super(var1, var2, Material.snow);
@ -21,7 +22,7 @@ public class BlockSnow extends Block {
public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) { public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4) & 7; int var5 = var1.getBlockMetadata(var2, var3, var4) & 7;
return var5 >= 3 ? AxisAlignedBB.getBoundingBoxFromPool((double)var2 + this.minX, (double)var3 + this.minY, (double)var4 + this.minZ, (double)var2 + this.maxX, (double)((float)var3 + 0.5F), (double)var4 + this.maxZ) : null; return var5 >= 3 ? AxisAlignedBB.getBoundingBoxFromPool((double) var2 + this.minX, (double) var3 + this.minY, (double) var4 + this.minZ, (double) var2 + this.maxX, (double) ((float) var3 + 0.5F), (double) var4 + this.maxZ) : null;
} }
public boolean isOpaqueCube() { public boolean isOpaqueCube() {
@ -34,7 +35,7 @@ public class BlockSnow extends Block {
public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) { public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) {
int var5 = var1.getBlockMetadata(var2, var3, var4) & 7; int var5 = var1.getBlockMetadata(var2, var3, var4) & 7;
float var6 = (float)(2 * (1 + var5)) / 16.0F; float var6 = (float) (2 * (1 + var5)) / 16.0F;
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, var6, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, var6, 1.0F);
} }
@ -48,7 +49,7 @@ public class BlockSnow extends Block {
} }
private boolean func_275_g(World var1, int var2, int var3, int var4) { private boolean func_275_g(World var1, int var2, int var3, int var4) {
if(!this.canPlaceBlockAt(var1, var2, var3, var4)) { if (!this.canPlaceBlockAt(var1, var2, var3, var4)) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
return false; return false;
@ -60,10 +61,10 @@ public class BlockSnow extends Block {
public void harvestBlock(World var1, EntityPlayer var2, int var3, int var4, int var5, int var6) { public void harvestBlock(World var1, EntityPlayer var2, int var3, int var4, int var5, int var6) {
int var7 = Item.snowball.shiftedIndex; int var7 = Item.snowball.shiftedIndex;
float var8 = 0.7F; float var8 = 0.7F;
double var9 = (double)(var1.rand.nextFloat() * var8) + (double)(1.0F - var8) * 0.5D; double var9 = (double) (var1.rand.nextFloat() * var8) + (double) (1.0F - var8) * 0.5D;
double var11 = (double)(var1.rand.nextFloat() * var8) + (double)(1.0F - var8) * 0.5D; double var11 = (double) (var1.rand.nextFloat() * var8) + (double) (1.0F - var8) * 0.5D;
double var13 = (double)(var1.rand.nextFloat() * var8) + (double)(1.0F - var8) * 0.5D; double var13 = (double) (var1.rand.nextFloat() * var8) + (double) (1.0F - var8) * 0.5D;
EntityItem var15 = new EntityItem(var1, (double)var3 + var9, (double)var4 + var11, (double)var5 + var13, new ItemStack(var7, 1, 0)); EntityItem var15 = new EntityItem(var1, (double) var3 + var9, (double) var4 + var11, (double) var5 + var13, new ItemStack(var7, 1, 0));
var15.delayBeforeCanPickup = 10; var15.delayBeforeCanPickup = 10;
var1.entityJoinedWorld(var15); var1.entityJoinedWorld(var15);
var1.setBlockWithNotify(var3, var4, var5, 0); var1.setBlockWithNotify(var3, var4, var5, 0);
@ -79,7 +80,7 @@ public class BlockSnow extends Block {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(var1.getSavedLightValue(EnumLightSource.Block, var2, var3, var4) > 11) { if (var1.getSavedLightValue(EnumLightSource.Block, var2, var3, var4) > 11) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }

5
src/net/minecraft/block/BlockSnowBlock.java
View file

@ -1,11 +1,12 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.world.EnumLightSource; import net.minecraft.world.EnumLightSource;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockSnowBlock extends Block { public class BlockSnowBlock extends Block {
protected BlockSnowBlock(int var1, int var2) { protected BlockSnowBlock(int var1, int var2) {
super(var1, var2, Material.builtSnow); super(var1, var2, Material.builtSnow);
@ -21,7 +22,7 @@ public class BlockSnowBlock extends Block {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(var1.getSavedLightValue(EnumLightSource.Block, var2, var3, var4) > 11) { if (var1.getSavedLightValue(EnumLightSource.Block, var2, var3, var4) > 11) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }

2
src/net/minecraft/block/BlockSoulSand.java
View file

@ -12,7 +12,7 @@ public class BlockSoulSand extends Block {
public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) { public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) {
float var5 = 2.0F / 16.0F; float var5 = 2.0F / 16.0F;
return AxisAlignedBB.getBoundingBoxFromPool((double)var2, (double)var3, (double)var4, (double)(var2 + 1), (double)((float)(var3 + 1) - var5), (double)(var4 + 1)); return AxisAlignedBB.getBoundingBoxFromPool((double) var2, (double) var3, (double) var4, (double) (var2 + 1), (double) ((float) (var3 + 1) - var5), (double) (var4 + 1));
} }
public void onEntityCollidedWithBlock(World var1, int var2, int var3, int var4, Entity var5) { public void onEntityCollidedWithBlock(World var1, int var2, int var3, int var4, Entity var5) {

14
src/net/minecraft/block/BlockSponge.java
View file

@ -12,10 +12,10 @@ public class BlockSponge extends Block {
public void onBlockAdded(World var1, int var2, int var3, int var4) { public void onBlockAdded(World var1, int var2, int var3, int var4) {
byte var5 = 2; byte var5 = 2;
for(int var6 = var2 - var5; var6 <= var2 + var5; ++var6) { for (int var6 = var2 - var5; var6 <= var2 + var5; ++var6) {
for(int var7 = var3 - var5; var7 <= var3 + var5; ++var7) { for (int var7 = var3 - var5; var7 <= var3 + var5; ++var7) {
for(int var8 = var4 - var5; var8 <= var4 + var5; ++var8) { for (int var8 = var4 - var5; var8 <= var4 + var5; ++var8) {
if(var1.getBlockMaterial(var6, var7, var8) == Material.water) { if (var1.getBlockMaterial(var6, var7, var8) == Material.water) {
} }
} }
} }
@ -26,9 +26,9 @@ public class BlockSponge extends Block {
public void onBlockRemoval(World var1, int var2, int var3, int var4) { public void onBlockRemoval(World var1, int var2, int var3, int var4) {
byte var5 = 2; byte var5 = 2;
for(int var6 = var2 - var5; var6 <= var2 + var5; ++var6) { for (int var6 = var2 - var5; var6 <= var2 + var5; ++var6) {
for(int var7 = var3 - var5; var7 <= var3 + var5; ++var7) { for (int var7 = var3 - var5; var7 <= var3 + var5; ++var7) {
for(int var8 = var4 - var5; var8 <= var4 + var5; ++var8) { for (int var8 = var4 - var5; var8 <= var4 + var5; ++var8) {
var1.notifyBlocksOfNeighborChange(var6, var7, var8, var1.getBlockId(var6, var7, var8)); var1.notifyBlocksOfNeighborChange(var6, var7, var8, var1.getBlockId(var6, var7, var8));
} }
} }

23
src/net/minecraft/block/BlockStairs.java
View file

@ -1,7 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.ArrayList;
import java.util.Random;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
@ -11,6 +9,9 @@ import net.minecraft.math.Vec3D;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.Random;
public class BlockStairs extends Block { public class BlockStairs extends Block {
private Block modelBlock; private Block modelBlock;
@ -41,22 +42,22 @@ public class BlockStairs extends Block {
public void getCollidingBoundingBoxes(World var1, int var2, int var3, int var4, AxisAlignedBB var5, ArrayList var6) { public void getCollidingBoundingBoxes(World var1, int var2, int var3, int var4, AxisAlignedBB var5, ArrayList var6) {
int var7 = var1.getBlockMetadata(var2, var3, var4); int var7 = var1.getBlockMetadata(var2, var3, var4);
if(var7 == 0) { if (var7 == 0) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.5F, 0.5F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.5F, 0.5F, 1.0F);
super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6); super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6);
this.setBlockBounds(0.5F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); this.setBlockBounds(0.5F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6); super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6);
} else if(var7 == 1) { } else if (var7 == 1) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.5F, 1.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.5F, 1.0F, 1.0F);
super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6); super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6);
this.setBlockBounds(0.5F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); this.setBlockBounds(0.5F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6); super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6);
} else if(var7 == 2) { } else if (var7 == 2) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 0.5F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 0.5F);
super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6); super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6);
this.setBlockBounds(0.0F, 0.0F, 0.5F, 1.0F, 1.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.5F, 1.0F, 1.0F, 1.0F);
super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6); super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6);
} else if(var7 == 3) { } else if (var7 == 3) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.5F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.5F);
super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6); super.getCollidingBoundingBoxes(var1, var2, var3, var4, var5, var6);
this.setBlockBounds(0.0F, 0.0F, 0.5F, 1.0F, 0.5F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.5F, 1.0F, 0.5F, 1.0F);
@ -144,20 +145,20 @@ public class BlockStairs extends Block {
} }
public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) { public void onBlockPlacedBy(World var1, int var2, int var3, int var4, EntityLiving var5) {
int var6 = MathHelper.floor_double((double)(var5.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int var6 = MathHelper.floor_double((double) (var5.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
if(var6 == 0) { if (var6 == 0) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 2); var1.setBlockMetadataWithNotify(var2, var3, var4, 2);
} }
if(var6 == 1) { if (var6 == 1) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 1); var1.setBlockMetadataWithNotify(var2, var3, var4, 1);
} }
if(var6 == 2) { if (var6 == 2) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 3); var1.setBlockMetadataWithNotify(var2, var3, var4, 3);
} }
if(var6 == 3) { if (var6 == 3) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 0); var1.setBlockMetadataWithNotify(var2, var3, var4, 0);
} }

17
src/net/minecraft/block/BlockStationary.java
View file

@ -1,14 +1,15 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockStationary extends BlockFluid { public class BlockStationary extends BlockFluid {
protected BlockStationary(int var1, Material var2) { protected BlockStationary(int var1, Material var2) {
super(var1, var2); super(var1, var2);
this.setTickOnLoad(false); this.setTickOnLoad(false);
if(var2 == Material.lava) { if (var2 == Material.lava) {
this.setTickOnLoad(true); this.setTickOnLoad(true);
} }
@ -16,7 +17,7 @@ public class BlockStationary extends BlockFluid {
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
super.onNeighborBlockChange(var1, var2, var3, var4, var5); super.onNeighborBlockChange(var1, var2, var3, var4, var5);
if(var1.getBlockId(var2, var3, var4) == this.blockID) { if (var1.getBlockId(var2, var3, var4) == this.blockID) {
this.func_30005_i(var1, var2, var3, var4); this.func_30005_i(var1, var2, var3, var4);
} }
@ -32,20 +33,20 @@ public class BlockStationary extends BlockFluid {
} }
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
if(this.blockMaterial == Material.lava) { if (this.blockMaterial == Material.lava) {
int var6 = var5.nextInt(3); int var6 = var5.nextInt(3);
for(int var7 = 0; var7 < var6; ++var7) { for (int var7 = 0; var7 < var6; ++var7) {
var2 += var5.nextInt(3) - 1; var2 += var5.nextInt(3) - 1;
++var3; ++var3;
var4 += var5.nextInt(3) - 1; var4 += var5.nextInt(3) - 1;
int var8 = var1.getBlockId(var2, var3, var4); int var8 = var1.getBlockId(var2, var3, var4);
if(var8 == 0) { if (var8 == 0) {
if(this.func_4033_j(var1, var2 - 1, var3, var4) || this.func_4033_j(var1, var2 + 1, var3, var4) || this.func_4033_j(var1, var2, var3, var4 - 1) || this.func_4033_j(var1, var2, var3, var4 + 1) || this.func_4033_j(var1, var2, var3 - 1, var4) || this.func_4033_j(var1, var2, var3 + 1, var4)) { if (this.func_4033_j(var1, var2 - 1, var3, var4) || this.func_4033_j(var1, var2 + 1, var3, var4) || this.func_4033_j(var1, var2, var3, var4 - 1) || this.func_4033_j(var1, var2, var3, var4 + 1) || this.func_4033_j(var1, var2, var3 - 1, var4) || this.func_4033_j(var1, var2, var3 + 1, var4)) {
var1.setBlockWithNotify(var2, var3, var4, Block.fire.blockID); var1.setBlockWithNotify(var2, var3, var4, Block.fire.blockID);
return; return;
} }
} else if(Block.blocksList[var8].blockMaterial.getIsSolid()) { } else if (Block.blocksList[var8].blockMaterial.getIsSolid()) {
return; return;
} }
} }

11
src/net/minecraft/block/BlockStep.java
View file

@ -1,9 +1,10 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockStep extends Block { public class BlockStep extends Block {
public static final String[] field_22027_a = new String[]{"stone", "sand", "wood", "cobble"}; public static final String[] field_22027_a = new String[]{"stone", "sand", "wood", "cobble"};
private boolean blockType; private boolean blockType;
@ -11,7 +12,7 @@ public class BlockStep extends Block {
public BlockStep(int var1, boolean var2) { public BlockStep(int var1, boolean var2) {
super(var1, 6, Material.rock); super(var1, 6, Material.rock);
this.blockType = var2; this.blockType = var2;
if(!var2) { if (!var2) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
} }
@ -31,15 +32,15 @@ public class BlockStep extends Block {
} }
public void onBlockAdded(World var1, int var2, int var3, int var4) { public void onBlockAdded(World var1, int var2, int var3, int var4) {
if(this != Block.stairSingle) { if (this != Block.stairSingle) {
super.onBlockAdded(var1, var2, var3, var4); super.onBlockAdded(var1, var2, var3, var4);
} }
int var5 = var1.getBlockId(var2, var3 - 1, var4); int var5 = var1.getBlockId(var2, var3 - 1, var4);
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
int var7 = var1.getBlockMetadata(var2, var3 - 1, var4); int var7 = var1.getBlockMetadata(var2, var3 - 1, var4);
if(var6 == var7) { if (var6 == var7) {
if(var5 == stairSingle.blockID) { if (var5 == stairSingle.blockID) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
var1.setBlockAndMetadataWithNotify(var2, var3 - 1, var4, Block.stairDouble.blockID, var6); var1.setBlockAndMetadataWithNotify(var2, var3 - 1, var4, Block.stairDouble.blockID, var6);
} }

3
src/net/minecraft/block/BlockStone.java
View file

@ -1,8 +1,9 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import java.util.Random;
public class BlockStone extends Block { public class BlockStone extends Block {
public BlockStone(int var1, int var2) { public BlockStone(int var1, int var2) {
super(var1, var2, Material.rock); super(var1, var2, Material.rock);

17
src/net/minecraft/block/BlockTNT.java
View file

@ -1,6 +1,5 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
import net.minecraft.entity.EntityTNTPrimed; import net.minecraft.entity.EntityTNTPrimed;
@ -8,6 +7,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.crafting.ItemStack; import net.minecraft.item.crafting.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockTNT extends Block { public class BlockTNT extends Block {
public BlockTNT(int var1, int var2) { public BlockTNT(int var1, int var2) {
super(var1, var2, Material.tnt); super(var1, var2, Material.tnt);
@ -19,7 +20,7 @@ public class BlockTNT extends Block {
public void onBlockAdded(World var1, int var2, int var3, int var4) { public void onBlockAdded(World var1, int var2, int var3, int var4) {
super.onBlockAdded(var1, var2, var3, var4); super.onBlockAdded(var1, var2, var3, var4);
if(var1.isBlockIndirectlyGettingPowered(var2, var3, var4)) { if (var1.isBlockIndirectlyGettingPowered(var2, var3, var4)) {
this.onBlockDestroyedByPlayer(var1, var2, var3, var4, 1); this.onBlockDestroyedByPlayer(var1, var2, var3, var4, 1);
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
@ -27,7 +28,7 @@ public class BlockTNT extends Block {
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(var5 > 0 && Block.blocksList[var5].canProvidePower() && var1.isBlockIndirectlyGettingPowered(var2, var3, var4)) { if (var5 > 0 && Block.blocksList[var5].canProvidePower() && var1.isBlockIndirectlyGettingPowered(var2, var3, var4)) {
this.onBlockDestroyedByPlayer(var1, var2, var3, var4, 1); this.onBlockDestroyedByPlayer(var1, var2, var3, var4, 1);
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
@ -39,17 +40,17 @@ public class BlockTNT extends Block {
} }
public void onBlockDestroyedByExplosion(World var1, int var2, int var3, int var4) { public void onBlockDestroyedByExplosion(World var1, int var2, int var3, int var4) {
EntityTNTPrimed var5 = new EntityTNTPrimed(var1, (double)((float)var2 + 0.5F), (double)((float)var3 + 0.5F), (double)((float)var4 + 0.5F)); EntityTNTPrimed var5 = new EntityTNTPrimed(var1, (double) ((float) var2 + 0.5F), (double) ((float) var3 + 0.5F), (double) ((float) var4 + 0.5F));
var5.fuse = var1.rand.nextInt(var5.fuse / 4) + var5.fuse / 8; var5.fuse = var1.rand.nextInt(var5.fuse / 4) + var5.fuse / 8;
var1.entityJoinedWorld(var5); var1.entityJoinedWorld(var5);
} }
public void onBlockDestroyedByPlayer(World var1, int var2, int var3, int var4, int var5) { public void onBlockDestroyedByPlayer(World var1, int var2, int var3, int var4, int var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
if((var5 & 1) == 0) { if ((var5 & 1) == 0) {
this.dropBlockAsItem_do(var1, var2, var3, var4, new ItemStack(Block.tnt.blockID, 1, 0)); this.dropBlockAsItem_do(var1, var2, var3, var4, new ItemStack(Block.tnt.blockID, 1, 0));
} else { } else {
EntityTNTPrimed var6 = new EntityTNTPrimed(var1, (double)((float)var2 + 0.5F), (double)((float)var3 + 0.5F), (double)((float)var4 + 0.5F)); EntityTNTPrimed var6 = new EntityTNTPrimed(var1, (double) ((float) var2 + 0.5F), (double) ((float) var3 + 0.5F), (double) ((float) var4 + 0.5F));
var1.entityJoinedWorld(var6); var1.entityJoinedWorld(var6);
var1.playSoundAtEntity(var6, "random.fuse", 1.0F, 1.0F); var1.playSoundAtEntity(var6, "random.fuse", 1.0F, 1.0F);
} }
@ -58,7 +59,7 @@ public class BlockTNT extends Block {
} }
public void onBlockClicked(World var1, int var2, int var3, int var4, EntityPlayer var5) { public void onBlockClicked(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(var5.getCurrentEquippedItem() != null && var5.getCurrentEquippedItem().itemID == Item.flintAndSteel.shiftedIndex) { if (var5.getCurrentEquippedItem() != null && var5.getCurrentEquippedItem().itemID == Item.flintAndSteel.shiftedIndex) {
var1.setBlockMetadata(var2, var3, var4, 1); var1.setBlockMetadata(var2, var3, var4, 1);
} }

3
src/net/minecraft/block/BlockTallGrass.java
View file

@ -1,8 +1,9 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import java.util.Random;
public class BlockTallGrass extends BlockFlower { public class BlockTallGrass extends BlockFlower {
protected BlockTallGrass(int var1, int var2) { protected BlockTallGrass(int var1, int var2) {
super(var1, var2); super(var1, var2);

49
src/net/minecraft/block/BlockTorch.java
View file

@ -1,12 +1,13 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.math.Vec3D; import net.minecraft.math.Vec3D;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockTorch extends Block { public class BlockTorch extends Block {
protected BlockTorch(int var1, int var2) { protected BlockTorch(int var1, int var2) {
super(var1, var2, Material.circuits); super(var1, var2, Material.circuits);
@ -35,23 +36,23 @@ public class BlockTorch extends Block {
public void onBlockPlaced(World var1, int var2, int var3, int var4, int var5) { public void onBlockPlaced(World var1, int var2, int var3, int var4, int var5) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
if(var5 == 1 && this.func_31028_g(var1, var2, var3 - 1, var4)) { if (var5 == 1 && this.func_31028_g(var1, var2, var3 - 1, var4)) {
var6 = 5; var6 = 5;
} }
if(var5 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1)) { if (var5 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1)) {
var6 = 4; var6 = 4;
} }
if(var5 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1)) { if (var5 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1)) {
var6 = 3; var6 = 3;
} }
if(var5 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4)) { if (var5 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4)) {
var6 = 2; var6 = 2;
} }
if(var5 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)) { if (var5 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)) {
var6 = 1; var6 = 1;
} }
@ -60,22 +61,22 @@ public class BlockTorch extends Block {
public void updateTick(World var1, int var2, int var3, int var4, Random var5) { public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
super.updateTick(var1, var2, var3, var4, var5); super.updateTick(var1, var2, var3, var4, var5);
if(var1.getBlockMetadata(var2, var3, var4) == 0) { if (var1.getBlockMetadata(var2, var3, var4) == 0) {
this.onBlockAdded(var1, var2, var3, var4); this.onBlockAdded(var1, var2, var3, var4);
} }
} }
public void onBlockAdded(World var1, int var2, int var3, int var4) { public void onBlockAdded(World var1, int var2, int var3, int var4) {
if(var1.isBlockNormalCube(var2 - 1, var3, var4)) { if (var1.isBlockNormalCube(var2 - 1, var3, var4)) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 1); var1.setBlockMetadataWithNotify(var2, var3, var4, 1);
} else if(var1.isBlockNormalCube(var2 + 1, var3, var4)) { } else if (var1.isBlockNormalCube(var2 + 1, var3, var4)) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 2); var1.setBlockMetadataWithNotify(var2, var3, var4, 2);
} else if(var1.isBlockNormalCube(var2, var3, var4 - 1)) { } else if (var1.isBlockNormalCube(var2, var3, var4 - 1)) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 3); var1.setBlockMetadataWithNotify(var2, var3, var4, 3);
} else if(var1.isBlockNormalCube(var2, var3, var4 + 1)) { } else if (var1.isBlockNormalCube(var2, var3, var4 + 1)) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 4); var1.setBlockMetadataWithNotify(var2, var3, var4, 4);
} else if(this.func_31028_g(var1, var2, var3 - 1, var4)) { } else if (this.func_31028_g(var1, var2, var3 - 1, var4)) {
var1.setBlockMetadataWithNotify(var2, var3, var4, 5); var1.setBlockMetadataWithNotify(var2, var3, var4, 5);
} }
@ -83,30 +84,30 @@ public class BlockTorch extends Block {
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(this.dropTorchIfCantStay(var1, var2, var3, var4)) { if (this.dropTorchIfCantStay(var1, var2, var3, var4)) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
boolean var7 = false; boolean var7 = false;
if(!var1.isBlockNormalCube(var2 - 1, var3, var4) && var6 == 1) { if (!var1.isBlockNormalCube(var2 - 1, var3, var4) && var6 == 1) {
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2 + 1, var3, var4) && var6 == 2) { if (!var1.isBlockNormalCube(var2 + 1, var3, var4) && var6 == 2) {
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2, var3, var4 - 1) && var6 == 3) { if (!var1.isBlockNormalCube(var2, var3, var4 - 1) && var6 == 3) {
var7 = true; var7 = true;
} }
if(!var1.isBlockNormalCube(var2, var3, var4 + 1) && var6 == 4) { if (!var1.isBlockNormalCube(var2, var3, var4 + 1) && var6 == 4) {
var7 = true; var7 = true;
} }
if(!this.func_31028_g(var1, var2, var3 - 1, var4) && var6 == 5) { if (!this.func_31028_g(var1, var2, var3 - 1, var4) && var6 == 5) {
var7 = true; var7 = true;
} }
if(var7) { if (var7) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
} }
@ -115,7 +116,7 @@ public class BlockTorch extends Block {
} }
private boolean dropTorchIfCantStay(World var1, int var2, int var3, int var4) { private boolean dropTorchIfCantStay(World var1, int var2, int var3, int var4) {
if(!this.canPlaceBlockAt(var1, var2, var3, var4)) { if (!this.canPlaceBlockAt(var1, var2, var3, var4)) {
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4)); this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
return false; return false;
@ -127,13 +128,13 @@ public class BlockTorch extends Block {
public MovingObjectPosition collisionRayTrace(World var1, int var2, int var3, int var4, Vec3D var5, Vec3D var6) { public MovingObjectPosition collisionRayTrace(World var1, int var2, int var3, int var4, Vec3D var5, Vec3D var6) {
int var7 = var1.getBlockMetadata(var2, var3, var4) & 7; int var7 = var1.getBlockMetadata(var2, var3, var4) & 7;
float var8 = 0.15F; float var8 = 0.15F;
if(var7 == 1) { if (var7 == 1) {
this.setBlockBounds(0.0F, 0.2F, 0.5F - var8, var8 * 2.0F, 0.8F, 0.5F + var8); this.setBlockBounds(0.0F, 0.2F, 0.5F - var8, var8 * 2.0F, 0.8F, 0.5F + var8);
} else if(var7 == 2) { } else if (var7 == 2) {
this.setBlockBounds(1.0F - var8 * 2.0F, 0.2F, 0.5F - var8, 1.0F, 0.8F, 0.5F + var8); this.setBlockBounds(1.0F - var8 * 2.0F, 0.2F, 0.5F - var8, 1.0F, 0.8F, 0.5F + var8);
} else if(var7 == 3) { } else if (var7 == 3) {
this.setBlockBounds(0.5F - var8, 0.2F, 0.0F, 0.5F + var8, 0.8F, var8 * 2.0F); this.setBlockBounds(0.5F - var8, 0.2F, 0.0F, 0.5F + var8, 0.8F, var8 * 2.0F);
} else if(var7 == 4) { } else if (var7 == 4) {
this.setBlockBounds(0.5F - var8, 0.2F, 1.0F - var8 * 2.0F, 0.5F + var8, 0.8F, 1.0F); this.setBlockBounds(0.5F - var8, 0.2F, 1.0F - var8 * 2.0F, 0.5F + var8, 0.8F, 1.0F);
} else { } else {
var8 = 0.1F; var8 = 0.1F;

52
src/net/minecraft/block/BlockTrapDoor.java
View file

@ -12,7 +12,7 @@ public class BlockTrapDoor extends Block {
protected BlockTrapDoor(int var1, Material var2) { protected BlockTrapDoor(int var1, Material var2) {
super(var1, var2); super(var1, var2);
this.blockIndexInTexture = 84; this.blockIndexInTexture = 84;
if(var2 == Material.iron) { if (var2 == Material.iron) {
++this.blockIndexInTexture; ++this.blockIndexInTexture;
} }
@ -41,20 +41,20 @@ public class BlockTrapDoor extends Block {
public void func_28039_c(int var1) { public void func_28039_c(int var1) {
float var2 = 3.0F / 16.0F; float var2 = 3.0F / 16.0F;
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, var2, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, var2, 1.0F);
if(func_28038_d(var1)) { if (func_28038_d(var1)) {
if((var1 & 3) == 0) { if ((var1 & 3) == 0) {
this.setBlockBounds(0.0F, 0.0F, 1.0F - var2, 1.0F, 1.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 1.0F - var2, 1.0F, 1.0F, 1.0F);
} }
if((var1 & 3) == 1) { if ((var1 & 3) == 1) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var2); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var2);
} }
if((var1 & 3) == 2) { if ((var1 & 3) == 2) {
this.setBlockBounds(1.0F - var2, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); this.setBlockBounds(1.0F - var2, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
} }
if((var1 & 3) == 3) { if ((var1 & 3) == 3) {
this.setBlockBounds(0.0F, 0.0F, 0.0F, var2, 1.0F, 1.0F); this.setBlockBounds(0.0F, 0.0F, 0.0F, var2, 1.0F, 1.0F);
} }
} }
@ -66,7 +66,7 @@ public class BlockTrapDoor extends Block {
} }
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) { public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(this.blockMaterial == Material.iron) { if (this.blockMaterial == Material.iron) {
return true; return true;
} else { } else {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
@ -79,39 +79,39 @@ public class BlockTrapDoor extends Block {
public void func_28040_a(World var1, int var2, int var3, int var4, boolean var5) { public void func_28040_a(World var1, int var2, int var3, int var4, boolean var5) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
boolean var7 = (var6 & 4) > 0; boolean var7 = (var6 & 4) > 0;
if(var7 != var5) { if (var7 != var5) {
var1.setBlockMetadataWithNotify(var2, var3, var4, var6 ^ 4); var1.setBlockMetadataWithNotify(var2, var3, var4, var6 ^ 4);
var1.func_28101_a((EntityPlayer)null, 1003, var2, var3, var4, 0); var1.func_28101_a((EntityPlayer) null, 1003, var2, var3, var4, 0);
} }
} }
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) { public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
if(!var1.singleplayerWorld) { if (!var1.singleplayerWorld) {
int var6 = var1.getBlockMetadata(var2, var3, var4); int var6 = var1.getBlockMetadata(var2, var3, var4);
int var7 = var2; int var7 = var2;
int var8 = var4; int var8 = var4;
if((var6 & 3) == 0) { if ((var6 & 3) == 0) {
var8 = var4 + 1; var8 = var4 + 1;
} }
if((var6 & 3) == 1) { if ((var6 & 3) == 1) {
--var8; --var8;
} }
if((var6 & 3) == 2) { if ((var6 & 3) == 2) {
var7 = var2 + 1; var7 = var2 + 1;
} }
if((var6 & 3) == 3) { if ((var6 & 3) == 3) {
--var7; --var7;
} }
if(!var1.isBlockNormalCube(var7, var3, var8)) { if (!var1.isBlockNormalCube(var7, var3, var8)) {
var1.setBlockWithNotify(var2, var3, var4, 0); var1.setBlockWithNotify(var2, var3, var4, 0);
this.dropBlockAsItem(var1, var2, var3, var4, var6); this.dropBlockAsItem(var1, var2, var3, var4, var6);
} }
if(var5 > 0 && Block.blocksList[var5].canProvidePower()) { if (var5 > 0 && Block.blocksList[var5].canProvidePower()) {
boolean var9 = var1.isBlockIndirectlyGettingPowered(var2, var3, var4); boolean var9 = var1.isBlockIndirectlyGettingPowered(var2, var3, var4);
this.func_28040_a(var1, var2, var3, var4, var9); this.func_28040_a(var1, var2, var3, var4, var9);
} }
@ -126,19 +126,19 @@ public class BlockTrapDoor extends Block {
public void onBlockPlaced(World var1, int var2, int var3, int var4, int var5) { public void onBlockPlaced(World var1, int var2, int var3, int var4, int var5) {
byte var6 = 0; byte var6 = 0;
if(var5 == 2) { if (var5 == 2) {
var6 = 0; var6 = 0;
} }
if(var5 == 3) { if (var5 == 3) {
var6 = 1; var6 = 1;
} }
if(var5 == 4) { if (var5 == 4) {
var6 = 2; var6 = 2;
} }
if(var5 == 5) { if (var5 == 5) {
var6 = 3; var6 = 3;
} }
@ -146,24 +146,24 @@ public class BlockTrapDoor extends Block {
} }
public boolean canPlaceBlockOnSide(World var1, int var2, int var3, int var4, int var5) { public boolean canPlaceBlockOnSide(World var1, int var2, int var3, int var4, int var5) {
if(var5 == 0) { if (var5 == 0) {
return false; return false;
} else if(var5 == 1) { } else if (var5 == 1) {
return false; return false;
} else { } else {
if(var5 == 2) { if (var5 == 2) {
++var4; ++var4;
} }
if(var5 == 3) { if (var5 == 3) {
--var4; --var4;
} }
if(var5 == 4) { if (var5 == 4) {
++var2; ++var2;
} }
if(var5 == 5) { if (var5 == 5) {
--var2; --var2;
} }

3
src/net/minecraft/block/BlockWeb.java
View file

@ -1,12 +1,13 @@
package net.minecraft.block; package net.minecraft.block;
import java.util.Random;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Random;
public class BlockWeb extends Block { public class BlockWeb extends Block {
public BlockWeb(int var1, int var2) { public BlockWeb(int var1, int var2) {
super(var1, var2, Material.web); super(var1, var2, Material.web);

2
src/net/minecraft/block/BlockWorkbench.java
View file

@ -15,7 +15,7 @@ public class BlockWorkbench extends Block {
} }
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) { public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
if(var1.singleplayerWorld) { if (var1.singleplayerWorld) {
return true; return true;
} else { } else {
var5.displayWorkbenchGUI(var2, var3, var4); var5.displayWorkbenchGUI(var2, var3, var4);

159
src/net/minecraft/block/RailLogic.java
View file

@ -1,9 +1,10 @@
package net.minecraft.block; package net.minecraft.block;
import net.minecraft.math.ChunkPosition;
import net.minecraft.world.World;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.minecraft.math.ChunkPosition;
import net.minecraft.world.World;
class RailLogic { class RailLogic {
private World worldObj; private World worldObj;
@ -23,7 +24,7 @@ class RailLogic {
this.trackZ = var5; this.trackZ = var5;
int var6 = var2.getBlockId(var3, var4, var5); int var6 = var2.getBlockId(var3, var4, var5);
int var7 = var2.getBlockMetadata(var3, var4, var5); int var7 = var2.getBlockMetadata(var3, var4, var5);
if(BlockRail.func_27033_a((BlockRail)Block.blocksList[var6])) { if (BlockRail.func_27033_a((BlockRail) Block.blocksList[var6])) {
this.field_27084_f = true; this.field_27084_f = true;
var7 &= -9; var7 &= -9;
} else { } else {
@ -35,34 +36,34 @@ class RailLogic {
private void func_27083_a(int var1) { private void func_27083_a(int var1) {
this.connectedTracks.clear(); this.connectedTracks.clear();
if(var1 == 0) { if (var1 == 0) {
this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ - 1)); this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ - 1));
this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ + 1)); this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ + 1));
} else if(var1 == 1) { } else if (var1 == 1) {
this.connectedTracks.add(new ChunkPosition(this.trackX - 1, this.trackY, this.trackZ)); this.connectedTracks.add(new ChunkPosition(this.trackX - 1, this.trackY, this.trackZ));
this.connectedTracks.add(new ChunkPosition(this.trackX + 1, this.trackY, this.trackZ)); this.connectedTracks.add(new ChunkPosition(this.trackX + 1, this.trackY, this.trackZ));
} else if(var1 == 2) { } else if (var1 == 2) {
this.connectedTracks.add(new ChunkPosition(this.trackX - 1, this.trackY, this.trackZ)); this.connectedTracks.add(new ChunkPosition(this.trackX - 1, this.trackY, this.trackZ));
this.connectedTracks.add(new ChunkPosition(this.trackX + 1, this.trackY + 1, this.trackZ)); this.connectedTracks.add(new ChunkPosition(this.trackX + 1, this.trackY + 1, this.trackZ));
} else if(var1 == 3) { } else if (var1 == 3) {
this.connectedTracks.add(new ChunkPosition(this.trackX - 1, this.trackY + 1, this.trackZ)); this.connectedTracks.add(new ChunkPosition(this.trackX - 1, this.trackY + 1, this.trackZ));
this.connectedTracks.add(new ChunkPosition(this.trackX + 1, this.trackY, this.trackZ)); this.connectedTracks.add(new ChunkPosition(this.trackX + 1, this.trackY, this.trackZ));
} else if(var1 == 4) { } else if (var1 == 4) {
this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY + 1, this.trackZ - 1)); this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY + 1, this.trackZ - 1));
this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ + 1)); this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ + 1));
} else if(var1 == 5) { } else if (var1 == 5) {
this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ - 1)); this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ - 1));
this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY + 1, this.trackZ + 1)); this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY + 1, this.trackZ + 1));
} else if(var1 == 6) { } else if (var1 == 6) {
this.connectedTracks.add(new ChunkPosition(this.trackX + 1, this.trackY, this.trackZ)); this.connectedTracks.add(new ChunkPosition(this.trackX + 1, this.trackY, this.trackZ));
this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ + 1)); this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ + 1));
} else if(var1 == 7) { } else if (var1 == 7) {
this.connectedTracks.add(new ChunkPosition(this.trackX - 1, this.trackY, this.trackZ)); this.connectedTracks.add(new ChunkPosition(this.trackX - 1, this.trackY, this.trackZ));
this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ + 1)); this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ + 1));
} else if(var1 == 8) { } else if (var1 == 8) {
this.connectedTracks.add(new ChunkPosition(this.trackX - 1, this.trackY, this.trackZ)); this.connectedTracks.add(new ChunkPosition(this.trackX - 1, this.trackY, this.trackZ));
this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ - 1)); this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ - 1));
} else if(var1 == 9) { } else if (var1 == 9) {
this.connectedTracks.add(new ChunkPosition(this.trackX + 1, this.trackY, this.trackZ)); this.connectedTracks.add(new ChunkPosition(this.trackX + 1, this.trackY, this.trackZ));
this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ - 1)); this.connectedTracks.add(new ChunkPosition(this.trackX, this.trackY, this.trackZ - 1));
} }
@ -70,9 +71,9 @@ class RailLogic {
} }
private void func_591_b() { private void func_591_b() {
for(int var1 = 0; var1 < this.connectedTracks.size(); ++var1) { for (int var1 = 0; var1 < this.connectedTracks.size(); ++var1) {
RailLogic var2 = this.getMinecartTrackLogic((ChunkPosition)this.connectedTracks.get(var1)); RailLogic var2 = this.getMinecartTrackLogic((ChunkPosition) this.connectedTracks.get(var1));
if(var2 != null && var2.isConnectedTo(this)) { if (var2 != null && var2.isConnectedTo(this)) {
this.connectedTracks.set(var1, new ChunkPosition(var2.trackX, var2.trackY, var2.trackZ)); this.connectedTracks.set(var1, new ChunkPosition(var2.trackX, var2.trackY, var2.trackZ));
} else { } else {
this.connectedTracks.remove(var1--); this.connectedTracks.remove(var1--);
@ -90,9 +91,9 @@ class RailLogic {
} }
private boolean isConnectedTo(RailLogic var1) { private boolean isConnectedTo(RailLogic var1) {
for(int var2 = 0; var2 < this.connectedTracks.size(); ++var2) { for (int var2 = 0; var2 < this.connectedTracks.size(); ++var2) {
ChunkPosition var3 = (ChunkPosition)this.connectedTracks.get(var2); ChunkPosition var3 = (ChunkPosition) this.connectedTracks.get(var2);
if(var3.x == var1.trackX && var3.z == var1.trackZ) { if (var3.x == var1.trackX && var3.z == var1.trackZ) {
return true; return true;
} }
} }
@ -101,9 +102,9 @@ class RailLogic {
} }
private boolean func_599_b(int var1, int var2, int var3) { private boolean func_599_b(int var1, int var2, int var3) {
for(int var4 = 0; var4 < this.connectedTracks.size(); ++var4) { for (int var4 = 0; var4 < this.connectedTracks.size(); ++var4) {
ChunkPosition var5 = (ChunkPosition)this.connectedTracks.get(var4); ChunkPosition var5 = (ChunkPosition) this.connectedTracks.get(var4);
if(var5.x == var1 && var5.z == var3) { if (var5.x == var1 && var5.z == var3) {
return true; return true;
} }
} }
@ -113,19 +114,19 @@ class RailLogic {
private int getAdjacentTracks() { private int getAdjacentTracks() {
int var1 = 0; int var1 = 0;
if(this.isMinecartTrack(this.trackX, this.trackY, this.trackZ - 1)) { if (this.isMinecartTrack(this.trackX, this.trackY, this.trackZ - 1)) {
++var1; ++var1;
} }
if(this.isMinecartTrack(this.trackX, this.trackY, this.trackZ + 1)) { if (this.isMinecartTrack(this.trackX, this.trackY, this.trackZ + 1)) {
++var1; ++var1;
} }
if(this.isMinecartTrack(this.trackX - 1, this.trackY, this.trackZ)) { if (this.isMinecartTrack(this.trackX - 1, this.trackY, this.trackZ)) {
++var1; ++var1;
} }
if(this.isMinecartTrack(this.trackX + 1, this.trackY, this.trackZ)) { if (this.isMinecartTrack(this.trackX + 1, this.trackY, this.trackZ)) {
++var1; ++var1;
} }
@ -133,14 +134,14 @@ class RailLogic {
} }
private boolean handleKeyPress(RailLogic var1) { private boolean handleKeyPress(RailLogic var1) {
if(this.isConnectedTo(var1)) { if (this.isConnectedTo(var1)) {
return true; return true;
} else if(this.connectedTracks.size() == 2) { } else if (this.connectedTracks.size() == 2) {
return false; return false;
} else if(this.connectedTracks.size() == 0) { } else if (this.connectedTracks.size() == 0) {
return true; return true;
} else { } else {
ChunkPosition var2 = (ChunkPosition)this.connectedTracks.get(0); ChunkPosition var2 = (ChunkPosition) this.connectedTracks.get(0);
return var1.trackY == this.trackY && var2.y == this.trackY ? true : true; return var1.trackY == this.trackY && var2.y == this.trackY ? true : true;
} }
} }
@ -152,58 +153,58 @@ class RailLogic {
boolean var4 = this.func_599_b(this.trackX - 1, this.trackY, this.trackZ); boolean var4 = this.func_599_b(this.trackX - 1, this.trackY, this.trackZ);
boolean var5 = this.func_599_b(this.trackX + 1, this.trackY, this.trackZ); boolean var5 = this.func_599_b(this.trackX + 1, this.trackY, this.trackZ);
byte var6 = -1; byte var6 = -1;
if(var2 || var3) { if (var2 || var3) {
var6 = 0; var6 = 0;
} }
if(var4 || var5) { if (var4 || var5) {
var6 = 1; var6 = 1;
} }
if(!this.field_27084_f) { if (!this.field_27084_f) {
if(var3 && var5 && !var2 && !var4) { if (var3 && var5 && !var2 && !var4) {
var6 = 6; var6 = 6;
} }
if(var3 && var4 && !var2 && !var5) { if (var3 && var4 && !var2 && !var5) {
var6 = 7; var6 = 7;
} }
if(var2 && var4 && !var3 && !var5) { if (var2 && var4 && !var3 && !var5) {
var6 = 8; var6 = 8;
} }
if(var2 && var5 && !var3 && !var4) { if (var2 && var5 && !var3 && !var4) {
var6 = 9; var6 = 9;
} }
} }
if(var6 == 0) { if (var6 == 0) {
if(BlockRail.func_27029_g(this.worldObj, this.trackX, this.trackY + 1, this.trackZ - 1)) { if (BlockRail.func_27029_g(this.worldObj, this.trackX, this.trackY + 1, this.trackZ - 1)) {
var6 = 4; var6 = 4;
} }
if(BlockRail.func_27029_g(this.worldObj, this.trackX, this.trackY + 1, this.trackZ + 1)) { if (BlockRail.func_27029_g(this.worldObj, this.trackX, this.trackY + 1, this.trackZ + 1)) {
var6 = 5; var6 = 5;
} }
} }
if(var6 == 1) { if (var6 == 1) {
if(BlockRail.func_27029_g(this.worldObj, this.trackX + 1, this.trackY + 1, this.trackZ)) { if (BlockRail.func_27029_g(this.worldObj, this.trackX + 1, this.trackY + 1, this.trackZ)) {
var6 = 2; var6 = 2;
} }
if(BlockRail.func_27029_g(this.worldObj, this.trackX - 1, this.trackY + 1, this.trackZ)) { if (BlockRail.func_27029_g(this.worldObj, this.trackX - 1, this.trackY + 1, this.trackZ)) {
var6 = 3; var6 = 3;
} }
} }
if(var6 < 0) { if (var6 < 0) {
var6 = 0; var6 = 0;
} }
int var7 = var6; int var7 = var6;
if(this.field_27084_f) { if (this.field_27084_f) {
var7 = this.worldObj.getBlockMetadata(this.trackX, this.trackY, this.trackZ) & 8 | var6; var7 = this.worldObj.getBlockMetadata(this.trackX, this.trackY, this.trackZ) & 8 | var6;
} }
@ -212,7 +213,7 @@ class RailLogic {
private boolean func_592_c(int var1, int var2, int var3) { private boolean func_592_c(int var1, int var2, int var3) {
RailLogic var4 = this.getMinecartTrackLogic(new ChunkPosition(var1, var2, var3)); RailLogic var4 = this.getMinecartTrackLogic(new ChunkPosition(var1, var2, var3));
if(var4 == null) { if (var4 == null) {
return false; return false;
} else { } else {
var4.func_591_b(); var4.func_591_b();
@ -226,116 +227,116 @@ class RailLogic {
boolean var5 = this.func_592_c(this.trackX - 1, this.trackY, this.trackZ); boolean var5 = this.func_592_c(this.trackX - 1, this.trackY, this.trackZ);
boolean var6 = this.func_592_c(this.trackX + 1, this.trackY, this.trackZ); boolean var6 = this.func_592_c(this.trackX + 1, this.trackY, this.trackZ);
byte var7 = -1; byte var7 = -1;
if((var3 || var4) && !var5 && !var6) { if ((var3 || var4) && !var5 && !var6) {
var7 = 0; var7 = 0;
} }
if((var5 || var6) && !var3 && !var4) { if ((var5 || var6) && !var3 && !var4) {
var7 = 1; var7 = 1;
} }
if(!this.field_27084_f) { if (!this.field_27084_f) {
if(var4 && var6 && !var3 && !var5) { if (var4 && var6 && !var3 && !var5) {
var7 = 6; var7 = 6;
} }
if(var4 && var5 && !var3 && !var6) { if (var4 && var5 && !var3 && !var6) {
var7 = 7; var7 = 7;
} }
if(var3 && var5 && !var4 && !var6) { if (var3 && var5 && !var4 && !var6) {
var7 = 8; var7 = 8;
} }
if(var3 && var6 && !var4 && !var5) { if (var3 && var6 && !var4 && !var5) {
var7 = 9; var7 = 9;
} }
} }
if(var7 == -1) { if (var7 == -1) {
if(var3 || var4) { if (var3 || var4) {
var7 = 0; var7 = 0;
} }
if(var5 || var6) { if (var5 || var6) {
var7 = 1; var7 = 1;
} }
if(!this.field_27084_f) { if (!this.field_27084_f) {
if(var1) { if (var1) {
if(var4 && var6) { if (var4 && var6) {
var7 = 6; var7 = 6;
} }
if(var5 && var4) { if (var5 && var4) {
var7 = 7; var7 = 7;
} }
if(var6 && var3) { if (var6 && var3) {
var7 = 9; var7 = 9;
} }
if(var3 && var5) { if (var3 && var5) {
var7 = 8; var7 = 8;
} }
} else { } else {
if(var3 && var5) { if (var3 && var5) {
var7 = 8; var7 = 8;
} }
if(var6 && var3) { if (var6 && var3) {
var7 = 9; var7 = 9;
} }
if(var5 && var4) { if (var5 && var4) {
var7 = 7; var7 = 7;
} }
if(var4 && var6) { if (var4 && var6) {
var7 = 6; var7 = 6;
} }
} }
} }
} }
if(var7 == 0) { if (var7 == 0) {
if(BlockRail.func_27029_g(this.worldObj, this.trackX, this.trackY + 1, this.trackZ - 1)) { if (BlockRail.func_27029_g(this.worldObj, this.trackX, this.trackY + 1, this.trackZ - 1)) {
var7 = 4; var7 = 4;
} }
if(BlockRail.func_27029_g(this.worldObj, this.trackX, this.trackY + 1, this.trackZ + 1)) { if (BlockRail.func_27029_g(this.worldObj, this.trackX, this.trackY + 1, this.trackZ + 1)) {
var7 = 5; var7 = 5;
} }
} }
if(var7 == 1) { if (var7 == 1) {
if(BlockRail.func_27029_g(this.worldObj, this.trackX + 1, this.trackY + 1, this.trackZ)) { if (BlockRail.func_27029_g(this.worldObj, this.trackX + 1, this.trackY + 1, this.trackZ)) {
var7 = 2; var7 = 2;
} }
if(BlockRail.func_27029_g(this.worldObj, this.trackX - 1, this.trackY + 1, this.trackZ)) { if (BlockRail.func_27029_g(this.worldObj, this.trackX - 1, this.trackY + 1, this.trackZ)) {
var7 = 3; var7 = 3;
} }
} }
if(var7 < 0) { if (var7 < 0) {
var7 = 0; var7 = 0;
} }
this.func_27083_a(var7); this.func_27083_a(var7);
int var8 = var7; int var8 = var7;
if(this.field_27084_f) { if (this.field_27084_f) {
var8 = this.worldObj.getBlockMetadata(this.trackX, this.trackY, this.trackZ) & 8 | var7; var8 = this.worldObj.getBlockMetadata(this.trackX, this.trackY, this.trackZ) & 8 | var7;
} }
if(var2 || this.worldObj.getBlockMetadata(this.trackX, this.trackY, this.trackZ) != var8) { if (var2 || this.worldObj.getBlockMetadata(this.trackX, this.trackY, this.trackZ) != var8) {
this.worldObj.setBlockMetadataWithNotify(this.trackX, this.trackY, this.trackZ, var8); this.worldObj.setBlockMetadataWithNotify(this.trackX, this.trackY, this.trackZ, var8);
for(int var9 = 0; var9 < this.connectedTracks.size(); ++var9) { for (int var9 = 0; var9 < this.connectedTracks.size(); ++var9) {
RailLogic var10 = this.getMinecartTrackLogic((ChunkPosition)this.connectedTracks.get(var9)); RailLogic var10 = this.getMinecartTrackLogic((ChunkPosition) this.connectedTracks.get(var9));
if(var10 != null) { if (var10 != null) {
var10.func_591_b(); var10.func_591_b();
if(var10.handleKeyPress(this)) { if (var10.handleKeyPress(this)) {
var10.func_598_d(this); var10.func_598_d(this);
} }
} }

21
src/net/minecraft/block/tile/TileEntity.java
View file

@ -1,11 +1,12 @@
package net.minecraft.block.tile; package net.minecraft.block.tile;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packets.Packet; import net.minecraft.network.packets.Packet;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.HashMap;
import java.util.Map;
public class TileEntity { public class TileEntity {
private static Map nameToClassMap = new HashMap(); private static Map nameToClassMap = new HashMap();
private static Map classToNameMap = new HashMap(); private static Map classToNameMap = new HashMap();
@ -16,7 +17,7 @@ public class TileEntity {
protected boolean tileEntityInvalid; protected boolean tileEntityInvalid;
private static void addMapping(Class var0, String var1) { private static void addMapping(Class var0, String var1) {
if(classToNameMap.containsKey(var1)) { if (classToNameMap.containsKey(var1)) {
throw new IllegalArgumentException("Duplicate id: " + var1); throw new IllegalArgumentException("Duplicate id: " + var1);
} else { } else {
nameToClassMap.put(var1, var0); nameToClassMap.put(var1, var0);
@ -31,8 +32,8 @@ public class TileEntity {
} }
public void writeToNBT(NBTTagCompound var1) { public void writeToNBT(NBTTagCompound var1) {
String var2 = (String)classToNameMap.get(this.getClass()); String var2 = (String) classToNameMap.get(this.getClass());
if(var2 == null) { if (var2 == null) {
throw new RuntimeException(this.getClass() + " is missing a mapping! This is a bug!"); throw new RuntimeException(this.getClass() + " is missing a mapping! This is a bug!");
} else { } else {
var1.setString("id", var2); var1.setString("id", var2);
@ -49,15 +50,15 @@ public class TileEntity {
TileEntity var1 = null; TileEntity var1 = null;
try { try {
Class var2 = (Class)nameToClassMap.get(var0.getString("id")); Class var2 = (Class) nameToClassMap.get(var0.getString("id"));
if(var2 != null) { if (var2 != null) {
var1 = (TileEntity)var2.newInstance(); var1 = (TileEntity) var2.newInstance();
} }
} catch (Exception var3) { } catch (Exception var3) {
var3.printStackTrace(); var3.printStackTrace();
} }
if(var1 != null) { if (var1 != null) {
var1.readFromNBT(var0); var1.readFromNBT(var0);
} else { } else {
System.out.println("Skipping TileEntity with id " + var0.getString("id")); System.out.println("Skipping TileEntity with id " + var0.getString("id"));
@ -71,7 +72,7 @@ public class TileEntity {
} }
public void onInventoryChanged() { public void onInventoryChanged() {
if(this.worldObj != null) { if (this.worldObj != null) {
this.worldObj.updateTileEntityChunkAndDoNothing(this.xCoord, this.yCoord, this.zCoord, this); this.worldObj.updateTileEntityChunkAndDoNothing(this.xCoord, this.yCoord, this.zCoord, this);
} }

22
src/net/minecraft/block/tile/TileEntityChest.java
View file

@ -18,16 +18,16 @@ public class TileEntityChest extends TileEntity implements IInventory {
} }
public ItemStack decrStackSize(int var1, int var2) { public ItemStack decrStackSize(int var1, int var2) {
if(this.chestContents[var1] != null) { if (this.chestContents[var1] != null) {
ItemStack var3; ItemStack var3;
if(this.chestContents[var1].stackSize <= var2) { if (this.chestContents[var1].stackSize <= var2) {
var3 = this.chestContents[var1]; var3 = this.chestContents[var1];
this.chestContents[var1] = null; this.chestContents[var1] = null;
this.onInventoryChanged(); this.onInventoryChanged();
return var3; return var3;
} else { } else {
var3 = this.chestContents[var1].splitStack(var2); var3 = this.chestContents[var1].splitStack(var2);
if(this.chestContents[var1].stackSize == 0) { if (this.chestContents[var1].stackSize == 0) {
this.chestContents[var1] = null; this.chestContents[var1] = null;
} }
@ -41,7 +41,7 @@ public class TileEntityChest extends TileEntity implements IInventory {
public void setInventorySlotContents(int var1, ItemStack var2) { public void setInventorySlotContents(int var1, ItemStack var2) {
this.chestContents[var1] = var2; this.chestContents[var1] = var2;
if(var2 != null && var2.stackSize > this.getInventoryStackLimit()) { if (var2 != null && var2.stackSize > this.getInventoryStackLimit()) {
var2.stackSize = this.getInventoryStackLimit(); var2.stackSize = this.getInventoryStackLimit();
} }
@ -57,10 +57,10 @@ public class TileEntityChest extends TileEntity implements IInventory {
NBTTagList var2 = var1.getTagList("Items"); NBTTagList var2 = var1.getTagList("Items");
this.chestContents = new ItemStack[this.getSizeInventory()]; this.chestContents = new ItemStack[this.getSizeInventory()];
for(int var3 = 0; var3 < var2.tagCount(); ++var3) { for (int var3 = 0; var3 < var2.tagCount(); ++var3) {
NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3); NBTTagCompound var4 = (NBTTagCompound) var2.tagAt(var3);
int var5 = var4.getByte("Slot") & 255; int var5 = var4.getByte("Slot") & 255;
if(var5 >= 0 && var5 < this.chestContents.length) { if (var5 >= 0 && var5 < this.chestContents.length) {
this.chestContents[var5] = new ItemStack(var4); this.chestContents[var5] = new ItemStack(var4);
} }
} }
@ -71,10 +71,10 @@ public class TileEntityChest extends TileEntity implements IInventory {
super.writeToNBT(var1); super.writeToNBT(var1);
NBTTagList var2 = new NBTTagList(); NBTTagList var2 = new NBTTagList();
for(int var3 = 0; var3 < this.chestContents.length; ++var3) { for (int var3 = 0; var3 < this.chestContents.length; ++var3) {
if(this.chestContents[var3] != null) { if (this.chestContents[var3] != null) {
NBTTagCompound var4 = new NBTTagCompound(); NBTTagCompound var4 = new NBTTagCompound();
var4.setByte("Slot", (byte)var3); var4.setByte("Slot", (byte) var3);
this.chestContents[var3].writeToNBT(var4); this.chestContents[var3].writeToNBT(var4);
var2.setTag(var4); var2.setTag(var4);
} }
@ -88,6 +88,6 @@ public class TileEntityChest extends TileEntity implements IInventory {
} }
public boolean canInteractWith(EntityPlayer var1) { public boolean canInteractWith(EntityPlayer var1) {
return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : var1.getDistanceSq((double)this.xCoord + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord + 0.5D) <= 64.0D; return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : var1.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) <= 64.0D;
} }
} }

31
src/net/minecraft/block/tile/TileEntityDispenser.java
View file

@ -1,12 +1,13 @@
package net.minecraft.block.tile; package net.minecraft.block.tile;
import java.util.Random;
import net.minecraft.container.inventory.IInventory; import net.minecraft.container.inventory.IInventory;
import net.minecraft.entity.EntityPlayer; import net.minecraft.entity.EntityPlayer;
import net.minecraft.item.crafting.ItemStack; import net.minecraft.item.crafting.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import java.util.Random;
public class TileEntityDispenser extends TileEntity implements IInventory { public class TileEntityDispenser extends TileEntity implements IInventory {
private ItemStack[] dispenserContents = new ItemStack[9]; private ItemStack[] dispenserContents = new ItemStack[9];
private Random dispenserRandom = new Random(); private Random dispenserRandom = new Random();
@ -20,16 +21,16 @@ public class TileEntityDispenser extends TileEntity implements IInventory {
} }
public ItemStack decrStackSize(int var1, int var2) { public ItemStack decrStackSize(int var1, int var2) {
if(this.dispenserContents[var1] != null) { if (this.dispenserContents[var1] != null) {
ItemStack var3; ItemStack var3;
if(this.dispenserContents[var1].stackSize <= var2) { if (this.dispenserContents[var1].stackSize <= var2) {
var3 = this.dispenserContents[var1]; var3 = this.dispenserContents[var1];
this.dispenserContents[var1] = null; this.dispenserContents[var1] = null;
this.onInventoryChanged(); this.onInventoryChanged();
return var3; return var3;
} else { } else {
var3 = this.dispenserContents[var1].splitStack(var2); var3 = this.dispenserContents[var1].splitStack(var2);
if(this.dispenserContents[var1].stackSize == 0) { if (this.dispenserContents[var1].stackSize == 0) {
this.dispenserContents[var1] = null; this.dispenserContents[var1] = null;
} }
@ -45,13 +46,13 @@ public class TileEntityDispenser extends TileEntity implements IInventory {
int var1 = -1; int var1 = -1;
int var2 = 1; int var2 = 1;
for(int var3 = 0; var3 < this.dispenserContents.length; ++var3) { for (int var3 = 0; var3 < this.dispenserContents.length; ++var3) {
if(this.dispenserContents[var3] != null && this.dispenserRandom.nextInt(var2++) == 0) { if (this.dispenserContents[var3] != null && this.dispenserRandom.nextInt(var2++) == 0) {
var1 = var3; var1 = var3;
} }
} }
if(var1 >= 0) { if (var1 >= 0) {
return this.decrStackSize(var1, 1); return this.decrStackSize(var1, 1);
} else { } else {
return null; return null;
@ -60,7 +61,7 @@ public class TileEntityDispenser extends TileEntity implements IInventory {
public void setInventorySlotContents(int var1, ItemStack var2) { public void setInventorySlotContents(int var1, ItemStack var2) {
this.dispenserContents[var1] = var2; this.dispenserContents[var1] = var2;
if(var2 != null && var2.stackSize > this.getInventoryStackLimit()) { if (var2 != null && var2.stackSize > this.getInventoryStackLimit()) {
var2.stackSize = this.getInventoryStackLimit(); var2.stackSize = this.getInventoryStackLimit();
} }
@ -76,10 +77,10 @@ public class TileEntityDispenser extends TileEntity implements IInventory {
NBTTagList var2 = var1.getTagList("Items"); NBTTagList var2 = var1.getTagList("Items");
this.dispenserContents = new ItemStack[this.getSizeInventory()]; this.dispenserContents = new ItemStack[this.getSizeInventory()];
for(int var3 = 0; var3 < var2.tagCount(); ++var3) { for (int var3 = 0; var3 < var2.tagCount(); ++var3) {
NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3); NBTTagCompound var4 = (NBTTagCompound) var2.tagAt(var3);
int var5 = var4.getByte("Slot") & 255; int var5 = var4.getByte("Slot") & 255;
if(var5 >= 0 && var5 < this.dispenserContents.length) { if (var5 >= 0 && var5 < this.dispenserContents.length) {
this.dispenserContents[var5] = new ItemStack(var4); this.dispenserContents[var5] = new ItemStack(var4);
} }
} }
@ -90,10 +91,10 @@ public class TileEntityDispenser extends TileEntity implements IInventory {
super.writeToNBT(var1); super.writeToNBT(var1);
NBTTagList var2 = new NBTTagList(); NBTTagList var2 = new NBTTagList();
for(int var3 = 0; var3 < this.dispenserContents.length; ++var3) { for (int var3 = 0; var3 < this.dispenserContents.length; ++var3) {
if(this.dispenserContents[var3] != null) { if (this.dispenserContents[var3] != null) {
NBTTagCompound var4 = new NBTTagCompound(); NBTTagCompound var4 = new NBTTagCompound();
var4.setByte("Slot", (byte)var3); var4.setByte("Slot", (byte) var3);
this.dispenserContents[var3].writeToNBT(var4); this.dispenserContents[var3].writeToNBT(var4);
var2.setTag(var4); var2.setTag(var4);
} }
@ -107,6 +108,6 @@ public class TileEntityDispenser extends TileEntity implements IInventory {
} }
public boolean canInteractWith(EntityPlayer var1) { public boolean canInteractWith(EntityPlayer var1) {
return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : var1.getDistanceSq((double)this.xCoord + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord + 0.5D) <= 64.0D; return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : var1.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) <= 64.0D;
} }
} }

58
src/net/minecraft/block/tile/TileEntityFurnace.java
View file

@ -26,15 +26,15 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
} }
public ItemStack decrStackSize(int var1, int var2) { public ItemStack decrStackSize(int var1, int var2) {
if(this.furnaceItemStacks[var1] != null) { if (this.furnaceItemStacks[var1] != null) {
ItemStack var3; ItemStack var3;
if(this.furnaceItemStacks[var1].stackSize <= var2) { if (this.furnaceItemStacks[var1].stackSize <= var2) {
var3 = this.furnaceItemStacks[var1]; var3 = this.furnaceItemStacks[var1];
this.furnaceItemStacks[var1] = null; this.furnaceItemStacks[var1] = null;
return var3; return var3;
} else { } else {
var3 = this.furnaceItemStacks[var1].splitStack(var2); var3 = this.furnaceItemStacks[var1].splitStack(var2);
if(this.furnaceItemStacks[var1].stackSize == 0) { if (this.furnaceItemStacks[var1].stackSize == 0) {
this.furnaceItemStacks[var1] = null; this.furnaceItemStacks[var1] = null;
} }
@ -47,7 +47,7 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
public void setInventorySlotContents(int var1, ItemStack var2) { public void setInventorySlotContents(int var1, ItemStack var2) {
this.furnaceItemStacks[var1] = var2; this.furnaceItemStacks[var1] = var2;
if(var2 != null && var2.stackSize > this.getInventoryStackLimit()) { if (var2 != null && var2.stackSize > this.getInventoryStackLimit()) {
var2.stackSize = this.getInventoryStackLimit(); var2.stackSize = this.getInventoryStackLimit();
} }
@ -62,10 +62,10 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
NBTTagList var2 = var1.getTagList("Items"); NBTTagList var2 = var1.getTagList("Items");
this.furnaceItemStacks = new ItemStack[this.getSizeInventory()]; this.furnaceItemStacks = new ItemStack[this.getSizeInventory()];
for(int var3 = 0; var3 < var2.tagCount(); ++var3) { for (int var3 = 0; var3 < var2.tagCount(); ++var3) {
NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3); NBTTagCompound var4 = (NBTTagCompound) var2.tagAt(var3);
byte var5 = var4.getByte("Slot"); byte var5 = var4.getByte("Slot");
if(var5 >= 0 && var5 < this.furnaceItemStacks.length) { if (var5 >= 0 && var5 < this.furnaceItemStacks.length) {
this.furnaceItemStacks[var5] = new ItemStack(var4); this.furnaceItemStacks[var5] = new ItemStack(var4);
} }
} }
@ -77,14 +77,14 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
public void writeToNBT(NBTTagCompound var1) { public void writeToNBT(NBTTagCompound var1) {
super.writeToNBT(var1); super.writeToNBT(var1);
var1.setShort("BurnTime", (short)this.furnaceBurnTime); var1.setShort("BurnTime", (short) this.furnaceBurnTime);
var1.setShort("CookTime", (short)this.furnaceCookTime); var1.setShort("CookTime", (short) this.furnaceCookTime);
NBTTagList var2 = new NBTTagList(); NBTTagList var2 = new NBTTagList();
for(int var3 = 0; var3 < this.furnaceItemStacks.length; ++var3) { for (int var3 = 0; var3 < this.furnaceItemStacks.length; ++var3) {
if(this.furnaceItemStacks[var3] != null) { if (this.furnaceItemStacks[var3] != null) {
NBTTagCompound var4 = new NBTTagCompound(); NBTTagCompound var4 = new NBTTagCompound();
var4.setByte("Slot", (byte)var3); var4.setByte("Slot", (byte) var3);
this.furnaceItemStacks[var3].writeToNBT(var4); this.furnaceItemStacks[var3].writeToNBT(var4);
var2.setTag(var4); var2.setTag(var4);
} }
@ -104,27 +104,27 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
public void updateEntity() { public void updateEntity() {
boolean var1 = this.furnaceBurnTime > 0; boolean var1 = this.furnaceBurnTime > 0;
boolean var2 = false; boolean var2 = false;
if(this.furnaceBurnTime > 0) { if (this.furnaceBurnTime > 0) {
--this.furnaceBurnTime; --this.furnaceBurnTime;
} }
if(!this.worldObj.singleplayerWorld) { if (!this.worldObj.singleplayerWorld) {
if(this.furnaceBurnTime == 0 && this.canSmelt()) { if (this.furnaceBurnTime == 0 && this.canSmelt()) {
this.currentItemBurnTime = this.furnaceBurnTime = this.getItemBurnTime(this.furnaceItemStacks[1]); this.currentItemBurnTime = this.furnaceBurnTime = this.getItemBurnTime(this.furnaceItemStacks[1]);
if(this.furnaceBurnTime > 0) { if (this.furnaceBurnTime > 0) {
var2 = true; var2 = true;
if(this.furnaceItemStacks[1] != null) { if (this.furnaceItemStacks[1] != null) {
--this.furnaceItemStacks[1].stackSize; --this.furnaceItemStacks[1].stackSize;
if(this.furnaceItemStacks[1].stackSize == 0) { if (this.furnaceItemStacks[1].stackSize == 0) {
this.furnaceItemStacks[1] = null; this.furnaceItemStacks[1] = null;
} }
} }
} }
} }
if(this.isBurning() && this.canSmelt()) { if (this.isBurning() && this.canSmelt()) {
++this.furnaceCookTime; ++this.furnaceCookTime;
if(this.furnaceCookTime == 200) { if (this.furnaceCookTime == 200) {
this.furnaceCookTime = 0; this.furnaceCookTime = 0;
this.smeltItem(); this.smeltItem();
var2 = true; var2 = true;
@ -133,20 +133,20 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
this.furnaceCookTime = 0; this.furnaceCookTime = 0;
} }
if(var1 != this.furnaceBurnTime > 0) { if (var1 != this.furnaceBurnTime > 0) {
var2 = true; var2 = true;
BlockFurnace.updateFurnaceBlockState(this.furnaceBurnTime > 0, this.worldObj, this.xCoord, this.yCoord, this.zCoord); BlockFurnace.updateFurnaceBlockState(this.furnaceBurnTime > 0, this.worldObj, this.xCoord, this.yCoord, this.zCoord);
} }
} }
if(var2) { if (var2) {
this.onInventoryChanged(); this.onInventoryChanged();
} }
} }
private boolean canSmelt() { private boolean canSmelt() {
if(this.furnaceItemStacks[0] == null) { if (this.furnaceItemStacks[0] == null) {
return false; return false;
} else { } else {
ItemStack var1 = FurnaceRecipes.smelting().getSmeltingResult(this.furnaceItemStacks[0].getItem().shiftedIndex); ItemStack var1 = FurnaceRecipes.smelting().getSmeltingResult(this.furnaceItemStacks[0].getItem().shiftedIndex);
@ -155,16 +155,16 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
} }
public void smeltItem() { public void smeltItem() {
if(this.canSmelt()) { if (this.canSmelt()) {
ItemStack var1 = FurnaceRecipes.smelting().getSmeltingResult(this.furnaceItemStacks[0].getItem().shiftedIndex); ItemStack var1 = FurnaceRecipes.smelting().getSmeltingResult(this.furnaceItemStacks[0].getItem().shiftedIndex);
if(this.furnaceItemStacks[2] == null) { if (this.furnaceItemStacks[2] == null) {
this.furnaceItemStacks[2] = var1.copy(); this.furnaceItemStacks[2] = var1.copy();
} else if(this.furnaceItemStacks[2].itemID == var1.itemID) { } else if (this.furnaceItemStacks[2].itemID == var1.itemID) {
++this.furnaceItemStacks[2].stackSize; ++this.furnaceItemStacks[2].stackSize;
} }
--this.furnaceItemStacks[0].stackSize; --this.furnaceItemStacks[0].stackSize;
if(this.furnaceItemStacks[0].stackSize <= 0) { if (this.furnaceItemStacks[0].stackSize <= 0) {
this.furnaceItemStacks[0] = null; this.furnaceItemStacks[0] = null;
} }
@ -172,7 +172,7 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
} }
private int getItemBurnTime(ItemStack var1) { private int getItemBurnTime(ItemStack var1) {
if(var1 == null) { if (var1 == null) {
return 0; return 0;
} else { } else {
int var2 = var1.getItem().shiftedIndex; int var2 = var1.getItem().shiftedIndex;
@ -181,6 +181,6 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
} }
public boolean canInteractWith(EntityPlayer var1) { public boolean canInteractWith(EntityPlayer var1) {
return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : var1.getDistanceSq((double)this.xCoord + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord + 0.5D) <= 64.0D; return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : var1.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) <= 64.0D;
} }
} }

48
src/net/minecraft/block/tile/TileEntityMobSpawner.java
View file

@ -20,58 +20,58 @@ public class TileEntityMobSpawner extends TileEntity {
} }
public boolean anyPlayerInRange() { public boolean anyPlayerInRange() {
return this.worldObj.getClosestPlayer((double)this.xCoord + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord + 0.5D, 16.0D) != null; return this.worldObj.getClosestPlayer((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D, 16.0D) != null;
} }
public void updateEntity() { public void updateEntity() {
this.yaw2 = this.yaw; this.yaw2 = this.yaw;
if(this.anyPlayerInRange()) { if (this.anyPlayerInRange()) {
double var1 = (double)((float)this.xCoord + this.worldObj.rand.nextFloat()); double var1 = (double) ((float) this.xCoord + this.worldObj.rand.nextFloat());
double var3 = (double)((float)this.yCoord + this.worldObj.rand.nextFloat()); double var3 = (double) ((float) this.yCoord + this.worldObj.rand.nextFloat());
double var5 = (double)((float)this.zCoord + this.worldObj.rand.nextFloat()); double var5 = (double) ((float) this.zCoord + this.worldObj.rand.nextFloat());
this.worldObj.spawnParticle("smoke", var1, var3, var5, 0.0D, 0.0D, 0.0D); this.worldObj.spawnParticle("smoke", var1, var3, var5, 0.0D, 0.0D, 0.0D);
this.worldObj.spawnParticle("flame", var1, var3, var5, 0.0D, 0.0D, 0.0D); this.worldObj.spawnParticle("flame", var1, var3, var5, 0.0D, 0.0D, 0.0D);
for(this.yaw += (double)(1000.0F / ((float)this.delay + 200.0F)); this.yaw > 360.0D; this.yaw2 -= 360.0D) { for (this.yaw += (double) (1000.0F / ((float) this.delay + 200.0F)); this.yaw > 360.0D; this.yaw2 -= 360.0D) {
this.yaw -= 360.0D; this.yaw -= 360.0D;
} }
if(!this.worldObj.singleplayerWorld) { if (!this.worldObj.singleplayerWorld) {
if(this.delay == -1) { if (this.delay == -1) {
this.updateDelay(); this.updateDelay();
} }
if(this.delay > 0) { if (this.delay > 0) {
--this.delay; --this.delay;
return; return;
} }
byte var7 = 4; byte var7 = 4;
for(int var8 = 0; var8 < var7; ++var8) { for (int var8 = 0; var8 < var7; ++var8) {
EntityLiving var9 = (EntityLiving)((EntityLiving)EntityList.createEntityInWorld(this.mobID, this.worldObj)); EntityLiving var9 = (EntityLiving) ((EntityLiving) EntityList.createEntityInWorld(this.mobID, this.worldObj));
if(var9 == null) { if (var9 == null) {
return; return;
} }
int var10 = this.worldObj.getEntitiesWithinAABB(var9.getClass(), AxisAlignedBB.getBoundingBoxFromPool((double)this.xCoord, (double)this.yCoord, (double)this.zCoord, (double)(this.xCoord + 1), (double)(this.yCoord + 1), (double)(this.zCoord + 1)).expand(8.0D, 4.0D, 8.0D)).size(); int var10 = this.worldObj.getEntitiesWithinAABB(var9.getClass(), AxisAlignedBB.getBoundingBoxFromPool((double) this.xCoord, (double) this.yCoord, (double) this.zCoord, (double) (this.xCoord + 1), (double) (this.yCoord + 1), (double) (this.zCoord + 1)).expand(8.0D, 4.0D, 8.0D)).size();
if(var10 >= 6) { if (var10 >= 6) {
this.updateDelay(); this.updateDelay();
return; return;
} }
if(var9 != null) { if (var9 != null) {
double var11 = (double)this.xCoord + (this.worldObj.rand.nextDouble() - this.worldObj.rand.nextDouble()) * 4.0D; double var11 = (double) this.xCoord + (this.worldObj.rand.nextDouble() - this.worldObj.rand.nextDouble()) * 4.0D;
double var13 = (double)(this.yCoord + this.worldObj.rand.nextInt(3) - 1); double var13 = (double) (this.yCoord + this.worldObj.rand.nextInt(3) - 1);
double var15 = (double)this.zCoord + (this.worldObj.rand.nextDouble() - this.worldObj.rand.nextDouble()) * 4.0D; double var15 = (double) this.zCoord + (this.worldObj.rand.nextDouble() - this.worldObj.rand.nextDouble()) * 4.0D;
var9.setLocationAndAngles(var11, var13, var15, this.worldObj.rand.nextFloat() * 360.0F, 0.0F); var9.setLocationAndAngles(var11, var13, var15, this.worldObj.rand.nextFloat() * 360.0F, 0.0F);
if(var9.getCanSpawnHere()) { if (var9.getCanSpawnHere()) {
this.worldObj.entityJoinedWorld(var9); this.worldObj.entityJoinedWorld(var9);
for(int var17 = 0; var17 < 20; ++var17) { for (int var17 = 0; var17 < 20; ++var17) {
var1 = (double)this.xCoord + 0.5D + ((double)this.worldObj.rand.nextFloat() - 0.5D) * 2.0D; var1 = (double) this.xCoord + 0.5D + ((double) this.worldObj.rand.nextFloat() - 0.5D) * 2.0D;
var3 = (double)this.yCoord + 0.5D + ((double)this.worldObj.rand.nextFloat() - 0.5D) * 2.0D; var3 = (double) this.yCoord + 0.5D + ((double) this.worldObj.rand.nextFloat() - 0.5D) * 2.0D;
var5 = (double)this.zCoord + 0.5D + ((double)this.worldObj.rand.nextFloat() - 0.5D) * 2.0D; var5 = (double) this.zCoord + 0.5D + ((double) this.worldObj.rand.nextFloat() - 0.5D) * 2.0D;
this.worldObj.spawnParticle("smoke", var1, var3, var5, 0.0D, 0.0D, 0.0D); this.worldObj.spawnParticle("smoke", var1, var3, var5, 0.0D, 0.0D, 0.0D);
this.worldObj.spawnParticle("flame", var1, var3, var5, 0.0D, 0.0D, 0.0D); this.worldObj.spawnParticle("flame", var1, var3, var5, 0.0D, 0.0D, 0.0D);
} }
@ -100,6 +100,6 @@ public class TileEntityMobSpawner extends TileEntity {
public void writeToNBT(NBTTagCompound var1) { public void writeToNBT(NBTTagCompound var1) {
super.writeToNBT(var1); super.writeToNBT(var1);
var1.setString("EntityId", this.mobID); var1.setString("EntityId", this.mobID);
var1.setShort("Delay", (short)this.delay); var1.setShort("Delay", (short) this.delay);
} }
} }

16
src/net/minecraft/block/tile/TileEntityNote.java
View file

@ -16,38 +16,38 @@ public class TileEntityNote extends TileEntity {
public void readFromNBT(NBTTagCompound var1) { public void readFromNBT(NBTTagCompound var1) {
super.readFromNBT(var1); super.readFromNBT(var1);
this.note = var1.getByte("note"); this.note = var1.getByte("note");
if(this.note < 0) { if (this.note < 0) {
this.note = 0; this.note = 0;
} }
if(this.note > 24) { if (this.note > 24) {
this.note = 24; this.note = 24;
} }
} }
public void changePitch() { public void changePitch() {
this.note = (byte)((this.note + 1) % 25); this.note = (byte) ((this.note + 1) % 25);
this.onInventoryChanged(); this.onInventoryChanged();
} }
public void triggerNote(World var1, int var2, int var3, int var4) { public void triggerNote(World var1, int var2, int var3, int var4) {
if(var1.getBlockMaterial(var2, var3 + 1, var4) == Material.air) { if (var1.getBlockMaterial(var2, var3 + 1, var4) == Material.air) {
Material var5 = var1.getBlockMaterial(var2, var3 - 1, var4); Material var5 = var1.getBlockMaterial(var2, var3 - 1, var4);
byte var6 = 0; byte var6 = 0;
if(var5 == Material.rock) { if (var5 == Material.rock) {
var6 = 1; var6 = 1;
} }
if(var5 == Material.sand) { if (var5 == Material.sand) {
var6 = 2; var6 = 2;
} }
if(var5 == Material.glass) { if (var5 == Material.glass) {
var6 = 3; var6 = 3;
} }
if(var5 == Material.wood) { if (var5 == Material.wood) {
var6 = 4; var6 = 4;
} }

35
src/net/minecraft/block/tile/TileEntityPiston.java
View file

@ -1,14 +1,15 @@
package net.minecraft.block.tile; package net.minecraft.block.tile;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.PistonBlockTextures; import net.minecraft.util.PistonBlockTextures;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
public class TileEntityPiston extends TileEntity { public class TileEntityPiston extends TileEntity {
private int storedBlockID; private int storedBlockID;
private int storedMetadata; private int storedMetadata;
@ -47,7 +48,7 @@ public class TileEntityPiston extends TileEntity {
} }
public float func_31007_a(float var1) { public float func_31007_a(float var1) {
if(var1 > 1.0F) { if (var1 > 1.0F) {
var1 = 1.0F; var1 = 1.0F;
} }
@ -55,22 +56,22 @@ public class TileEntityPiston extends TileEntity {
} }
private void func_31009_a(float var1, float var2) { private void func_31009_a(float var1, float var2) {
if(!this.isExtending) { if (!this.isExtending) {
--var1; --var1;
} else { } else {
var1 = 1.0F - var1; var1 = 1.0F - var1;
} }
AxisAlignedBB var3 = Block.pistonMoving.func_31032_a(this.worldObj, this.xCoord, this.yCoord, this.zCoord, this.storedBlockID, var1, this.storedOrientation); AxisAlignedBB var3 = Block.pistonMoving.func_31032_a(this.worldObj, this.xCoord, this.yCoord, this.zCoord, this.storedBlockID, var1, this.storedOrientation);
if(var3 != null) { if (var3 != null) {
List var4 = this.worldObj.getEntitiesWithinAABBExcludingEntity((Entity)null, var3); List var4 = this.worldObj.getEntitiesWithinAABBExcludingEntity((Entity) null, var3);
if(!var4.isEmpty()) { if (!var4.isEmpty()) {
field_31013_m.addAll(var4); field_31013_m.addAll(var4);
Iterator var5 = field_31013_m.iterator(); Iterator var5 = field_31013_m.iterator();
while(var5.hasNext()) { while (var5.hasNext()) {
Entity var6 = (Entity)var5.next(); Entity var6 = (Entity) var5.next();
var6.moveEntity((double)(var2 * (float)PistonBlockTextures.field_31051_b[this.storedOrientation]), (double)(var2 * (float)PistonBlockTextures.field_31054_c[this.storedOrientation]), (double)(var2 * (float)PistonBlockTextures.field_31053_d[this.storedOrientation])); var6.moveEntity((double) (var2 * (float) PistonBlockTextures.field_31051_b[this.storedOrientation]), (double) (var2 * (float) PistonBlockTextures.field_31054_c[this.storedOrientation]), (double) (var2 * (float) PistonBlockTextures.field_31053_d[this.storedOrientation]));
} }
field_31013_m.clear(); field_31013_m.clear();
@ -80,11 +81,11 @@ public class TileEntityPiston extends TileEntity {
} }
public void clearPistonTileEntity() { public void clearPistonTileEntity() {
if(this.lastProgress < 1.0F) { if (this.lastProgress < 1.0F) {
this.lastProgress = this.progress = 1.0F; this.lastProgress = this.progress = 1.0F;
this.worldObj.removeBlockTileEntity(this.xCoord, this.yCoord, this.zCoord); this.worldObj.removeBlockTileEntity(this.xCoord, this.yCoord, this.zCoord);
this.invalidate(); this.invalidate();
if(this.worldObj.getBlockId(this.xCoord, this.yCoord, this.zCoord) == Block.pistonMoving.blockID) { if (this.worldObj.getBlockId(this.xCoord, this.yCoord, this.zCoord) == Block.pistonMoving.blockID) {
this.worldObj.setBlockAndMetadataWithNotify(this.xCoord, this.yCoord, this.zCoord, this.storedBlockID, this.storedMetadata); this.worldObj.setBlockAndMetadataWithNotify(this.xCoord, this.yCoord, this.zCoord, this.storedBlockID, this.storedMetadata);
} }
} }
@ -93,21 +94,21 @@ public class TileEntityPiston extends TileEntity {
public void updateEntity() { public void updateEntity() {
this.lastProgress = this.progress; this.lastProgress = this.progress;
if(this.lastProgress >= 1.0F) { if (this.lastProgress >= 1.0F) {
this.func_31009_a(1.0F, 0.25F); this.func_31009_a(1.0F, 0.25F);
this.worldObj.removeBlockTileEntity(this.xCoord, this.yCoord, this.zCoord); this.worldObj.removeBlockTileEntity(this.xCoord, this.yCoord, this.zCoord);
this.invalidate(); this.invalidate();
if(this.worldObj.getBlockId(this.xCoord, this.yCoord, this.zCoord) == Block.pistonMoving.blockID) { if (this.worldObj.getBlockId(this.xCoord, this.yCoord, this.zCoord) == Block.pistonMoving.blockID) {
this.worldObj.setBlockAndMetadataWithNotify(this.xCoord, this.yCoord, this.zCoord, this.storedBlockID, this.storedMetadata); this.worldObj.setBlockAndMetadataWithNotify(this.xCoord, this.yCoord, this.zCoord, this.storedBlockID, this.storedMetadata);
} }
} else { } else {
this.progress += 0.5F; this.progress += 0.5F;
if(this.progress >= 1.0F) { if (this.progress >= 1.0F) {
this.progress = 1.0F; this.progress = 1.0F;
} }
if(this.isExtending) { if (this.isExtending) {
this.func_31009_a(this.progress, this.progress - this.lastProgress + 1.0F / 16.0F); this.func_31009_a(this.progress, this.progress - this.lastProgress + 1.0F / 16.0F);
} }

2
src/net/minecraft/block/tile/TileEntityRecordPlayer.java
View file

@ -12,7 +12,7 @@ public class TileEntityRecordPlayer extends TileEntity {
public void writeToNBT(NBTTagCompound var1) { public void writeToNBT(NBTTagCompound var1) {
super.writeToNBT(var1); super.writeToNBT(var1);
if(this.field_28009_a > 0) { if (this.field_28009_a > 0) {
var1.setInteger("Record", this.field_28009_a); var1.setInteger("Record", this.field_28009_a);
} }

6
src/net/minecraft/block/tile/TileEntitySign.java
View file

@ -21,9 +21,9 @@ public class TileEntitySign extends TileEntity {
this.isEditAble = false; this.isEditAble = false;
super.readFromNBT(var1); super.readFromNBT(var1);
for(int var2 = 0; var2 < 4; ++var2) { for (int var2 = 0; var2 < 4; ++var2) {
this.signText[var2] = var1.getString("Text" + (var2 + 1)); this.signText[var2] = var1.getString("Text" + (var2 + 1));
if(this.signText[var2].length() > 15) { if (this.signText[var2].length() > 15) {
this.signText[var2] = this.signText[var2].substring(0, 15); this.signText[var2] = this.signText[var2].substring(0, 15);
} }
} }
@ -33,7 +33,7 @@ public class TileEntitySign extends TileEntity {
public Packet getDescriptionPacket() { public Packet getDescriptionPacket() {
String[] var1 = new String[4]; String[] var1 = new String[4];
for(int var2 = 0; var2 < 4; ++var2) { for (int var2 = 0; var2 < 4; ++var2) {
var1[var2] = this.signText[var2]; var1[var2] = this.signText[var2];
} }

143
src/net/minecraft/container/Container.java
View file

@ -1,9 +1,5 @@
package net.minecraft.container; package net.minecraft.container;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import net.minecraft.container.inventory.IInventory; import net.minecraft.container.inventory.IInventory;
import net.minecraft.container.inventory.InventoryPlayer; import net.minecraft.container.inventory.InventoryPlayer;
import net.minecraft.container.slot.Slot; import net.minecraft.container.slot.Slot;
@ -11,6 +7,11 @@ import net.minecraft.entity.EntityPlayer;
import net.minecraft.item.crafting.ICrafting; import net.minecraft.item.crafting.ICrafting;
import net.minecraft.item.crafting.ItemStack; import net.minecraft.item.crafting.ItemStack;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public abstract class Container { public abstract class Container {
public List inventoryItemStacks = new ArrayList(); public List inventoryItemStacks = new ArrayList();
public List inventorySlots = new ArrayList(); public List inventorySlots = new ArrayList();
@ -22,11 +23,11 @@ public abstract class Container {
protected void addSlot(Slot var1) { protected void addSlot(Slot var1) {
var1.id = this.inventorySlots.size(); var1.id = this.inventorySlots.size();
this.inventorySlots.add(var1); this.inventorySlots.add(var1);
this.inventoryItemStacks.add((Object)null); this.inventoryItemStacks.add((Object) null);
} }
public void onCraftGuiOpened(ICrafting var1) { public void onCraftGuiOpened(ICrafting var1) {
if(this.crafters.contains(var1)) { if (this.crafters.contains(var1)) {
throw new IllegalArgumentException("Listener already listening"); throw new IllegalArgumentException("Listener already listening");
} else { } else {
this.crafters.add(var1); this.crafters.add(var1);
@ -38,23 +39,23 @@ public abstract class Container {
public List func_28127_b() { public List func_28127_b() {
ArrayList var1 = new ArrayList(); ArrayList var1 = new ArrayList();
for(int var2 = 0; var2 < this.inventorySlots.size(); ++var2) { for (int var2 = 0; var2 < this.inventorySlots.size(); ++var2) {
var1.add(((Slot)this.inventorySlots.get(var2)).getStack()); var1.add(((Slot) this.inventorySlots.get(var2)).getStack());
} }
return var1; return var1;
} }
public void updateCraftingMatrix() { public void updateCraftingMatrix() {
for(int var1 = 0; var1 < this.inventorySlots.size(); ++var1) { for (int var1 = 0; var1 < this.inventorySlots.size(); ++var1) {
ItemStack var2 = ((Slot)this.inventorySlots.get(var1)).getStack(); ItemStack var2 = ((Slot) this.inventorySlots.get(var1)).getStack();
ItemStack var3 = (ItemStack)this.inventoryItemStacks.get(var1); ItemStack var3 = (ItemStack) this.inventoryItemStacks.get(var1);
if(!ItemStack.areItemStacksEqual(var3, var2)) { if (!ItemStack.areItemStacksEqual(var3, var2)) {
var3 = var2 == null ? null : var2.copy(); var3 = var2 == null ? null : var2.copy();
this.inventoryItemStacks.set(var1, var3); this.inventoryItemStacks.set(var1, var3);
for(int var4 = 0; var4 < this.crafters.size(); ++var4) { for (int var4 = 0; var4 < this.crafters.size(); ++var4) {
((ICrafting)this.crafters.get(var4)).updateCraftingInventorySlot(this, var1, var3); ((ICrafting) this.crafters.get(var4)).updateCraftingInventorySlot(this, var1, var3);
} }
} }
} }
@ -62,9 +63,9 @@ public abstract class Container {
} }
public Slot func_20127_a(IInventory var1, int var2) { public Slot func_20127_a(IInventory var1, int var2) {
for(int var3 = 0; var3 < this.inventorySlots.size(); ++var3) { for (int var3 = 0; var3 < this.inventorySlots.size(); ++var3) {
Slot var4 = (Slot)this.inventorySlots.get(var3); Slot var4 = (Slot) this.inventorySlots.get(var3);
if(var4.isHere(var1, var2)) { if (var4.isHere(var1, var2)) {
return var4; return var4;
} }
} }
@ -73,108 +74,108 @@ public abstract class Container {
} }
public Slot getSlot(int var1) { public Slot getSlot(int var1) {
return (Slot)this.inventorySlots.get(var1); return (Slot) this.inventorySlots.get(var1);
} }
public ItemStack func_27086_a(int var1) { public ItemStack func_27086_a(int var1) {
Slot var2 = (Slot)this.inventorySlots.get(var1); Slot var2 = (Slot) this.inventorySlots.get(var1);
return var2 != null ? var2.getStack() : null; return var2 != null ? var2.getStack() : null;
} }
public ItemStack func_27085_a(int var1, int var2, boolean var3, EntityPlayer var4) { public ItemStack func_27085_a(int var1, int var2, boolean var3, EntityPlayer var4) {
ItemStack var5 = null; ItemStack var5 = null;
if(var2 == 0 || var2 == 1) { if (var2 == 0 || var2 == 1) {
InventoryPlayer var6 = var4.inventory; InventoryPlayer var6 = var4.inventory;
if(var1 == -999) { if (var1 == -999) {
if(var6.getItemStack() != null && var1 == -999) { if (var6.getItemStack() != null && var1 == -999) {
if(var2 == 0) { if (var2 == 0) {
var4.dropPlayerItem(var6.getItemStack()); var4.dropPlayerItem(var6.getItemStack());
var6.setItemStack((ItemStack)null); var6.setItemStack((ItemStack) null);
} }
if(var2 == 1) { if (var2 == 1) {
var4.dropPlayerItem(var6.getItemStack().splitStack(1)); var4.dropPlayerItem(var6.getItemStack().splitStack(1));
if(var6.getItemStack().stackSize == 0) { if (var6.getItemStack().stackSize == 0) {
var6.setItemStack((ItemStack)null); var6.setItemStack((ItemStack) null);
} }
} }
} }
} else { } else {
int var10; int var10;
if(var3) { if (var3) {
ItemStack var7 = this.func_27086_a(var1); ItemStack var7 = this.func_27086_a(var1);
if(var7 != null) { if (var7 != null) {
int var8 = var7.stackSize; int var8 = var7.stackSize;
var5 = var7.copy(); var5 = var7.copy();
Slot var9 = (Slot)this.inventorySlots.get(var1); Slot var9 = (Slot) this.inventorySlots.get(var1);
if(var9 != null && var9.getStack() != null) { if (var9 != null && var9.getStack() != null) {
var10 = var9.getStack().stackSize; var10 = var9.getStack().stackSize;
if(var10 < var8) { if (var10 < var8) {
this.func_27085_a(var1, var2, var3, var4); this.func_27085_a(var1, var2, var3, var4);
} }
} }
} }
} else { } else {
Slot var12 = (Slot)this.inventorySlots.get(var1); Slot var12 = (Slot) this.inventorySlots.get(var1);
if(var12 != null) { if (var12 != null) {
var12.onSlotChanged(); var12.onSlotChanged();
ItemStack var13 = var12.getStack(); ItemStack var13 = var12.getStack();
ItemStack var14 = var6.getItemStack(); ItemStack var14 = var6.getItemStack();
if(var13 != null) { if (var13 != null) {
var5 = var13.copy(); var5 = var13.copy();
} }
if(var13 == null) { if (var13 == null) {
if(var14 != null && var12.isItemValid(var14)) { if (var14 != null && var12.isItemValid(var14)) {
var10 = var2 == 0 ? var14.stackSize : 1; var10 = var2 == 0 ? var14.stackSize : 1;
if(var10 > var12.getSlotStackLimit()) { if (var10 > var12.getSlotStackLimit()) {
var10 = var12.getSlotStackLimit(); var10 = var12.getSlotStackLimit();
} }
var12.putStack(var14.splitStack(var10)); var12.putStack(var14.splitStack(var10));
if(var14.stackSize == 0) { if (var14.stackSize == 0) {
var6.setItemStack((ItemStack)null); var6.setItemStack((ItemStack) null);
} }
} }
} else if(var14 == null) { } else if (var14 == null) {
var10 = var2 == 0 ? var13.stackSize : (var13.stackSize + 1) / 2; var10 = var2 == 0 ? var13.stackSize : (var13.stackSize + 1) / 2;
ItemStack var11 = var12.decrStackSize(var10); ItemStack var11 = var12.decrStackSize(var10);
var6.setItemStack(var11); var6.setItemStack(var11);
if(var13.stackSize == 0) { if (var13.stackSize == 0) {
var12.putStack((ItemStack)null); var12.putStack((ItemStack) null);
} }
var12.onPickupFromSlot(var6.getItemStack()); var12.onPickupFromSlot(var6.getItemStack());
} else if(var12.isItemValid(var14)) { } else if (var12.isItemValid(var14)) {
if(var13.itemID != var14.itemID || var13.getHasSubtypes() && var13.getItemDamage() != var14.getItemDamage()) { if (var13.itemID != var14.itemID || var13.getHasSubtypes() && var13.getItemDamage() != var14.getItemDamage()) {
if(var14.stackSize <= var12.getSlotStackLimit()) { if (var14.stackSize <= var12.getSlotStackLimit()) {
var12.putStack(var14); var12.putStack(var14);
var6.setItemStack(var13); var6.setItemStack(var13);
} }
} else { } else {
var10 = var2 == 0 ? var14.stackSize : 1; var10 = var2 == 0 ? var14.stackSize : 1;
if(var10 > var12.getSlotStackLimit() - var13.stackSize) { if (var10 > var12.getSlotStackLimit() - var13.stackSize) {
var10 = var12.getSlotStackLimit() - var13.stackSize; var10 = var12.getSlotStackLimit() - var13.stackSize;
} }
if(var10 > var14.getMaxStackSize() - var13.stackSize) { if (var10 > var14.getMaxStackSize() - var13.stackSize) {
var10 = var14.getMaxStackSize() - var13.stackSize; var10 = var14.getMaxStackSize() - var13.stackSize;
} }
var14.splitStack(var10); var14.splitStack(var10);
if(var14.stackSize == 0) { if (var14.stackSize == 0) {
var6.setItemStack((ItemStack)null); var6.setItemStack((ItemStack) null);
} }
var13.stackSize += var10; var13.stackSize += var10;
} }
} else if(var13.itemID == var14.itemID && var14.getMaxStackSize() > 1 && (!var13.getHasSubtypes() || var13.getItemDamage() == var14.getItemDamage())) { } else if (var13.itemID == var14.itemID && var14.getMaxStackSize() > 1 && (!var13.getHasSubtypes() || var13.getItemDamage() == var14.getItemDamage())) {
var10 = var13.stackSize; var10 = var13.stackSize;
if(var10 > 0 && var10 + var14.stackSize <= var14.getMaxStackSize()) { if (var10 > 0 && var10 + var14.stackSize <= var14.getMaxStackSize()) {
var14.stackSize += var10; var14.stackSize += var10;
var13.splitStack(var10); var13.splitStack(var10);
if(var13.stackSize == 0) { if (var13.stackSize == 0) {
var12.putStack((ItemStack)null); var12.putStack((ItemStack) null);
} }
var12.onPickupFromSlot(var6.getItemStack()); var12.onPickupFromSlot(var6.getItemStack());
@ -190,9 +191,9 @@ public abstract class Container {
public void onCraftGuiClosed(EntityPlayer var1) { public void onCraftGuiClosed(EntityPlayer var1) {
InventoryPlayer var2 = var1.inventory; InventoryPlayer var2 = var1.inventory;
if(var2.getItemStack() != null) { if (var2.getItemStack() != null) {
var1.dropPlayerItem(var2.getItemStack()); var1.dropPlayerItem(var2.getItemStack());
var2.setItemStack((ItemStack)null); var2.setItemStack((ItemStack) null);
} }
} }
@ -206,7 +207,7 @@ public abstract class Container {
} }
public void setCanCraft(EntityPlayer var1, boolean var2) { public void setCanCraft(EntityPlayer var1, boolean var2) {
if(var2) { if (var2) {
this.field_20131_b.remove(var1); this.field_20131_b.remove(var1);
} else { } else {
this.field_20131_b.add(var1); this.field_20131_b.add(var1);
@ -218,30 +219,30 @@ public abstract class Container {
protected void func_28126_a(ItemStack var1, int var2, int var3, boolean var4) { protected void func_28126_a(ItemStack var1, int var2, int var3, boolean var4) {
int var5 = var2; int var5 = var2;
if(var4) { if (var4) {
var5 = var3 - 1; var5 = var3 - 1;
} }
Slot var6; Slot var6;
ItemStack var7; ItemStack var7;
if(var1.func_21132_c()) { if (var1.func_21132_c()) {
while(var1.stackSize > 0 && (!var4 && var5 < var3 || var4 && var5 >= var2)) { while (var1.stackSize > 0 && (!var4 && var5 < var3 || var4 && var5 >= var2)) {
var6 = (Slot)this.inventorySlots.get(var5); var6 = (Slot) this.inventorySlots.get(var5);
var7 = var6.getStack(); var7 = var6.getStack();
if(var7 != null && var7.itemID == var1.itemID && (!var1.getHasSubtypes() || var1.getItemDamage() == var7.getItemDamage())) { if (var7 != null && var7.itemID == var1.itemID && (!var1.getHasSubtypes() || var1.getItemDamage() == var7.getItemDamage())) {
int var8 = var7.stackSize + var1.stackSize; int var8 = var7.stackSize + var1.stackSize;
if(var8 <= var1.getMaxStackSize()) { if (var8 <= var1.getMaxStackSize()) {
var1.stackSize = 0; var1.stackSize = 0;
var7.stackSize = var8; var7.stackSize = var8;
var6.onSlotChanged(); var6.onSlotChanged();
} else if(var7.stackSize < var1.getMaxStackSize()) { } else if (var7.stackSize < var1.getMaxStackSize()) {
var1.stackSize -= var1.getMaxStackSize() - var7.stackSize; var1.stackSize -= var1.getMaxStackSize() - var7.stackSize;
var7.stackSize = var1.getMaxStackSize(); var7.stackSize = var1.getMaxStackSize();
var6.onSlotChanged(); var6.onSlotChanged();
} }
} }
if(var4) { if (var4) {
--var5; --var5;
} else { } else {
++var5; ++var5;
@ -249,24 +250,24 @@ public abstract class Container {
} }
} }
if(var1.stackSize > 0) { if (var1.stackSize > 0) {
if(var4) { if (var4) {
var5 = var3 - 1; var5 = var3 - 1;
} else { } else {
var5 = var2; var5 = var2;
} }
while(!var4 && var5 < var3 || var4 && var5 >= var2) { while (!var4 && var5 < var3 || var4 && var5 >= var2) {
var6 = (Slot)this.inventorySlots.get(var5); var6 = (Slot) this.inventorySlots.get(var5);
var7 = var6.getStack(); var7 = var6.getStack();
if(var7 == null) { if (var7 == null) {
var6.putStack(var1.copy()); var6.putStack(var1.copy());
var6.onSlotChanged(); var6.onSlotChanged();
var1.stackSize = 0; var1.stackSize = 0;
break; break;
} }
if(var4) { if (var4) {
--var5; --var5;
} else { } else {
++var5; ++var5;

20
src/net/minecraft/container/ContainerChest.java
View file

@ -16,19 +16,19 @@ public class ContainerChest extends Container {
int var4; int var4;
int var5; int var5;
for(var4 = 0; var4 < this.field_27088_b; ++var4) { for (var4 = 0; var4 < this.field_27088_b; ++var4) {
for(var5 = 0; var5 < 9; ++var5) { for (var5 = 0; var5 < 9; ++var5) {
this.addSlot(new Slot(var2, var5 + var4 * 9, 8 + var5 * 18, 18 + var4 * 18)); this.addSlot(new Slot(var2, var5 + var4 * 9, 8 + var5 * 18, 18 + var4 * 18));
} }
} }
for(var4 = 0; var4 < 3; ++var4) { for (var4 = 0; var4 < 3; ++var4) {
for(var5 = 0; var5 < 9; ++var5) { for (var5 = 0; var5 < 9; ++var5) {
this.addSlot(new Slot(var1, var5 + var4 * 9 + 9, 8 + var5 * 18, 103 + var4 * 18 + var3)); this.addSlot(new Slot(var1, var5 + var4 * 9 + 9, 8 + var5 * 18, 103 + var4 * 18 + var3));
} }
} }
for(var4 = 0; var4 < 9; ++var4) { for (var4 = 0; var4 < 9; ++var4) {
this.addSlot(new Slot(var1, var4, 8 + var4 * 18, 161 + var3)); this.addSlot(new Slot(var1, var4, 8 + var4 * 18, 161 + var3));
} }
@ -40,18 +40,18 @@ public class ContainerChest extends Container {
public ItemStack func_27086_a(int var1) { public ItemStack func_27086_a(int var1) {
ItemStack var2 = null; ItemStack var2 = null;
Slot var3 = (Slot)this.inventorySlots.get(var1); Slot var3 = (Slot) this.inventorySlots.get(var1);
if(var3 != null && var3.func_27006_b()) { if (var3 != null && var3.func_27006_b()) {
ItemStack var4 = var3.getStack(); ItemStack var4 = var3.getStack();
var2 = var4.copy(); var2 = var4.copy();
if(var1 < this.field_27088_b * 9) { if (var1 < this.field_27088_b * 9) {
this.func_28126_a(var4, this.field_27088_b * 9, this.inventorySlots.size(), true); this.func_28126_a(var4, this.field_27088_b * 9, this.inventorySlots.size(), true);
} else { } else {
this.func_28126_a(var4, 0, this.field_27088_b * 9, false); this.func_28126_a(var4, 0, this.field_27088_b * 9, false);
} }
if(var4.stackSize == 0) { if (var4.stackSize == 0) {
var3.putStack((ItemStack)null); var3.putStack((ItemStack) null);
} else { } else {
var3.onSlotChanged(); var3.onSlotChanged();
} }

10
src/net/minecraft/container/ContainerDispenser.java
View file

@ -13,19 +13,19 @@ public class ContainerDispenser extends Container {
int var3; int var3;
int var4; int var4;
for(var3 = 0; var3 < 3; ++var3) { for (var3 = 0; var3 < 3; ++var3) {
for(var4 = 0; var4 < 3; ++var4) { for (var4 = 0; var4 < 3; ++var4) {
this.addSlot(new Slot(var2, var4 + var3 * 3, 62 + var4 * 18, 17 + var3 * 18)); this.addSlot(new Slot(var2, var4 + var3 * 3, 62 + var4 * 18, 17 + var3 * 18));
} }
} }
for(var3 = 0; var3 < 3; ++var3) { for (var3 = 0; var3 < 3; ++var3) {
for(var4 = 0; var4 < 9; ++var4) { for (var4 = 0; var4 < 9; ++var4) {
this.addSlot(new Slot(var1, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18)); this.addSlot(new Slot(var1, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18));
} }
} }
for(var3 = 0; var3 < 9; ++var3) { for (var3 = 0; var3 < 9; ++var3) {
this.addSlot(new Slot(var1, var3, 8 + var3 * 18, 142)); this.addSlot(new Slot(var1, var3, 8 + var3 * 18, 142));
} }

32
src/net/minecraft/container/ContainerFurnace.java
View file

@ -21,13 +21,13 @@ public class ContainerFurnace extends Container {
this.addSlot(new SlotFurnace(var1.player, var2, 2, 116, 35)); this.addSlot(new SlotFurnace(var1.player, var2, 2, 116, 35));
int var3; int var3;
for(var3 = 0; var3 < 3; ++var3) { for (var3 = 0; var3 < 3; ++var3) {
for(int var4 = 0; var4 < 9; ++var4) { for (int var4 = 0; var4 < 9; ++var4) {
this.addSlot(new Slot(var1, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18)); this.addSlot(new Slot(var1, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18));
} }
} }
for(var3 = 0; var3 < 9; ++var3) { for (var3 = 0; var3 < 9; ++var3) {
this.addSlot(new Slot(var1, var3, 8 + var3 * 18, 142)); this.addSlot(new Slot(var1, var3, 8 + var3 * 18, 142));
} }
@ -43,17 +43,17 @@ public class ContainerFurnace extends Container {
public void updateCraftingMatrix() { public void updateCraftingMatrix() {
super.updateCraftingMatrix(); super.updateCraftingMatrix();
for(int var1 = 0; var1 < this.crafters.size(); ++var1) { for (int var1 = 0; var1 < this.crafters.size(); ++var1) {
ICrafting var2 = (ICrafting)this.crafters.get(var1); ICrafting var2 = (ICrafting) this.crafters.get(var1);
if(this.lastCookTime != this.furnace.furnaceCookTime) { if (this.lastCookTime != this.furnace.furnaceCookTime) {
var2.updateCraftingInventoryInfo(this, 0, this.furnace.furnaceCookTime); var2.updateCraftingInventoryInfo(this, 0, this.furnace.furnaceCookTime);
} }
if(this.lastBurnTime != this.furnace.furnaceBurnTime) { if (this.lastBurnTime != this.furnace.furnaceBurnTime) {
var2.updateCraftingInventoryInfo(this, 1, this.furnace.furnaceBurnTime); var2.updateCraftingInventoryInfo(this, 1, this.furnace.furnaceBurnTime);
} }
if(this.lastItemBurnTime != this.furnace.currentItemBurnTime) { if (this.lastItemBurnTime != this.furnace.currentItemBurnTime) {
var2.updateCraftingInventoryInfo(this, 2, this.furnace.currentItemBurnTime); var2.updateCraftingInventoryInfo(this, 2, this.furnace.currentItemBurnTime);
} }
} }
@ -69,27 +69,27 @@ public class ContainerFurnace extends Container {
public ItemStack func_27086_a(int var1) { public ItemStack func_27086_a(int var1) {
ItemStack var2 = null; ItemStack var2 = null;
Slot var3 = (Slot)this.inventorySlots.get(var1); Slot var3 = (Slot) this.inventorySlots.get(var1);
if(var3 != null && var3.func_27006_b()) { if (var3 != null && var3.func_27006_b()) {
ItemStack var4 = var3.getStack(); ItemStack var4 = var3.getStack();
var2 = var4.copy(); var2 = var4.copy();
if(var1 == 2) { if (var1 == 2) {
this.func_28126_a(var4, 3, 39, true); this.func_28126_a(var4, 3, 39, true);
} else if(var1 >= 3 && var1 < 30) { } else if (var1 >= 3 && var1 < 30) {
this.func_28126_a(var4, 30, 39, false); this.func_28126_a(var4, 30, 39, false);
} else if(var1 >= 30 && var1 < 39) { } else if (var1 >= 30 && var1 < 39) {
this.func_28126_a(var4, 3, 30, false); this.func_28126_a(var4, 3, 30, false);
} else { } else {
this.func_28126_a(var4, 3, 39, false); this.func_28126_a(var4, 3, 39, false);
} }
if(var4.stackSize == 0) { if (var4.stackSize == 0) {
var3.putStack((ItemStack)null); var3.putStack((ItemStack) null);
} else { } else {
var3.onSlotChanged(); var3.onSlotChanged();
} }
if(var4.stackSize == var2.stackSize) { if (var4.stackSize == var2.stackSize) {
return null; return null;
} }

34
src/net/minecraft/container/ContainerPlayer.java
View file

@ -29,23 +29,23 @@ public class ContainerPlayer extends Container {
int var3; int var3;
int var4; int var4;
for(var3 = 0; var3 < 2; ++var3) { for (var3 = 0; var3 < 2; ++var3) {
for(var4 = 0; var4 < 2; ++var4) { for (var4 = 0; var4 < 2; ++var4) {
this.addSlot(new Slot(this.craftMatrix, var4 + var3 * 2, 88 + var4 * 18, 26 + var3 * 18)); this.addSlot(new Slot(this.craftMatrix, var4 + var3 * 2, 88 + var4 * 18, 26 + var3 * 18));
} }
} }
for(var3 = 0; var3 < 4; ++var3) { for (var3 = 0; var3 < 4; ++var3) {
this.addSlot(new SlotArmor(this, var1, var1.getSizeInventory() - 1 - var3, 8, 8 + var3 * 18, var3)); this.addSlot(new SlotArmor(this, var1, var1.getSizeInventory() - 1 - var3, 8, 8 + var3 * 18, var3));
} }
for(var3 = 0; var3 < 3; ++var3) { for (var3 = 0; var3 < 3; ++var3) {
for(var4 = 0; var4 < 9; ++var4) { for (var4 = 0; var4 < 9; ++var4) {
this.addSlot(new Slot(var1, var4 + (var3 + 1) * 9, 8 + var4 * 18, 84 + var3 * 18)); this.addSlot(new Slot(var1, var4 + (var3 + 1) * 9, 8 + var4 * 18, 84 + var3 * 18));
} }
} }
for(var3 = 0; var3 < 9; ++var3) { for (var3 = 0; var3 < 9; ++var3) {
this.addSlot(new Slot(var1, var3, 8 + var3 * 18, 142)); this.addSlot(new Slot(var1, var3, 8 + var3 * 18, 142));
} }
@ -59,11 +59,11 @@ public class ContainerPlayer extends Container {
public void onCraftGuiClosed(EntityPlayer var1) { public void onCraftGuiClosed(EntityPlayer var1) {
super.onCraftGuiClosed(var1); super.onCraftGuiClosed(var1);
for(int var2 = 0; var2 < 4; ++var2) { for (int var2 = 0; var2 < 4; ++var2) {
ItemStack var3 = this.craftMatrix.getStackInSlot(var2); ItemStack var3 = this.craftMatrix.getStackInSlot(var2);
if(var3 != null) { if (var3 != null) {
var1.dropPlayerItem(var3); var1.dropPlayerItem(var3);
this.craftMatrix.setInventorySlotContents(var2, (ItemStack)null); this.craftMatrix.setInventorySlotContents(var2, (ItemStack) null);
} }
} }
@ -75,27 +75,27 @@ public class ContainerPlayer extends Container {
public ItemStack func_27086_a(int var1) { public ItemStack func_27086_a(int var1) {
ItemStack var2 = null; ItemStack var2 = null;
Slot var3 = (Slot)this.inventorySlots.get(var1); Slot var3 = (Slot) this.inventorySlots.get(var1);
if(var3 != null && var3.func_27006_b()) { if (var3 != null && var3.func_27006_b()) {
ItemStack var4 = var3.getStack(); ItemStack var4 = var3.getStack();
var2 = var4.copy(); var2 = var4.copy();
if(var1 == 0) { if (var1 == 0) {
this.func_28126_a(var4, 9, 45, true); this.func_28126_a(var4, 9, 45, true);
} else if(var1 >= 9 && var1 < 36) { } else if (var1 >= 9 && var1 < 36) {
this.func_28126_a(var4, 36, 45, false); this.func_28126_a(var4, 36, 45, false);
} else if(var1 >= 36 && var1 < 45) { } else if (var1 >= 36 && var1 < 45) {
this.func_28126_a(var4, 9, 36, false); this.func_28126_a(var4, 9, 36, false);
} else { } else {
this.func_28126_a(var4, 9, 45, false); this.func_28126_a(var4, 9, 45, false);
} }
if(var4.stackSize == 0) { if (var4.stackSize == 0) {
var3.putStack((ItemStack)null); var3.putStack((ItemStack) null);
} else { } else {
var3.onSlotChanged(); var3.onSlotChanged();
} }
if(var4.stackSize == var2.stackSize) { if (var4.stackSize == var2.stackSize) {
return null; return null;
} }

34
src/net/minecraft/container/ContainerWorkbench.java
View file

@ -29,19 +29,19 @@ public class ContainerWorkbench extends Container {
int var6; int var6;
int var7; int var7;
for(var6 = 0; var6 < 3; ++var6) { for (var6 = 0; var6 < 3; ++var6) {
for(var7 = 0; var7 < 3; ++var7) { for (var7 = 0; var7 < 3; ++var7) {
this.addSlot(new Slot(this.craftMatrix, var7 + var6 * 3, 30 + var7 * 18, 17 + var6 * 18)); this.addSlot(new Slot(this.craftMatrix, var7 + var6 * 3, 30 + var7 * 18, 17 + var6 * 18));
} }
} }
for(var6 = 0; var6 < 3; ++var6) { for (var6 = 0; var6 < 3; ++var6) {
for(var7 = 0; var7 < 9; ++var7) { for (var7 = 0; var7 < 9; ++var7) {
this.addSlot(new Slot(var1, var7 + var6 * 9 + 9, 8 + var7 * 18, 84 + var6 * 18)); this.addSlot(new Slot(var1, var7 + var6 * 9 + 9, 8 + var7 * 18, 84 + var6 * 18));
} }
} }
for(var6 = 0; var6 < 9; ++var6) { for (var6 = 0; var6 < 9; ++var6) {
this.addSlot(new Slot(var1, var6, 8 + var6 * 18, 142)); this.addSlot(new Slot(var1, var6, 8 + var6 * 18, 142));
} }
@ -54,10 +54,10 @@ public class ContainerWorkbench extends Container {
public void onCraftGuiClosed(EntityPlayer var1) { public void onCraftGuiClosed(EntityPlayer var1) {
super.onCraftGuiClosed(var1); super.onCraftGuiClosed(var1);
if(!this.field_20150_c.singleplayerWorld) { if (!this.field_20150_c.singleplayerWorld) {
for(int var2 = 0; var2 < 9; ++var2) { for (int var2 = 0; var2 < 9; ++var2) {
ItemStack var3 = this.craftMatrix.getStackInSlot(var2); ItemStack var3 = this.craftMatrix.getStackInSlot(var2);
if(var3 != null) { if (var3 != null) {
var1.dropPlayerItem(var3); var1.dropPlayerItem(var3);
} }
} }
@ -66,32 +66,32 @@ public class ContainerWorkbench extends Container {
} }
public boolean canInteractWith(EntityPlayer var1) { public boolean canInteractWith(EntityPlayer var1) {
return this.field_20150_c.getBlockId(this.field_20149_h, this.field_20148_i, this.field_20147_j) != Block.workbench.blockID ? false : var1.getDistanceSq((double)this.field_20149_h + 0.5D, (double)this.field_20148_i + 0.5D, (double)this.field_20147_j + 0.5D) <= 64.0D; return this.field_20150_c.getBlockId(this.field_20149_h, this.field_20148_i, this.field_20147_j) != Block.workbench.blockID ? false : var1.getDistanceSq((double) this.field_20149_h + 0.5D, (double) this.field_20148_i + 0.5D, (double) this.field_20147_j + 0.5D) <= 64.0D;
} }
public ItemStack func_27086_a(int var1) { public ItemStack func_27086_a(int var1) {
ItemStack var2 = null; ItemStack var2 = null;
Slot var3 = (Slot)this.inventorySlots.get(var1); Slot var3 = (Slot) this.inventorySlots.get(var1);
if(var3 != null && var3.func_27006_b()) { if (var3 != null && var3.func_27006_b()) {
ItemStack var4 = var3.getStack(); ItemStack var4 = var3.getStack();
var2 = var4.copy(); var2 = var4.copy();
if(var1 == 0) { if (var1 == 0) {
this.func_28126_a(var4, 10, 46, true); this.func_28126_a(var4, 10, 46, true);
} else if(var1 >= 10 && var1 < 37) { } else if (var1 >= 10 && var1 < 37) {
this.func_28126_a(var4, 37, 46, false); this.func_28126_a(var4, 37, 46, false);
} else if(var1 >= 37 && var1 < 46) { } else if (var1 >= 37 && var1 < 46) {
this.func_28126_a(var4, 10, 37, false); this.func_28126_a(var4, 10, 37, false);
} else { } else {
this.func_28126_a(var4, 10, 46, false); this.func_28126_a(var4, 10, 46, false);
} }
if(var4.stackSize == 0) { if (var4.stackSize == 0) {
var3.putStack((ItemStack)null); var3.putStack((ItemStack) null);
} else { } else {
var3.onSlotChanged(); var3.onSlotChanged();
} }
if(var4.stackSize == var2.stackSize) { if (var4.stackSize == var2.stackSize) {
return null; return null;
} }

2
src/net/minecraft/container/inventory/InventoryCraftResult.java
View file

@ -19,7 +19,7 @@ public class InventoryCraftResult implements IInventory {
} }
public ItemStack decrStackSize(int var1, int var2) { public ItemStack decrStackSize(int var1, int var2) {
if(this.stackResult[var1] != null) { if (this.stackResult[var1] != null) {
ItemStack var3 = this.stackResult[var1]; ItemStack var3 = this.stackResult[var1];
this.stackResult[var1] = null; this.stackResult[var1] = null;
return var3; return var3;

8
src/net/minecraft/container/inventory/InventoryCrafting.java
View file

@ -25,7 +25,7 @@ public class InventoryCrafting implements IInventory {
} }
public ItemStack func_21084_a(int var1, int var2) { public ItemStack func_21084_a(int var1, int var2) {
if(var1 >= 0 && var1 < this.field_21085_b) { if (var1 >= 0 && var1 < this.field_21085_b) {
int var3 = var1 + var2 * this.field_21085_b; int var3 = var1 + var2 * this.field_21085_b;
return this.getStackInSlot(var3); return this.getStackInSlot(var3);
} else { } else {
@ -38,16 +38,16 @@ public class InventoryCrafting implements IInventory {
} }
public ItemStack decrStackSize(int var1, int var2) { public ItemStack decrStackSize(int var1, int var2) {
if(this.stackList[var1] != null) { if (this.stackList[var1] != null) {
ItemStack var3; ItemStack var3;
if(this.stackList[var1].stackSize <= var2) { if (this.stackList[var1].stackSize <= var2) {
var3 = this.stackList[var1]; var3 = this.stackList[var1];
this.stackList[var1] = null; this.stackList[var1] = null;
this.eventHandler.onCraftMatrixChanged(this); this.eventHandler.onCraftMatrixChanged(this);
return var3; return var3;
} else { } else {
var3 = this.stackList[var1].splitStack(var2); var3 = this.stackList[var1].splitStack(var2);
if(this.stackList[var1].stackSize == 0) { if (this.stackList[var1].stackSize == 0) {
this.stackList[var1] = null; this.stackList[var1] = null;
} }

2
src/net/minecraft/container/inventory/InventoryLargeChest.java
View file

@ -31,7 +31,7 @@ public class InventoryLargeChest implements IInventory {
} }
public void setInventorySlotContents(int var1, ItemStack var2) { public void setInventorySlotContents(int var1, ItemStack var2) {
if(var1 >= this.upperChest.getSizeInventory()) { if (var1 >= this.upperChest.getSizeInventory()) {
this.lowerChest.setInventorySlotContents(var1 - this.upperChest.getSizeInventory(), var2); this.lowerChest.setInventorySlotContents(var1 - this.upperChest.getSizeInventory(), var2);
} else { } else {
this.upperChest.setInventorySlotContents(var1, var2); this.upperChest.setInventorySlotContents(var1, var2);

106
src/net/minecraft/container/inventory/InventoryPlayer.java
View file

@ -29,8 +29,8 @@ public class InventoryPlayer implements IInventory {
} }
private int getInventorySlotContainItem(int var1) { private int getInventorySlotContainItem(int var1) {
for(int var2 = 0; var2 < this.mainInventory.length; ++var2) { for (int var2 = 0; var2 < this.mainInventory.length; ++var2) {
if(this.mainInventory[var2] != null && this.mainInventory[var2].itemID == var1) { if (this.mainInventory[var2] != null && this.mainInventory[var2].itemID == var1) {
return var2; return var2;
} }
} }
@ -39,8 +39,8 @@ public class InventoryPlayer implements IInventory {
} }
private int func_21082_c(ItemStack var1) { private int func_21082_c(ItemStack var1) {
for(int var2 = 0; var2 < this.mainInventory.length; ++var2) { for (int var2 = 0; var2 < this.mainInventory.length; ++var2) {
if(this.mainInventory[var2] != null && this.mainInventory[var2].itemID == var1.itemID && this.mainInventory[var2].func_21132_c() && this.mainInventory[var2].stackSize < this.mainInventory[var2].getMaxStackSize() && this.mainInventory[var2].stackSize < this.getInventoryStackLimit() && (!this.mainInventory[var2].getHasSubtypes() || this.mainInventory[var2].getItemDamage() == var1.getItemDamage())) { if (this.mainInventory[var2] != null && this.mainInventory[var2].itemID == var1.itemID && this.mainInventory[var2].func_21132_c() && this.mainInventory[var2].stackSize < this.mainInventory[var2].getMaxStackSize() && this.mainInventory[var2].stackSize < this.getInventoryStackLimit() && (!this.mainInventory[var2].getHasSubtypes() || this.mainInventory[var2].getItemDamage() == var1.getItemDamage())) {
return var2; return var2;
} }
} }
@ -49,8 +49,8 @@ public class InventoryPlayer implements IInventory {
} }
private int getFirstEmptyStack() { private int getFirstEmptyStack() {
for(int var1 = 0; var1 < this.mainInventory.length; ++var1) { for (int var1 = 0; var1 < this.mainInventory.length; ++var1) {
if(this.mainInventory[var1] == null) { if (this.mainInventory[var1] == null) {
return var1; return var1;
} }
} }
@ -62,27 +62,27 @@ public class InventoryPlayer implements IInventory {
int var2 = var1.itemID; int var2 = var1.itemID;
int var3 = var1.stackSize; int var3 = var1.stackSize;
int var4 = this.func_21082_c(var1); int var4 = this.func_21082_c(var1);
if(var4 < 0) { if (var4 < 0) {
var4 = this.getFirstEmptyStack(); var4 = this.getFirstEmptyStack();
} }
if(var4 < 0) { if (var4 < 0) {
return var3; return var3;
} else { } else {
if(this.mainInventory[var4] == null) { if (this.mainInventory[var4] == null) {
this.mainInventory[var4] = new ItemStack(var2, 0, var1.getItemDamage()); this.mainInventory[var4] = new ItemStack(var2, 0, var1.getItemDamage());
} }
int var5 = var3; int var5 = var3;
if(var3 > this.mainInventory[var4].getMaxStackSize() - this.mainInventory[var4].stackSize) { if (var3 > this.mainInventory[var4].getMaxStackSize() - this.mainInventory[var4].stackSize) {
var5 = this.mainInventory[var4].getMaxStackSize() - this.mainInventory[var4].stackSize; var5 = this.mainInventory[var4].getMaxStackSize() - this.mainInventory[var4].stackSize;
} }
if(var5 > this.getInventoryStackLimit() - this.mainInventory[var4].stackSize) { if (var5 > this.getInventoryStackLimit() - this.mainInventory[var4].stackSize) {
var5 = this.getInventoryStackLimit() - this.mainInventory[var4].stackSize; var5 = this.getInventoryStackLimit() - this.mainInventory[var4].stackSize;
} }
if(var5 == 0) { if (var5 == 0) {
return var3; return var3;
} else { } else {
var3 -= var5; var3 -= var5;
@ -94,8 +94,8 @@ public class InventoryPlayer implements IInventory {
} }
public void decrementAnimations() { public void decrementAnimations() {
for(int var1 = 0; var1 < this.mainInventory.length; ++var1) { for (int var1 = 0; var1 < this.mainInventory.length; ++var1) {
if(this.mainInventory[var1] != null) { if (this.mainInventory[var1] != null) {
this.mainInventory[var1].func_28143_a(this.player.worldObj, this.player, var1, this.currentItem == var1); this.mainInventory[var1].func_28143_a(this.player.worldObj, this.player, var1, this.currentItem == var1);
} }
} }
@ -104,10 +104,10 @@ public class InventoryPlayer implements IInventory {
public boolean consumeInventoryItem(int var1) { public boolean consumeInventoryItem(int var1) {
int var2 = this.getInventorySlotContainItem(var1); int var2 = this.getInventorySlotContainItem(var1);
if(var2 < 0) { if (var2 < 0) {
return false; return false;
} else { } else {
if(--this.mainInventory[var2].stackSize <= 0) { if (--this.mainInventory[var2].stackSize <= 0) {
this.mainInventory[var2] = null; this.mainInventory[var2] = null;
} }
@ -117,9 +117,9 @@ public class InventoryPlayer implements IInventory {
public boolean addItemStackToInventory(ItemStack var1) { public boolean addItemStackToInventory(ItemStack var1) {
int var2; int var2;
if(var1.isItemDamaged()) { if (var1.isItemDamaged()) {
var2 = this.getFirstEmptyStack(); var2 = this.getFirstEmptyStack();
if(var2 >= 0) { if (var2 >= 0) {
this.mainInventory[var2] = ItemStack.func_20117_a(var1); this.mainInventory[var2] = ItemStack.func_20117_a(var1);
this.mainInventory[var2].animationsToGo = 5; this.mainInventory[var2].animationsToGo = 5;
var1.stackSize = 0; var1.stackSize = 0;
@ -131,7 +131,7 @@ public class InventoryPlayer implements IInventory {
do { do {
var2 = var1.stackSize; var2 = var1.stackSize;
var1.stackSize = this.func_21083_d(var1); var1.stackSize = this.func_21083_d(var1);
} while(var1.stackSize > 0 && var1.stackSize < var2); } while (var1.stackSize > 0 && var1.stackSize < var2);
return var1.stackSize < var2; return var1.stackSize < var2;
} }
@ -139,20 +139,20 @@ public class InventoryPlayer implements IInventory {
public ItemStack decrStackSize(int var1, int var2) { public ItemStack decrStackSize(int var1, int var2) {
ItemStack[] var3 = this.mainInventory; ItemStack[] var3 = this.mainInventory;
if(var1 >= this.mainInventory.length) { if (var1 >= this.mainInventory.length) {
var3 = this.armorInventory; var3 = this.armorInventory;
var1 -= this.mainInventory.length; var1 -= this.mainInventory.length;
} }
if(var3[var1] != null) { if (var3[var1] != null) {
ItemStack var4; ItemStack var4;
if(var3[var1].stackSize <= var2) { if (var3[var1].stackSize <= var2) {
var4 = var3[var1]; var4 = var3[var1];
var3[var1] = null; var3[var1] = null;
return var4; return var4;
} else { } else {
var4 = var3[var1].splitStack(var2); var4 = var3[var1].splitStack(var2);
if(var3[var1].stackSize == 0) { if (var3[var1].stackSize == 0) {
var3[var1] = null; var3[var1] = null;
} }
@ -165,7 +165,7 @@ public class InventoryPlayer implements IInventory {
public void setInventorySlotContents(int var1, ItemStack var2) { public void setInventorySlotContents(int var1, ItemStack var2) {
ItemStack[] var3 = this.mainInventory; ItemStack[] var3 = this.mainInventory;
if(var1 >= var3.length) { if (var1 >= var3.length) {
var1 -= var3.length; var1 -= var3.length;
var3 = this.armorInventory; var3 = this.armorInventory;
} }
@ -175,7 +175,7 @@ public class InventoryPlayer implements IInventory {
public float getStrVsBlock(Block var1) { public float getStrVsBlock(Block var1) {
float var2 = 1.0F; float var2 = 1.0F;
if(this.mainInventory[this.currentItem] != null) { if (this.mainInventory[this.currentItem] != null) {
var2 *= this.mainInventory[this.currentItem].getStrVsBlock(var1); var2 *= this.mainInventory[this.currentItem].getStrVsBlock(var1);
} }
@ -185,19 +185,19 @@ public class InventoryPlayer implements IInventory {
public NBTTagList writeToNBT(NBTTagList var1) { public NBTTagList writeToNBT(NBTTagList var1) {
int var2; int var2;
NBTTagCompound var3; NBTTagCompound var3;
for(var2 = 0; var2 < this.mainInventory.length; ++var2) { for (var2 = 0; var2 < this.mainInventory.length; ++var2) {
if(this.mainInventory[var2] != null) { if (this.mainInventory[var2] != null) {
var3 = new NBTTagCompound(); var3 = new NBTTagCompound();
var3.setByte("Slot", (byte)var2); var3.setByte("Slot", (byte) var2);
this.mainInventory[var2].writeToNBT(var3); this.mainInventory[var2].writeToNBT(var3);
var1.setTag(var3); var1.setTag(var3);
} }
} }
for(var2 = 0; var2 < this.armorInventory.length; ++var2) { for (var2 = 0; var2 < this.armorInventory.length; ++var2) {
if(this.armorInventory[var2] != null) { if (this.armorInventory[var2] != null) {
var3 = new NBTTagCompound(); var3 = new NBTTagCompound();
var3.setByte("Slot", (byte)(var2 + 100)); var3.setByte("Slot", (byte) (var2 + 100));
this.armorInventory[var2].writeToNBT(var3); this.armorInventory[var2].writeToNBT(var3);
var1.setTag(var3); var1.setTag(var3);
} }
@ -210,16 +210,16 @@ public class InventoryPlayer implements IInventory {
this.mainInventory = new ItemStack[36]; this.mainInventory = new ItemStack[36];
this.armorInventory = new ItemStack[4]; this.armorInventory = new ItemStack[4];
for(int var2 = 0; var2 < var1.tagCount(); ++var2) { for (int var2 = 0; var2 < var1.tagCount(); ++var2) {
NBTTagCompound var3 = (NBTTagCompound)var1.tagAt(var2); NBTTagCompound var3 = (NBTTagCompound) var1.tagAt(var2);
int var4 = var3.getByte("Slot") & 255; int var4 = var3.getByte("Slot") & 255;
ItemStack var5 = new ItemStack(var3); ItemStack var5 = new ItemStack(var3);
if(var5.getItem() != null) { if (var5.getItem() != null) {
if(var4 >= 0 && var4 < this.mainInventory.length) { if (var4 >= 0 && var4 < this.mainInventory.length) {
this.mainInventory[var4] = var5; this.mainInventory[var4] = var5;
} }
if(var4 >= 100 && var4 < this.armorInventory.length + 100) { if (var4 >= 100 && var4 < this.armorInventory.length + 100) {
this.armorInventory[var4 - 100] = var5; this.armorInventory[var4 - 100] = var5;
} }
} }
@ -233,7 +233,7 @@ public class InventoryPlayer implements IInventory {
public ItemStack getStackInSlot(int var1) { public ItemStack getStackInSlot(int var1) {
ItemStack[] var2 = this.mainInventory; ItemStack[] var2 = this.mainInventory;
if(var1 >= var2.length) { if (var1 >= var2.length) {
var1 -= var2.length; var1 -= var2.length;
var2 = this.armorInventory; var2 = this.armorInventory;
} }
@ -255,7 +255,7 @@ public class InventoryPlayer implements IInventory {
} }
public boolean canHarvestBlock(Block var1) { public boolean canHarvestBlock(Block var1) {
if(var1.blockMaterial.func_31055_i()) { if (var1.blockMaterial.func_31055_i()) {
return true; return true;
} else { } else {
ItemStack var2 = this.getStackInSlot(this.currentItem); ItemStack var2 = this.getStackInSlot(this.currentItem);
@ -268,19 +268,19 @@ public class InventoryPlayer implements IInventory {
int var2 = 0; int var2 = 0;
int var3 = 0; int var3 = 0;
for(int var4 = 0; var4 < this.armorInventory.length; ++var4) { for (int var4 = 0; var4 < this.armorInventory.length; ++var4) {
if(this.armorInventory[var4] != null && this.armorInventory[var4].getItem() instanceof ItemArmor) { if (this.armorInventory[var4] != null && this.armorInventory[var4].getItem() instanceof ItemArmor) {
int var5 = this.armorInventory[var4].getMaxDamage(); int var5 = this.armorInventory[var4].getMaxDamage();
int var6 = this.armorInventory[var4].getItemDamageForDisplay(); int var6 = this.armorInventory[var4].getItemDamageForDisplay();
int var7 = var5 - var6; int var7 = var5 - var6;
var2 += var7; var2 += var7;
var3 += var5; var3 += var5;
int var8 = ((ItemArmor)this.armorInventory[var4].getItem()).damageReduceAmount; int var8 = ((ItemArmor) this.armorInventory[var4].getItem()).damageReduceAmount;
var1 += var8; var1 += var8;
} }
} }
if(var3 == 0) { if (var3 == 0) {
return 0; return 0;
} else { } else {
return (var1 - 1) * var2 / var3 + 1; return (var1 - 1) * var2 / var3 + 1;
@ -288,10 +288,10 @@ public class InventoryPlayer implements IInventory {
} }
public void damageArmor(int var1) { public void damageArmor(int var1) {
for(int var2 = 0; var2 < this.armorInventory.length; ++var2) { for (int var2 = 0; var2 < this.armorInventory.length; ++var2) {
if(this.armorInventory[var2] != null && this.armorInventory[var2].getItem() instanceof ItemArmor) { if (this.armorInventory[var2] != null && this.armorInventory[var2].getItem() instanceof ItemArmor) {
this.armorInventory[var2].damageItem(var1, this.player); this.armorInventory[var2].damageItem(var1, this.player);
if(this.armorInventory[var2].stackSize == 0) { if (this.armorInventory[var2].stackSize == 0) {
this.armorInventory[var2].func_577_a(this.player); this.armorInventory[var2].func_577_a(this.player);
this.armorInventory[var2] = null; this.armorInventory[var2] = null;
} }
@ -302,15 +302,15 @@ public class InventoryPlayer implements IInventory {
public void dropAllItems() { public void dropAllItems() {
int var1; int var1;
for(var1 = 0; var1 < this.mainInventory.length; ++var1) { for (var1 = 0; var1 < this.mainInventory.length; ++var1) {
if(this.mainInventory[var1] != null) { if (this.mainInventory[var1] != null) {
this.player.dropPlayerItemWithRandomChoice(this.mainInventory[var1], true); this.player.dropPlayerItemWithRandomChoice(this.mainInventory[var1], true);
this.mainInventory[var1] = null; this.mainInventory[var1] = null;
} }
} }
for(var1 = 0; var1 < this.armorInventory.length; ++var1) { for (var1 = 0; var1 < this.armorInventory.length; ++var1) {
if(this.armorInventory[var1] != null) { if (this.armorInventory[var1] != null) {
this.player.dropPlayerItemWithRandomChoice(this.armorInventory[var1], true); this.player.dropPlayerItemWithRandomChoice(this.armorInventory[var1], true);
this.armorInventory[var1] = null; this.armorInventory[var1] = null;
} }
@ -337,14 +337,14 @@ public class InventoryPlayer implements IInventory {
public boolean func_28010_c(ItemStack var1) { public boolean func_28010_c(ItemStack var1) {
int var2; int var2;
for(var2 = 0; var2 < this.armorInventory.length; ++var2) { for (var2 = 0; var2 < this.armorInventory.length; ++var2) {
if(this.armorInventory[var2] != null && this.armorInventory[var2].func_28144_c(var1)) { if (this.armorInventory[var2] != null && this.armorInventory[var2].func_28144_c(var1)) {
return true; return true;
} }
} }
for(var2 = 0; var2 < this.mainInventory.length; ++var2) { for (var2 = 0; var2 < this.mainInventory.length; ++var2) {
if(this.mainInventory[var2] != null && this.mainInventory[var2].func_28144_c(var1)) { if (this.mainInventory[var2] != null && this.mainInventory[var2].func_28144_c(var1)) {
return true; return true;
} }
} }

2
src/net/minecraft/container/slot/SlotArmor.java
View file

@ -21,6 +21,6 @@ public class SlotArmor extends Slot {
} }
public boolean isItemValid(ItemStack var1) { public boolean isItemValid(ItemStack var1) {
return var1.getItem() instanceof ItemArmor ? ((ItemArmor)var1.getItem()).armorType == this.field_20102_a : (var1.getItem().shiftedIndex == Block.pumpkin.blockID ? this.field_20102_a == 0 : false); return var1.getItem() instanceof ItemArmor ? ((ItemArmor) var1.getItem()).armorType == this.field_20102_a : (var1.getItem().shiftedIndex == Block.pumpkin.blockID ? this.field_20102_a == 0 : false);
} }
} }

22
src/net/minecraft/container/slot/SlotCrafting.java
View file

@ -23,29 +23,29 @@ public class SlotCrafting extends Slot {
public void onPickupFromSlot(ItemStack var1) { public void onPickupFromSlot(ItemStack var1) {
var1.func_28142_b(this.field_25004_e.worldObj, this.field_25004_e); var1.func_28142_b(this.field_25004_e.worldObj, this.field_25004_e);
if(var1.itemID == Block.workbench.blockID) { if (var1.itemID == Block.workbench.blockID) {
this.field_25004_e.addStat(AchievementList.field_25130_d, 1); this.field_25004_e.addStat(AchievementList.field_25130_d, 1);
} else if(var1.itemID == Item.pickaxeWood.shiftedIndex) { } else if (var1.itemID == Item.pickaxeWood.shiftedIndex) {
this.field_25004_e.addStat(AchievementList.field_27110_i, 1); this.field_25004_e.addStat(AchievementList.field_27110_i, 1);
} else if(var1.itemID == Block.stoneOvenIdle.blockID) { } else if (var1.itemID == Block.stoneOvenIdle.blockID) {
this.field_25004_e.addStat(AchievementList.field_27109_j, 1); this.field_25004_e.addStat(AchievementList.field_27109_j, 1);
} else if(var1.itemID == Item.hoeWood.shiftedIndex) { } else if (var1.itemID == Item.hoeWood.shiftedIndex) {
this.field_25004_e.addStat(AchievementList.field_27107_l, 1); this.field_25004_e.addStat(AchievementList.field_27107_l, 1);
} else if(var1.itemID == Item.bread.shiftedIndex) { } else if (var1.itemID == Item.bread.shiftedIndex) {
this.field_25004_e.addStat(AchievementList.field_27106_m, 1); this.field_25004_e.addStat(AchievementList.field_27106_m, 1);
} else if(var1.itemID == Item.cake.shiftedIndex) { } else if (var1.itemID == Item.cake.shiftedIndex) {
this.field_25004_e.addStat(AchievementList.field_27105_n, 1); this.field_25004_e.addStat(AchievementList.field_27105_n, 1);
} else if(var1.itemID == Item.pickaxeStone.shiftedIndex) { } else if (var1.itemID == Item.pickaxeStone.shiftedIndex) {
this.field_25004_e.addStat(AchievementList.field_27104_o, 1); this.field_25004_e.addStat(AchievementList.field_27104_o, 1);
} else if(var1.itemID == Item.swordWood.shiftedIndex) { } else if (var1.itemID == Item.swordWood.shiftedIndex) {
this.field_25004_e.addStat(AchievementList.field_27101_r, 1); this.field_25004_e.addStat(AchievementList.field_27101_r, 1);
} }
for(int var2 = 0; var2 < this.craftMatrix.getSizeInventory(); ++var2) { for (int var2 = 0; var2 < this.craftMatrix.getSizeInventory(); ++var2) {
ItemStack var3 = this.craftMatrix.getStackInSlot(var2); ItemStack var3 = this.craftMatrix.getStackInSlot(var2);
if(var3 != null) { if (var3 != null) {
this.craftMatrix.decrStackSize(var2, 1); this.craftMatrix.decrStackSize(var2, 1);
if(var3.getItem().hasContainerItem()) { if (var3.getItem().hasContainerItem()) {
this.craftMatrix.setInventorySlotContents(var2, new ItemStack(var3.getItem().getContainerItem())); this.craftMatrix.setInventorySlotContents(var2, new ItemStack(var3.getItem().getContainerItem()));
} }
} }

4
src/net/minecraft/container/slot/SlotFurnace.java
View file

@ -20,11 +20,11 @@ public class SlotFurnace extends Slot {
public void onPickupFromSlot(ItemStack var1) { public void onPickupFromSlot(ItemStack var1) {
var1.func_28142_b(this.field_27007_d.worldObj, this.field_27007_d); var1.func_28142_b(this.field_27007_d.worldObj, this.field_27007_d);
if(var1.itemID == Item.ingotIron.shiftedIndex) { if (var1.itemID == Item.ingotIron.shiftedIndex) {
this.field_27007_d.addStat(AchievementList.field_27108_k, 1); this.field_27007_d.addStat(AchievementList.field_27108_k, 1);
} }
if(var1.itemID == Item.fishCooked.shiftedIndex) { if (var1.itemID == Item.fishCooked.shiftedIndex) {
this.field_27007_d.addStat(AchievementList.field_27103_p, 1); this.field_27007_d.addStat(AchievementList.field_27103_p, 1);
} }

407
src/net/minecraft/entity/Entity.java
View file

@ -1,7 +1,5 @@
package net.minecraft.entity; package net.minecraft.entity;
import java.util.List;
import java.util.Random;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockFluid; import net.minecraft.block.BlockFluid;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
@ -17,6 +15,9 @@ import net.minecraft.nbt.NBTTagFloat;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public abstract class Entity { public abstract class Entity {
private static int nextEntityID = 0; private static int nextEntityID = 0;
public int entityId = nextEntityID++; public int entityId = nextEntityID++;
@ -84,7 +85,7 @@ public abstract class Entity {
public Entity(World var1) { public Entity(World var1) {
this.worldObj = var1; this.worldObj = var1;
this.setPosition(0.0D, 0.0D, 0.0D); this.setPosition(0.0D, 0.0D, 0.0D);
this.dataWatcher.addObject(0, Byte.valueOf((byte)0)); this.dataWatcher.addObject(0, Byte.valueOf((byte) 0));
this.entityInit(); this.entityInit();
} }
@ -95,7 +96,7 @@ public abstract class Entity {
} }
public boolean equals(Object var1) { public boolean equals(Object var1) {
return var1 instanceof Entity ? ((Entity)var1).entityId == this.entityId : false; return var1 instanceof Entity ? ((Entity) var1).entityId == this.entityId : false;
} }
public int hashCode() { public int hashCode() {
@ -122,7 +123,7 @@ public abstract class Entity {
this.posZ = var5; this.posZ = var5;
float var7 = this.width / 2.0F; float var7 = this.width / 2.0F;
float var8 = this.height; float var8 = this.height;
this.boundingBox.setBounds(var1 - (double)var7, var3 - (double)this.yOffset + (double)this.ySize, var5 - (double)var7, var1 + (double)var7, var3 - (double)this.yOffset + (double)this.ySize + (double)var8, var5 + (double)var7); this.boundingBox.setBounds(var1 - (double) var7, var3 - (double) this.yOffset + (double) this.ySize, var5 - (double) var7, var1 + (double) var7, var3 - (double) this.yOffset + (double) this.ySize + (double) var8, var5 + (double) var7);
} }
public void onUpdate() { public void onUpdate() {
@ -130,7 +131,7 @@ public abstract class Entity {
} }
public void onEntityUpdate() { public void onEntityUpdate() {
if(this.ridingEntity != null && this.ridingEntity.isDead) { if (this.ridingEntity != null && this.ridingEntity.isDead) {
this.ridingEntity = null; this.ridingEntity = null;
} }
@ -141,29 +142,29 @@ public abstract class Entity {
this.prevPosZ = this.posZ; this.prevPosZ = this.posZ;
this.prevRotationPitch = this.rotationPitch; this.prevRotationPitch = this.rotationPitch;
this.prevRotationYaw = this.rotationYaw; this.prevRotationYaw = this.rotationYaw;
if(this.handleWaterMovement()) { if (this.handleWaterMovement()) {
if(!this.inWater && !this.firstUpdate) { if (!this.inWater && !this.firstUpdate) {
float var1 = MathHelper.sqrt_double(this.motionX * this.motionX * (double)0.2F + this.motionY * this.motionY + this.motionZ * this.motionZ * (double)0.2F) * 0.2F; float var1 = MathHelper.sqrt_double(this.motionX * this.motionX * (double) 0.2F + this.motionY * this.motionY + this.motionZ * this.motionZ * (double) 0.2F) * 0.2F;
if(var1 > 1.0F) { if (var1 > 1.0F) {
var1 = 1.0F; var1 = 1.0F;
} }
this.worldObj.playSoundAtEntity(this, "random.splash", var1, 1.0F + (this.rand.nextFloat() - this.rand.nextFloat()) * 0.4F); this.worldObj.playSoundAtEntity(this, "random.splash", var1, 1.0F + (this.rand.nextFloat() - this.rand.nextFloat()) * 0.4F);
float var2 = (float)MathHelper.floor_double(this.boundingBox.minY); float var2 = (float) MathHelper.floor_double(this.boundingBox.minY);
int var3; int var3;
float var4; float var4;
float var5; float var5;
for(var3 = 0; (float)var3 < 1.0F + this.width * 20.0F; ++var3) { for (var3 = 0; (float) var3 < 1.0F + this.width * 20.0F; ++var3) {
var4 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; var4 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width;
var5 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; var5 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width;
this.worldObj.spawnParticle("bubble", this.posX + (double)var4, (double)(var2 + 1.0F), this.posZ + (double)var5, this.motionX, this.motionY - (double)(this.rand.nextFloat() * 0.2F), this.motionZ); this.worldObj.spawnParticle("bubble", this.posX + (double) var4, (double) (var2 + 1.0F), this.posZ + (double) var5, this.motionX, this.motionY - (double) (this.rand.nextFloat() * 0.2F), this.motionZ);
} }
for(var3 = 0; (float)var3 < 1.0F + this.width * 20.0F; ++var3) { for (var3 = 0; (float) var3 < 1.0F + this.width * 20.0F; ++var3) {
var4 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; var4 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width;
var5 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; var5 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width;
this.worldObj.spawnParticle("splash", this.posX + (double)var4, (double)(var2 + 1.0F), this.posZ + (double)var5, this.motionX, this.motionY, this.motionZ); this.worldObj.spawnParticle("splash", this.posX + (double) var4, (double) (var2 + 1.0F), this.posZ + (double) var5, this.motionX, this.motionY, this.motionZ);
} }
} }
@ -174,32 +175,32 @@ public abstract class Entity {
this.inWater = false; this.inWater = false;
} }
if(this.worldObj.singleplayerWorld) { if (this.worldObj.singleplayerWorld) {
this.fire = 0; this.fire = 0;
} else if(this.fire > 0) { } else if (this.fire > 0) {
if(this.isImmuneToFire) { if (this.isImmuneToFire) {
this.fire -= 4; this.fire -= 4;
if(this.fire < 0) { if (this.fire < 0) {
this.fire = 0; this.fire = 0;
} }
} else { } else {
if(this.fire % 20 == 0) { if (this.fire % 20 == 0) {
this.attackEntityFrom((Entity)null, 1); this.attackEntityFrom((Entity) null, 1);
} }
--this.fire; --this.fire;
} }
} }
if(this.handleLavaMovement()) { if (this.handleLavaMovement()) {
this.setOnFireFromLava(); this.setOnFireFromLava();
} }
if(this.posY < -64.0D) { if (this.posY < -64.0D) {
this.kill(); this.kill();
} }
if(!this.worldObj.singleplayerWorld) { if (!this.worldObj.singleplayerWorld) {
this.setFlag(0, this.fire > 0); this.setFlag(0, this.fire > 0);
this.setFlag(2, this.ridingEntity != null); this.setFlag(2, this.ridingEntity != null);
} }
@ -208,8 +209,8 @@ public abstract class Entity {
} }
protected void setOnFireFromLava() { protected void setOnFireFromLava() {
if(!this.isImmuneToFire) { if (!this.isImmuneToFire) {
this.attackEntityFrom((Entity)null, 4); this.attackEntityFrom((Entity) null, 4);
this.fire = 600; this.fire = 600;
} }
@ -226,19 +227,19 @@ public abstract class Entity {
} }
public void moveEntity(double var1, double var3, double var5) { public void moveEntity(double var1, double var3, double var5) {
if(this.noClip) { if (this.noClip) {
this.boundingBox.offset(var1, var3, var5); this.boundingBox.offset(var1, var3, var5);
this.posX = (this.boundingBox.minX + this.boundingBox.maxX) / 2.0D; this.posX = (this.boundingBox.minX + this.boundingBox.maxX) / 2.0D;
this.posY = this.boundingBox.minY + (double)this.yOffset - (double)this.ySize; this.posY = this.boundingBox.minY + (double) this.yOffset - (double) this.ySize;
this.posZ = (this.boundingBox.minZ + this.boundingBox.maxZ) / 2.0D; this.posZ = (this.boundingBox.minZ + this.boundingBox.maxZ) / 2.0D;
} else { } else {
this.ySize *= 0.4F; this.ySize *= 0.4F;
double var7 = this.posX; double var7 = this.posX;
double var9 = this.posZ; double var9 = this.posZ;
if(this.field_27012_bb) { if (this.field_27012_bb) {
this.field_27012_bb = false; this.field_27012_bb = false;
var1 *= 0.25D; var1 *= 0.25D;
var3 *= (double)0.05F; var3 *= (double) 0.05F;
var5 *= 0.25D; var5 *= 0.25D;
this.motionX = 0.0D; this.motionX = 0.0D;
this.motionY = 0.0D; this.motionY = 0.0D;
@ -250,22 +251,22 @@ public abstract class Entity {
double var15 = var5; double var15 = var5;
AxisAlignedBB var17 = this.boundingBox.copy(); AxisAlignedBB var17 = this.boundingBox.copy();
boolean var18 = this.onGround && this.isSneaking(); boolean var18 = this.onGround && this.isSneaking();
if(var18) { if (var18) {
double var19; double var19;
for(var19 = 0.05D; var1 != 0.0D && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox.getOffsetBoundingBox(var1, -1.0D, 0.0D)).size() == 0; var11 = var1) { for (var19 = 0.05D; var1 != 0.0D && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox.getOffsetBoundingBox(var1, -1.0D, 0.0D)).size() == 0; var11 = var1) {
if(var1 < var19 && var1 >= -var19) { if (var1 < var19 && var1 >= -var19) {
var1 = 0.0D; var1 = 0.0D;
} else if(var1 > 0.0D) { } else if (var1 > 0.0D) {
var1 -= var19; var1 -= var19;
} else { } else {
var1 += var19; var1 += var19;
} }
} }
for(; var5 != 0.0D && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox.getOffsetBoundingBox(0.0D, -1.0D, var5)).size() == 0; var15 = var5) { for (; var5 != 0.0D && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox.getOffsetBoundingBox(0.0D, -1.0D, var5)).size() == 0; var15 = var5) {
if(var5 < var19 && var5 >= -var19) { if (var5 < var19 && var5 >= -var19) {
var5 = 0.0D; var5 = 0.0D;
} else if(var5 > 0.0D) { } else if (var5 > 0.0D) {
var5 -= var19; var5 -= var19;
} else { } else {
var5 += var19; var5 += var19;
@ -275,12 +276,12 @@ public abstract class Entity {
List var35 = this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox.addCoord(var1, var3, var5)); List var35 = this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox.addCoord(var1, var3, var5));
for(int var20 = 0; var20 < var35.size(); ++var20) { for (int var20 = 0; var20 < var35.size(); ++var20) {
var3 = ((AxisAlignedBB)var35.get(var20)).calculateYOffset(this.boundingBox, var3); var3 = ((AxisAlignedBB) var35.get(var20)).calculateYOffset(this.boundingBox, var3);
} }
this.boundingBox.offset(0.0D, var3, 0.0D); this.boundingBox.offset(0.0D, var3, 0.0D);
if(!this.field_9077_F && var13 != var3) { if (!this.field_9077_F && var13 != var3) {
var5 = 0.0D; var5 = 0.0D;
var3 = var5; var3 = var5;
var1 = var5; var1 = var5;
@ -289,23 +290,23 @@ public abstract class Entity {
boolean var36 = this.onGround || var13 != var3 && var13 < 0.0D; boolean var36 = this.onGround || var13 != var3 && var13 < 0.0D;
int var21; int var21;
for(var21 = 0; var21 < var35.size(); ++var21) { for (var21 = 0; var21 < var35.size(); ++var21) {
var1 = ((AxisAlignedBB)var35.get(var21)).calculateXOffset(this.boundingBox, var1); var1 = ((AxisAlignedBB) var35.get(var21)).calculateXOffset(this.boundingBox, var1);
} }
this.boundingBox.offset(var1, 0.0D, 0.0D); this.boundingBox.offset(var1, 0.0D, 0.0D);
if(!this.field_9077_F && var11 != var1) { if (!this.field_9077_F && var11 != var1) {
var5 = 0.0D; var5 = 0.0D;
var3 = var5; var3 = var5;
var1 = var5; var1 = var5;
} }
for(var21 = 0; var21 < var35.size(); ++var21) { for (var21 = 0; var21 < var35.size(); ++var21) {
var5 = ((AxisAlignedBB)var35.get(var21)).calculateZOffset(this.boundingBox, var5); var5 = ((AxisAlignedBB) var35.get(var21)).calculateZOffset(this.boundingBox, var5);
} }
this.boundingBox.offset(0.0D, 0.0D, var5); this.boundingBox.offset(0.0D, 0.0D, var5);
if(!this.field_9077_F && var15 != var5) { if (!this.field_9077_F && var15 != var5) {
var5 = 0.0D; var5 = 0.0D;
var3 = var5; var3 = var5;
var1 = var5; var1 = var5;
@ -314,94 +315,94 @@ public abstract class Entity {
double var23; double var23;
int var28; int var28;
double var37; double var37;
if(this.stepHeight > 0.0F && var36 && (var18 || this.ySize < 0.05F) && (var11 != var1 || var15 != var5)) { if (this.stepHeight > 0.0F && var36 && (var18 || this.ySize < 0.05F) && (var11 != var1 || var15 != var5)) {
var37 = var1; var37 = var1;
var23 = var3; var23 = var3;
double var25 = var5; double var25 = var5;
var1 = var11; var1 = var11;
var3 = (double)this.stepHeight; var3 = (double) this.stepHeight;
var5 = var15; var5 = var15;
AxisAlignedBB var27 = this.boundingBox.copy(); AxisAlignedBB var27 = this.boundingBox.copy();
this.boundingBox.setBB(var17); this.boundingBox.setBB(var17);
var35 = this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox.addCoord(var11, var3, var15)); var35 = this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox.addCoord(var11, var3, var15));
for(var28 = 0; var28 < var35.size(); ++var28) { for (var28 = 0; var28 < var35.size(); ++var28) {
var3 = ((AxisAlignedBB)var35.get(var28)).calculateYOffset(this.boundingBox, var3); var3 = ((AxisAlignedBB) var35.get(var28)).calculateYOffset(this.boundingBox, var3);
} }
this.boundingBox.offset(0.0D, var3, 0.0D); this.boundingBox.offset(0.0D, var3, 0.0D);
if(!this.field_9077_F && var13 != var3) { if (!this.field_9077_F && var13 != var3) {
var5 = 0.0D; var5 = 0.0D;
var3 = var5; var3 = var5;
var1 = var5; var1 = var5;
} }
for(var28 = 0; var28 < var35.size(); ++var28) { for (var28 = 0; var28 < var35.size(); ++var28) {
var1 = ((AxisAlignedBB)var35.get(var28)).calculateXOffset(this.boundingBox, var1); var1 = ((AxisAlignedBB) var35.get(var28)).calculateXOffset(this.boundingBox, var1);
} }
this.boundingBox.offset(var1, 0.0D, 0.0D); this.boundingBox.offset(var1, 0.0D, 0.0D);
if(!this.field_9077_F && var11 != var1) { if (!this.field_9077_F && var11 != var1) {
var5 = 0.0D; var5 = 0.0D;
var3 = var5; var3 = var5;
var1 = var5; var1 = var5;
} }
for(var28 = 0; var28 < var35.size(); ++var28) { for (var28 = 0; var28 < var35.size(); ++var28) {
var5 = ((AxisAlignedBB)var35.get(var28)).calculateZOffset(this.boundingBox, var5); var5 = ((AxisAlignedBB) var35.get(var28)).calculateZOffset(this.boundingBox, var5);
} }
this.boundingBox.offset(0.0D, 0.0D, var5); this.boundingBox.offset(0.0D, 0.0D, var5);
if(!this.field_9077_F && var15 != var5) { if (!this.field_9077_F && var15 != var5) {
var5 = 0.0D; var5 = 0.0D;
var3 = var5; var3 = var5;
var1 = var5; var1 = var5;
} }
if(!this.field_9077_F && var13 != var3) { if (!this.field_9077_F && var13 != var3) {
var5 = 0.0D; var5 = 0.0D;
var3 = var5; var3 = var5;
var1 = var5; var1 = var5;
} else { } else {
var3 = (double)(-this.stepHeight); var3 = (double) (-this.stepHeight);
for(var28 = 0; var28 < var35.size(); ++var28) { for (var28 = 0; var28 < var35.size(); ++var28) {
var3 = ((AxisAlignedBB)var35.get(var28)).calculateYOffset(this.boundingBox, var3); var3 = ((AxisAlignedBB) var35.get(var28)).calculateYOffset(this.boundingBox, var3);
} }
this.boundingBox.offset(0.0D, var3, 0.0D); this.boundingBox.offset(0.0D, var3, 0.0D);
} }
if(var37 * var37 + var25 * var25 >= var1 * var1 + var5 * var5) { if (var37 * var37 + var25 * var25 >= var1 * var1 + var5 * var5) {
var1 = var37; var1 = var37;
var3 = var23; var3 = var23;
var5 = var25; var5 = var25;
this.boundingBox.setBB(var27); this.boundingBox.setBB(var27);
} else { } else {
double var41 = this.boundingBox.minY - (double)((int)this.boundingBox.minY); double var41 = this.boundingBox.minY - (double) ((int) this.boundingBox.minY);
if(var41 > 0.0D) { if (var41 > 0.0D) {
this.ySize = (float)((double)this.ySize + var41 + 0.01D); this.ySize = (float) ((double) this.ySize + var41 + 0.01D);
} }
} }
} }
this.posX = (this.boundingBox.minX + this.boundingBox.maxX) / 2.0D; this.posX = (this.boundingBox.minX + this.boundingBox.maxX) / 2.0D;
this.posY = this.boundingBox.minY + (double)this.yOffset - (double)this.ySize; this.posY = this.boundingBox.minY + (double) this.yOffset - (double) this.ySize;
this.posZ = (this.boundingBox.minZ + this.boundingBox.maxZ) / 2.0D; this.posZ = (this.boundingBox.minZ + this.boundingBox.maxZ) / 2.0D;
this.isCollidedHorizontally = var11 != var1 || var15 != var5; this.isCollidedHorizontally = var11 != var1 || var15 != var5;
this.isCollidedVertically = var13 != var3; this.isCollidedVertically = var13 != var3;
this.onGround = var13 != var3 && var13 < 0.0D; this.onGround = var13 != var3 && var13 < 0.0D;
this.isCollided = this.isCollidedHorizontally || this.isCollidedVertically; this.isCollided = this.isCollidedHorizontally || this.isCollidedVertically;
this.updateFallState(var3, this.onGround); this.updateFallState(var3, this.onGround);
if(var11 != var1) { if (var11 != var1) {
this.motionX = 0.0D; this.motionX = 0.0D;
} }
if(var13 != var3) { if (var13 != var3) {
this.motionY = 0.0D; this.motionY = 0.0D;
} }
if(var15 != var5) { if (var15 != var5) {
this.motionZ = 0.0D; this.motionZ = 0.0D;
} }
@ -410,23 +411,23 @@ public abstract class Entity {
int var26; int var26;
int var38; int var38;
int var39; int var39;
if(this.func_25017_l() && !var18 && this.ridingEntity == null) { if (this.func_25017_l() && !var18 && this.ridingEntity == null) {
this.distanceWalkedModified = (float)((double)this.distanceWalkedModified + (double)MathHelper.sqrt_double(var37 * var37 + var23 * var23) * 0.6D); this.distanceWalkedModified = (float) ((double) this.distanceWalkedModified + (double) MathHelper.sqrt_double(var37 * var37 + var23 * var23) * 0.6D);
var38 = MathHelper.floor_double(this.posX); var38 = MathHelper.floor_double(this.posX);
var26 = MathHelper.floor_double(this.posY - (double)0.2F - (double)this.yOffset); var26 = MathHelper.floor_double(this.posY - (double) 0.2F - (double) this.yOffset);
var39 = MathHelper.floor_double(this.posZ); var39 = MathHelper.floor_double(this.posZ);
var28 = this.worldObj.getBlockId(var38, var26, var39); var28 = this.worldObj.getBlockId(var38, var26, var39);
if(this.worldObj.getBlockId(var38, var26 - 1, var39) == Block.fence.blockID) { if (this.worldObj.getBlockId(var38, var26 - 1, var39) == Block.fence.blockID) {
var28 = this.worldObj.getBlockId(var38, var26 - 1, var39); var28 = this.worldObj.getBlockId(var38, var26 - 1, var39);
} }
if(this.distanceWalkedModified > (float)this.nextStepDistance && var28 > 0) { if (this.distanceWalkedModified > (float) this.nextStepDistance && var28 > 0) {
++this.nextStepDistance; ++this.nextStepDistance;
StepSound var29 = Block.blocksList[var28].stepSound; StepSound var29 = Block.blocksList[var28].stepSound;
if(this.worldObj.getBlockId(var38, var26 + 1, var39) == Block.snow.blockID) { if (this.worldObj.getBlockId(var38, var26 + 1, var39) == Block.snow.blockID) {
var29 = Block.snow.stepSound; var29 = Block.snow.stepSound;
this.worldObj.playSoundAtEntity(this, var29.func_737_c(), var29.getVolume() * 0.15F, var29.getPitch()); this.worldObj.playSoundAtEntity(this, var29.func_737_c(), var29.getVolume() * 0.15F, var29.getPitch());
} else if(!Block.blocksList[var28].blockMaterial.getIsLiquid()) { } else if (!Block.blocksList[var28].blockMaterial.getIsLiquid()) {
this.worldObj.playSoundAtEntity(this, var29.func_737_c(), var29.getVolume() * 0.15F, var29.getPitch()); this.worldObj.playSoundAtEntity(this, var29.func_737_c(), var29.getVolume() * 0.15F, var29.getPitch());
} }
@ -440,12 +441,12 @@ public abstract class Entity {
var28 = MathHelper.floor_double(this.boundingBox.maxX - 0.001D); var28 = MathHelper.floor_double(this.boundingBox.maxX - 0.001D);
int var40 = MathHelper.floor_double(this.boundingBox.maxY - 0.001D); int var40 = MathHelper.floor_double(this.boundingBox.maxY - 0.001D);
int var30 = MathHelper.floor_double(this.boundingBox.maxZ - 0.001D); int var30 = MathHelper.floor_double(this.boundingBox.maxZ - 0.001D);
if(this.worldObj.checkChunksExist(var38, var26, var39, var28, var40, var30)) { if (this.worldObj.checkChunksExist(var38, var26, var39, var28, var40, var30)) {
for(int var31 = var38; var31 <= var28; ++var31) { for (int var31 = var38; var31 <= var28; ++var31) {
for(int var32 = var26; var32 <= var40; ++var32) { for (int var32 = var26; var32 <= var40; ++var32) {
for(int var33 = var39; var33 <= var30; ++var33) { for (int var33 = var39; var33 <= var30; ++var33) {
int var34 = this.worldObj.getBlockId(var31, var32, var33); int var34 = this.worldObj.getBlockId(var31, var32, var33);
if(var34 > 0) { if (var34 > 0) {
Block.blocksList[var34].onEntityCollidedWithBlock(this.worldObj, var31, var32, var33, this); Block.blocksList[var34].onEntityCollidedWithBlock(this.worldObj, var31, var32, var33, this);
} }
} }
@ -454,19 +455,19 @@ public abstract class Entity {
} }
boolean var42 = this.func_27008_Y(); boolean var42 = this.func_27008_Y();
if(this.worldObj.isBoundingBoxBurning(this.boundingBox.getInsetBoundingBox(0.001D, 0.001D, 0.001D))) { if (this.worldObj.isBoundingBoxBurning(this.boundingBox.getInsetBoundingBox(0.001D, 0.001D, 0.001D))) {
this.dealFireDamage(1); this.dealFireDamage(1);
if(!var42) { if (!var42) {
++this.fire; ++this.fire;
if(this.fire == 0) { if (this.fire == 0) {
this.fire = 300; this.fire = 300;
} }
} }
} else if(this.fire <= 0) { } else if (this.fire <= 0) {
this.fire = -this.fireResistance; this.fire = -this.fireResistance;
} }
if(var42 && this.fire > 0) { if (var42 && this.fire > 0) {
this.worldObj.playSoundAtEntity(this, "random.fizz", 0.7F, 1.6F + (this.rand.nextFloat() - this.rand.nextFloat()) * 0.4F); this.worldObj.playSoundAtEntity(this, "random.fizz", 0.7F, 1.6F + (this.rand.nextFloat() - this.rand.nextFloat()) * 0.4F);
this.fire = -this.fireResistance; this.fire = -this.fireResistance;
} }
@ -479,13 +480,13 @@ public abstract class Entity {
} }
protected void updateFallState(double var1, boolean var3) { protected void updateFallState(double var1, boolean var3) {
if(var3) { if (var3) {
if(this.fallDistance > 0.0F) { if (this.fallDistance > 0.0F) {
this.fall(this.fallDistance); this.fall(this.fallDistance);
this.fallDistance = 0.0F; this.fallDistance = 0.0F;
} }
} else if(var1 < 0.0D) { } else if (var1 < 0.0D) {
this.fallDistance = (float)((double)this.fallDistance - var1); this.fallDistance = (float) ((double) this.fallDistance - var1);
} }
} }
@ -495,14 +496,14 @@ public abstract class Entity {
} }
protected void dealFireDamage(int var1) { protected void dealFireDamage(int var1) {
if(!this.isImmuneToFire) { if (!this.isImmuneToFire) {
this.attackEntityFrom((Entity)null, var1); this.attackEntityFrom((Entity) null, var1);
} }
} }
protected void fall(float var1) { protected void fall(float var1) {
if(this.riddenByEntity != null) { if (this.riddenByEntity != null) {
this.riddenByEntity.fall(var1); this.riddenByEntity.fall(var1);
} }
@ -517,19 +518,19 @@ public abstract class Entity {
} }
public boolean handleWaterMovement() { public boolean handleWaterMovement() {
return this.worldObj.handleMaterialAcceleration(this.boundingBox.expand(0.0D, (double)-0.4F, 0.0D).getInsetBoundingBox(0.001D, 0.001D, 0.001D), Material.water, this); return this.worldObj.handleMaterialAcceleration(this.boundingBox.expand(0.0D, (double) -0.4F, 0.0D).getInsetBoundingBox(0.001D, 0.001D, 0.001D), Material.water, this);
} }
public boolean isInsideOfMaterial(Material var1) { public boolean isInsideOfMaterial(Material var1) {
double var2 = this.posY + (double)this.getEyeHeight(); double var2 = this.posY + (double) this.getEyeHeight();
int var4 = MathHelper.floor_double(this.posX); int var4 = MathHelper.floor_double(this.posX);
int var5 = MathHelper.floor_float((float)MathHelper.floor_double(var2)); int var5 = MathHelper.floor_float((float) MathHelper.floor_double(var2));
int var6 = MathHelper.floor_double(this.posZ); int var6 = MathHelper.floor_double(this.posZ);
int var7 = this.worldObj.getBlockId(var4, var5, var6); int var7 = this.worldObj.getBlockId(var4, var5, var6);
if(var7 != 0 && Block.blocksList[var7].blockMaterial == var1) { if (var7 != 0 && Block.blocksList[var7].blockMaterial == var1) {
float var8 = BlockFluid.setFluidHeight(this.worldObj.getBlockMetadata(var4, var5, var6)) - 1.0F / 9.0F; float var8 = BlockFluid.setFluidHeight(this.worldObj.getBlockMetadata(var4, var5, var6)) - 1.0F / 9.0F;
float var9 = (float)(var5 + 1) - var8; float var9 = (float) (var5 + 1) - var8;
return var2 < (double)var9; return var2 < (double) var9;
} else { } else {
return false; return false;
} }
@ -540,34 +541,34 @@ public abstract class Entity {
} }
public boolean handleLavaMovement() { public boolean handleLavaMovement() {
return this.worldObj.isMaterialInBB(this.boundingBox.expand((double)-0.1F, (double)-0.4F, (double)-0.1F), Material.lava); return this.worldObj.isMaterialInBB(this.boundingBox.expand((double) -0.1F, (double) -0.4F, (double) -0.1F), Material.lava);
} }
public void moveFlying(float var1, float var2, float var3) { public void moveFlying(float var1, float var2, float var3) {
float var4 = MathHelper.sqrt_float(var1 * var1 + var2 * var2); float var4 = MathHelper.sqrt_float(var1 * var1 + var2 * var2);
if(var4 >= 0.01F) { if (var4 >= 0.01F) {
if(var4 < 1.0F) { if (var4 < 1.0F) {
var4 = 1.0F; var4 = 1.0F;
} }
var4 = var3 / var4; var4 = var3 / var4;
var1 *= var4; var1 *= var4;
var2 *= var4; var2 *= var4;
float var5 = MathHelper.sin(this.rotationYaw * (float)Math.PI / 180.0F); float var5 = MathHelper.sin(this.rotationYaw * (float) Math.PI / 180.0F);
float var6 = MathHelper.cos(this.rotationYaw * (float)Math.PI / 180.0F); float var6 = MathHelper.cos(this.rotationYaw * (float) Math.PI / 180.0F);
this.motionX += (double)(var1 * var6 - var2 * var5); this.motionX += (double) (var1 * var6 - var2 * var5);
this.motionZ += (double)(var2 * var6 + var1 * var5); this.motionZ += (double) (var2 * var6 + var1 * var5);
} }
} }
public float getEntityBrightness(float var1) { public float getEntityBrightness(float var1) {
int var2 = MathHelper.floor_double(this.posX); int var2 = MathHelper.floor_double(this.posX);
double var3 = (this.boundingBox.maxY - this.boundingBox.minY) * 0.66D; double var3 = (this.boundingBox.maxY - this.boundingBox.minY) * 0.66D;
int var5 = MathHelper.floor_double(this.posY - (double)this.yOffset + var3); int var5 = MathHelper.floor_double(this.posY - (double) this.yOffset + var3);
int var6 = MathHelper.floor_double(this.posZ); int var6 = MathHelper.floor_double(this.posZ);
if(this.worldObj.checkChunksExist(MathHelper.floor_double(this.boundingBox.minX), MathHelper.floor_double(this.boundingBox.minY), MathHelper.floor_double(this.boundingBox.minZ), MathHelper.floor_double(this.boundingBox.maxX), MathHelper.floor_double(this.boundingBox.maxY), MathHelper.floor_double(this.boundingBox.maxZ))) { if (this.worldObj.checkChunksExist(MathHelper.floor_double(this.boundingBox.minX), MathHelper.floor_double(this.boundingBox.minY), MathHelper.floor_double(this.boundingBox.minZ), MathHelper.floor_double(this.boundingBox.maxX), MathHelper.floor_double(this.boundingBox.maxY), MathHelper.floor_double(this.boundingBox.maxZ))) {
float var7 = this.worldObj.getLightBrightness(var2, var5, var6); float var7 = this.worldObj.getLightBrightness(var2, var5, var6);
if(var7 < this.field_31001_bF) { if (var7 < this.field_31001_bF) {
var7 = this.field_31001_bF; var7 = this.field_31001_bF;
} }
@ -588,12 +589,12 @@ public abstract class Entity {
this.prevRotationYaw = this.rotationYaw = var7; this.prevRotationYaw = this.rotationYaw = var7;
this.prevRotationPitch = this.rotationPitch = var8; this.prevRotationPitch = this.rotationPitch = var8;
this.ySize = 0.0F; this.ySize = 0.0F;
double var9 = (double)(this.prevRotationYaw - var7); double var9 = (double) (this.prevRotationYaw - var7);
if(var9 < -180.0D) { if (var9 < -180.0D) {
this.prevRotationYaw += 360.0F; this.prevRotationYaw += 360.0F;
} }
if(var9 >= 180.0D) { if (var9 >= 180.0D) {
this.prevRotationYaw -= 360.0F; this.prevRotationYaw -= 360.0F;
} }
@ -603,7 +604,7 @@ public abstract class Entity {
public void setLocationAndAngles(double var1, double var3, double var5, float var7, float var8) { public void setLocationAndAngles(double var1, double var3, double var5, float var7, float var8) {
this.lastTickPosX = this.prevPosX = this.posX = var1; this.lastTickPosX = this.prevPosX = this.posX = var1;
this.lastTickPosY = this.prevPosY = this.posY = var3 + (double)this.yOffset; this.lastTickPosY = this.prevPosY = this.posY = var3 + (double) this.yOffset;
this.lastTickPosZ = this.prevPosZ = this.posZ = var5; this.lastTickPosZ = this.prevPosZ = this.posZ = var5;
this.rotationYaw = var7; this.rotationYaw = var7;
this.rotationPitch = var8; this.rotationPitch = var8;
@ -611,9 +612,9 @@ public abstract class Entity {
} }
public float getDistanceToEntity(Entity var1) { public float getDistanceToEntity(Entity var1) {
float var2 = (float)(this.posX - var1.posX); float var2 = (float) (this.posX - var1.posX);
float var3 = (float)(this.posY - var1.posY); float var3 = (float) (this.posY - var1.posY);
float var4 = (float)(this.posZ - var1.posZ); float var4 = (float) (this.posZ - var1.posZ);
return MathHelper.sqrt_float(var2 * var2 + var3 * var3 + var4 * var4); return MathHelper.sqrt_float(var2 * var2 + var3 * var3 + var4 * var4);
} }
@ -628,7 +629,7 @@ public abstract class Entity {
double var7 = this.posX - var1; double var7 = this.posX - var1;
double var9 = this.posY - var3; double var9 = this.posY - var3;
double var11 = this.posZ - var5; double var11 = this.posZ - var5;
return (double)MathHelper.sqrt_double(var7 * var7 + var9 * var9 + var11 * var11); return (double) MathHelper.sqrt_double(var7 * var7 + var9 * var9 + var11 * var11);
} }
public double getDistanceSqToEntity(Entity var1) { public double getDistanceSqToEntity(Entity var1) {
@ -642,25 +643,25 @@ public abstract class Entity {
} }
public void applyEntityCollision(Entity var1) { public void applyEntityCollision(Entity var1) {
if(var1.riddenByEntity != this && var1.ridingEntity != this) { if (var1.riddenByEntity != this && var1.ridingEntity != this) {
double var2 = var1.posX - this.posX; double var2 = var1.posX - this.posX;
double var4 = var1.posZ - this.posZ; double var4 = var1.posZ - this.posZ;
double var6 = MathHelper.abs_max(var2, var4); double var6 = MathHelper.abs_max(var2, var4);
if(var6 >= (double)0.01F) { if (var6 >= (double) 0.01F) {
var6 = (double)MathHelper.sqrt_double(var6); var6 = (double) MathHelper.sqrt_double(var6);
var2 /= var6; var2 /= var6;
var4 /= var6; var4 /= var6;
double var8 = 1.0D / var6; double var8 = 1.0D / var6;
if(var8 > 1.0D) { if (var8 > 1.0D) {
var8 = 1.0D; var8 = 1.0D;
} }
var2 *= var8; var2 *= var8;
var4 *= var8; var4 *= var8;
var2 *= (double)0.05F; var2 *= (double) 0.05F;
var4 *= (double)0.05F; var4 *= (double) 0.05F;
var2 *= (double)(1.0F - this.entityCollisionReduction); var2 *= (double) (1.0F - this.entityCollisionReduction);
var4 *= (double)(1.0F - this.entityCollisionReduction); var4 *= (double) (1.0F - this.entityCollisionReduction);
this.addVelocity(-var2, 0.0D, -var4); this.addVelocity(-var2, 0.0D, -var4);
var1.addVelocity(var2, 0.0D, var4); var1.addVelocity(var2, 0.0D, var4);
} }
@ -696,7 +697,7 @@ public abstract class Entity {
public boolean addEntityID(NBTTagCompound var1) { public boolean addEntityID(NBTTagCompound var1) {
String var2 = this.getEntityString(); String var2 = this.getEntityString();
if(!this.isDead && var2 != null) { if (!this.isDead && var2 != null) {
var1.setString("id", var2); var1.setString("id", var2);
this.writeToNBT(var1); this.writeToNBT(var1);
return true; return true;
@ -706,12 +707,12 @@ public abstract class Entity {
} }
public void writeToNBT(NBTTagCompound var1) { public void writeToNBT(NBTTagCompound var1) {
var1.setTag("Pos", this.newDoubleNBTList(new double[]{this.posX, this.posY + (double)this.ySize, this.posZ})); var1.setTag("Pos", this.newDoubleNBTList(new double[]{this.posX, this.posY + (double) this.ySize, this.posZ}));
var1.setTag("Motion", this.newDoubleNBTList(new double[]{this.motionX, this.motionY, this.motionZ})); var1.setTag("Motion", this.newDoubleNBTList(new double[]{this.motionX, this.motionY, this.motionZ}));
var1.setTag("Rotation", this.newFloatNBTList(new float[]{this.rotationYaw, this.rotationPitch})); var1.setTag("Rotation", this.newFloatNBTList(new float[]{this.rotationYaw, this.rotationPitch}));
var1.setFloat("FallDistance", this.fallDistance); var1.setFloat("FallDistance", this.fallDistance);
var1.setShort("Fire", (short)this.fire); var1.setShort("Fire", (short) this.fire);
var1.setShort("Air", (short)this.air); var1.setShort("Air", (short) this.air);
var1.setBoolean("OnGround", this.onGround); var1.setBoolean("OnGround", this.onGround);
this.writeEntityToNBT(var1); this.writeEntityToNBT(var1);
} }
@ -720,26 +721,26 @@ public abstract class Entity {
NBTTagList var2 = var1.getTagList("Pos"); NBTTagList var2 = var1.getTagList("Pos");
NBTTagList var3 = var1.getTagList("Motion"); NBTTagList var3 = var1.getTagList("Motion");
NBTTagList var4 = var1.getTagList("Rotation"); NBTTagList var4 = var1.getTagList("Rotation");
this.motionX = ((NBTTagDouble)var3.tagAt(0)).doubleValue; this.motionX = ((NBTTagDouble) var3.tagAt(0)).doubleValue;
this.motionY = ((NBTTagDouble)var3.tagAt(1)).doubleValue; this.motionY = ((NBTTagDouble) var3.tagAt(1)).doubleValue;
this.motionZ = ((NBTTagDouble)var3.tagAt(2)).doubleValue; this.motionZ = ((NBTTagDouble) var3.tagAt(2)).doubleValue;
if(Math.abs(this.motionX) > 10.0D) { if (Math.abs(this.motionX) > 10.0D) {
this.motionX = 0.0D; this.motionX = 0.0D;
} }
if(Math.abs(this.motionY) > 10.0D) { if (Math.abs(this.motionY) > 10.0D) {
this.motionY = 0.0D; this.motionY = 0.0D;
} }
if(Math.abs(this.motionZ) > 10.0D) { if (Math.abs(this.motionZ) > 10.0D) {
this.motionZ = 0.0D; this.motionZ = 0.0D;
} }
this.prevPosX = this.lastTickPosX = this.posX = ((NBTTagDouble)var2.tagAt(0)).doubleValue; this.prevPosX = this.lastTickPosX = this.posX = ((NBTTagDouble) var2.tagAt(0)).doubleValue;
this.prevPosY = this.lastTickPosY = this.posY = ((NBTTagDouble)var2.tagAt(1)).doubleValue; this.prevPosY = this.lastTickPosY = this.posY = ((NBTTagDouble) var2.tagAt(1)).doubleValue;
this.prevPosZ = this.lastTickPosZ = this.posZ = ((NBTTagDouble)var2.tagAt(2)).doubleValue; this.prevPosZ = this.lastTickPosZ = this.posZ = ((NBTTagDouble) var2.tagAt(2)).doubleValue;
this.prevRotationYaw = this.rotationYaw = ((NBTTagFloat)var4.tagAt(0)).floatValue; this.prevRotationYaw = this.rotationYaw = ((NBTTagFloat) var4.tagAt(0)).floatValue;
this.prevRotationPitch = this.rotationPitch = ((NBTTagFloat)var4.tagAt(1)).floatValue; this.prevRotationPitch = this.rotationPitch = ((NBTTagFloat) var4.tagAt(1)).floatValue;
this.fallDistance = var1.getFloat("FallDistance"); this.fallDistance = var1.getFloat("FallDistance");
this.fire = var1.getShort("Fire"); this.fire = var1.getShort("Fire");
this.air = var1.getShort("Air"); this.air = var1.getShort("Air");
@ -762,7 +763,7 @@ public abstract class Entity {
double[] var3 = var1; double[] var3 = var1;
int var4 = var1.length; int var4 = var1.length;
for(int var5 = 0; var5 < var4; ++var5) { for (int var5 = 0; var5 < var4; ++var5) {
double var6 = var3[var5]; double var6 = var3[var5];
var2.setTag(new NBTTagDouble(var6)); var2.setTag(new NBTTagDouble(var6));
} }
@ -775,7 +776,7 @@ public abstract class Entity {
float[] var3 = var1; float[] var3 = var1;
int var4 = var1.length; int var4 = var1.length;
for(int var5 = 0; var5 < var4; ++var5) { for (int var5 = 0; var5 < var4; ++var5) {
float var6 = var3[var5]; float var6 = var3[var5];
var2.setTag(new NBTTagFloat(var6)); var2.setTag(new NBTTagFloat(var6));
} }
@ -792,7 +793,7 @@ public abstract class Entity {
} }
public EntityItem entityDropItem(ItemStack var1, float var2) { public EntityItem entityDropItem(ItemStack var1, float var2) {
EntityItem var3 = new EntityItem(this.worldObj, this.posX, this.posY + (double)var2, this.posZ, var1); EntityItem var3 = new EntityItem(this.worldObj, this.posX, this.posY + (double) var2, this.posZ, var1);
var3.delayBeforeCanPickup = 10; var3.delayBeforeCanPickup = 10;
this.worldObj.entityJoinedWorld(var3); this.worldObj.entityJoinedWorld(var3);
return var3; return var3;
@ -803,14 +804,14 @@ public abstract class Entity {
} }
public boolean isEntityInsideOpaqueBlock() { public boolean isEntityInsideOpaqueBlock() {
for(int var1 = 0; var1 < 8; ++var1) { for (int var1 = 0; var1 < 8; ++var1) {
float var2 = ((float)((var1 >> 0) % 2) - 0.5F) * this.width * 0.9F; float var2 = ((float) ((var1 >> 0) % 2) - 0.5F) * this.width * 0.9F;
float var3 = ((float)((var1 >> 1) % 2) - 0.5F) * 0.1F; float var3 = ((float) ((var1 >> 1) % 2) - 0.5F) * 0.1F;
float var4 = ((float)((var1 >> 2) % 2) - 0.5F) * this.width * 0.9F; float var4 = ((float) ((var1 >> 2) % 2) - 0.5F) * this.width * 0.9F;
int var5 = MathHelper.floor_double(this.posX + (double)var2); int var5 = MathHelper.floor_double(this.posX + (double) var2);
int var6 = MathHelper.floor_double(this.posY + (double)this.getEyeHeight() + (double)var3); int var6 = MathHelper.floor_double(this.posY + (double) this.getEyeHeight() + (double) var3);
int var7 = MathHelper.floor_double(this.posZ + (double)var4); int var7 = MathHelper.floor_double(this.posZ + (double) var4);
if(this.worldObj.isBlockNormalCube(var5, var6, var7)) { if (this.worldObj.isBlockNormalCube(var5, var6, var7)) {
return true; return true;
} }
} }
@ -827,55 +828,55 @@ public abstract class Entity {
} }
public void updateRidden() { public void updateRidden() {
if(this.ridingEntity.isDead) { if (this.ridingEntity.isDead) {
this.ridingEntity = null; this.ridingEntity = null;
} else { } else {
this.motionX = 0.0D; this.motionX = 0.0D;
this.motionY = 0.0D; this.motionY = 0.0D;
this.motionZ = 0.0D; this.motionZ = 0.0D;
this.onUpdate(); this.onUpdate();
if(this.ridingEntity != null) { if (this.ridingEntity != null) {
this.ridingEntity.updateRiderPosition(); this.ridingEntity.updateRiderPosition();
this.entityRiderYawDelta += (double)(this.ridingEntity.rotationYaw - this.ridingEntity.prevRotationYaw); this.entityRiderYawDelta += (double) (this.ridingEntity.rotationYaw - this.ridingEntity.prevRotationYaw);
for(this.entityRiderPitchDelta += (double)(this.ridingEntity.rotationPitch - this.ridingEntity.prevRotationPitch); this.entityRiderYawDelta >= 180.0D; this.entityRiderYawDelta -= 360.0D) { for (this.entityRiderPitchDelta += (double) (this.ridingEntity.rotationPitch - this.ridingEntity.prevRotationPitch); this.entityRiderYawDelta >= 180.0D; this.entityRiderYawDelta -= 360.0D) {
} }
while(this.entityRiderYawDelta < -180.0D) { while (this.entityRiderYawDelta < -180.0D) {
this.entityRiderYawDelta += 360.0D; this.entityRiderYawDelta += 360.0D;
} }
while(this.entityRiderPitchDelta >= 180.0D) { while (this.entityRiderPitchDelta >= 180.0D) {
this.entityRiderPitchDelta -= 360.0D; this.entityRiderPitchDelta -= 360.0D;
} }
while(this.entityRiderPitchDelta < -180.0D) { while (this.entityRiderPitchDelta < -180.0D) {
this.entityRiderPitchDelta += 360.0D; this.entityRiderPitchDelta += 360.0D;
} }
double var1 = this.entityRiderYawDelta * 0.5D; double var1 = this.entityRiderYawDelta * 0.5D;
double var3 = this.entityRiderPitchDelta * 0.5D; double var3 = this.entityRiderPitchDelta * 0.5D;
float var5 = 10.0F; float var5 = 10.0F;
if(var1 > (double)var5) { if (var1 > (double) var5) {
var1 = (double)var5; var1 = (double) var5;
} }
if(var1 < (double)(-var5)) { if (var1 < (double) (-var5)) {
var1 = (double)(-var5); var1 = (double) (-var5);
} }
if(var3 > (double)var5) { if (var3 > (double) var5) {
var3 = (double)var5; var3 = (double) var5;
} }
if(var3 < (double)(-var5)) { if (var3 < (double) (-var5)) {
var3 = (double)(-var5); var3 = (double) (-var5);
} }
this.entityRiderYawDelta -= var1; this.entityRiderYawDelta -= var1;
this.entityRiderPitchDelta -= var3; this.entityRiderPitchDelta -= var3;
this.rotationYaw = (float)((double)this.rotationYaw + var1); this.rotationYaw = (float) ((double) this.rotationYaw + var1);
this.rotationPitch = (float)((double)this.rotationPitch + var3); this.rotationPitch = (float) ((double) this.rotationPitch + var3);
} }
} }
} }
@ -885,33 +886,33 @@ public abstract class Entity {
} }
public double getYOffset() { public double getYOffset() {
return (double)this.yOffset; return (double) this.yOffset;
} }
public double getMountedYOffset() { public double getMountedYOffset() {
return (double)this.height * 0.75D; return (double) this.height * 0.75D;
} }
public void mountEntity(Entity var1) { public void mountEntity(Entity var1) {
this.entityRiderPitchDelta = 0.0D; this.entityRiderPitchDelta = 0.0D;
this.entityRiderYawDelta = 0.0D; this.entityRiderYawDelta = 0.0D;
if(var1 == null) { if (var1 == null) {
if(this.ridingEntity != null) { if (this.ridingEntity != null) {
this.setLocationAndAngles(this.ridingEntity.posX, this.ridingEntity.boundingBox.minY + (double)this.ridingEntity.height, this.ridingEntity.posZ, this.rotationYaw, this.rotationPitch); this.setLocationAndAngles(this.ridingEntity.posX, this.ridingEntity.boundingBox.minY + (double) this.ridingEntity.height, this.ridingEntity.posZ, this.rotationYaw, this.rotationPitch);
this.ridingEntity.riddenByEntity = null; this.ridingEntity.riddenByEntity = null;
} }
this.ridingEntity = null; this.ridingEntity = null;
} else if(this.ridingEntity == var1) { } else if (this.ridingEntity == var1) {
this.ridingEntity.riddenByEntity = null; this.ridingEntity.riddenByEntity = null;
this.ridingEntity = null; this.ridingEntity = null;
this.setLocationAndAngles(var1.posX, var1.boundingBox.minY + (double)var1.height, var1.posZ, this.rotationYaw, this.rotationPitch); this.setLocationAndAngles(var1.posX, var1.boundingBox.minY + (double) var1.height, var1.posZ, this.rotationYaw, this.rotationPitch);
} else { } else {
if(this.ridingEntity != null) { if (this.ridingEntity != null) {
this.ridingEntity.riddenByEntity = null; this.ridingEntity.riddenByEntity = null;
} }
if(var1.riddenByEntity != null) { if (var1.riddenByEntity != null) {
var1.riddenByEntity.ridingEntity = null; var1.riddenByEntity.ridingEntity = null;
} }
@ -945,10 +946,10 @@ public abstract class Entity {
protected void setFlag(int var1, boolean var2) { protected void setFlag(int var1, boolean var2) {
byte var3 = this.dataWatcher.getWatchableObjectByte(0); byte var3 = this.dataWatcher.getWatchableObjectByte(0);
if(var2) { if (var2) {
this.dataWatcher.updateObject(0, Byte.valueOf((byte)(var3 | 1 << var1))); this.dataWatcher.updateObject(0, Byte.valueOf((byte) (var3 | 1 << var1)));
} else { } else {
this.dataWatcher.updateObject(0, Byte.valueOf((byte)(var3 & ~(1 << var1)))); this.dataWatcher.updateObject(0, Byte.valueOf((byte) (var3 & ~(1 << var1))));
} }
} }
@ -956,7 +957,7 @@ public abstract class Entity {
public void onStruckByLightning(EntityLightningBolt var1) { public void onStruckByLightning(EntityLightningBolt var1) {
this.dealFireDamage(5); this.dealFireDamage(5);
++this.fire; ++this.fire;
if(this.fire == 0) { if (this.fire == 0) {
this.fire = 300; this.fire = 300;
} }
@ -969,10 +970,10 @@ public abstract class Entity {
int var7 = MathHelper.floor_double(var1); int var7 = MathHelper.floor_double(var1);
int var8 = MathHelper.floor_double(var3); int var8 = MathHelper.floor_double(var3);
int var9 = MathHelper.floor_double(var5); int var9 = MathHelper.floor_double(var5);
double var10 = var1 - (double)var7; double var10 = var1 - (double) var7;
double var12 = var3 - (double)var8; double var12 = var3 - (double) var8;
double var14 = var5 - (double)var9; double var14 = var5 - (double) var9;
if(this.worldObj.isBlockNormalCube(var7, var8, var9)) { if (this.worldObj.isBlockNormalCube(var7, var8, var9)) {
boolean var16 = !this.worldObj.isBlockNormalCube(var7 - 1, var8, var9); boolean var16 = !this.worldObj.isBlockNormalCube(var7 - 1, var8, var9);
boolean var17 = !this.worldObj.isBlockNormalCube(var7 + 1, var8, var9); boolean var17 = !this.worldObj.isBlockNormalCube(var7 + 1, var8, var9);
boolean var18 = !this.worldObj.isBlockNormalCube(var7, var8 - 1, var9); boolean var18 = !this.worldObj.isBlockNormalCube(var7, var8 - 1, var9);
@ -981,59 +982,59 @@ public abstract class Entity {
boolean var21 = !this.worldObj.isBlockNormalCube(var7, var8, var9 + 1); boolean var21 = !this.worldObj.isBlockNormalCube(var7, var8, var9 + 1);
byte var22 = -1; byte var22 = -1;
double var23 = 9999.0D; double var23 = 9999.0D;
if(var16 && var10 < var23) { if (var16 && var10 < var23) {
var23 = var10; var23 = var10;
var22 = 0; var22 = 0;
} }
if(var17 && 1.0D - var10 < var23) { if (var17 && 1.0D - var10 < var23) {
var23 = 1.0D - var10; var23 = 1.0D - var10;
var22 = 1; var22 = 1;
} }
if(var18 && var12 < var23) { if (var18 && var12 < var23) {
var23 = var12; var23 = var12;
var22 = 2; var22 = 2;
} }
if(var19 && 1.0D - var12 < var23) { if (var19 && 1.0D - var12 < var23) {
var23 = 1.0D - var12; var23 = 1.0D - var12;
var22 = 3; var22 = 3;
} }
if(var20 && var14 < var23) { if (var20 && var14 < var23) {
var23 = var14; var23 = var14;
var22 = 4; var22 = 4;
} }
if(var21 && 1.0D - var14 < var23) { if (var21 && 1.0D - var14 < var23) {
var23 = 1.0D - var14; var23 = 1.0D - var14;
var22 = 5; var22 = 5;
} }
float var25 = this.rand.nextFloat() * 0.2F + 0.1F; float var25 = this.rand.nextFloat() * 0.2F + 0.1F;
if(var22 == 0) { if (var22 == 0) {
this.motionX = (double)(-var25); this.motionX = (double) (-var25);
} }
if(var22 == 1) { if (var22 == 1) {
this.motionX = (double)var25; this.motionX = (double) var25;
} }
if(var22 == 2) { if (var22 == 2) {
this.motionY = (double)(-var25); this.motionY = (double) (-var25);
} }
if(var22 == 3) { if (var22 == 3) {
this.motionY = (double)var25; this.motionY = (double) var25;
} }
if(var22 == 4) { if (var22 == 4) {
this.motionZ = (double)(-var25); this.motionZ = (double) (-var25);
} }
if(var22 == 5) { if (var22 == 5) {
this.motionZ = (double)var25; this.motionZ = (double) var25;
} }
} }

145
src/net/minecraft/entity/EntityArrow.java
View file

@ -1,6 +1,5 @@
package net.minecraft.entity; package net.minecraft.entity;
import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.crafting.ItemStack; import net.minecraft.item.crafting.ItemStack;
@ -11,6 +10,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.List;
public class EntityArrow extends Entity { public class EntityArrow extends Entity {
private int xTile = -1; private int xTile = -1;
private int yTile = -1; private int yTile = -1;
@ -41,15 +42,15 @@ public class EntityArrow extends Entity {
this.owner = var2; this.owner = var2;
this.field_28012_a = var2 instanceof EntityPlayer; this.field_28012_a = var2 instanceof EntityPlayer;
this.setSize(0.5F, 0.5F); this.setSize(0.5F, 0.5F);
this.setLocationAndAngles(var2.posX, var2.posY + (double)var2.getEyeHeight(), var2.posZ, var2.rotationYaw, var2.rotationPitch); this.setLocationAndAngles(var2.posX, var2.posY + (double) var2.getEyeHeight(), var2.posZ, var2.rotationYaw, var2.rotationPitch);
this.posX -= (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F);
this.posY -= (double)0.1F; this.posY -= (double) 0.1F;
this.posZ -= (double)(MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F);
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
this.yOffset = 0.0F; this.yOffset = 0.0F;
this.motionX = (double)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI)); this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI));
this.motionZ = (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI)); this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI));
this.motionY = (double)(-MathHelper.sin(this.rotationPitch / 180.0F * (float)Math.PI)); this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI));
this.setArrowHeading(this.motionX, this.motionY, this.motionZ, 1.5F, 1.0F); this.setArrowHeading(this.motionX, this.motionY, this.motionZ, 1.5F, 1.0F);
} }
@ -58,59 +59,59 @@ public class EntityArrow extends Entity {
public void setArrowHeading(double var1, double var3, double var5, float var7, float var8) { public void setArrowHeading(double var1, double var3, double var5, float var7, float var8) {
float var9 = MathHelper.sqrt_double(var1 * var1 + var3 * var3 + var5 * var5); float var9 = MathHelper.sqrt_double(var1 * var1 + var3 * var3 + var5 * var5);
var1 /= (double)var9; var1 /= (double) var9;
var3 /= (double)var9; var3 /= (double) var9;
var5 /= (double)var9; var5 /= (double) var9;
var1 += this.rand.nextGaussian() * (double)0.0075F * (double)var8; var1 += this.rand.nextGaussian() * (double) 0.0075F * (double) var8;
var3 += this.rand.nextGaussian() * (double)0.0075F * (double)var8; var3 += this.rand.nextGaussian() * (double) 0.0075F * (double) var8;
var5 += this.rand.nextGaussian() * (double)0.0075F * (double)var8; var5 += this.rand.nextGaussian() * (double) 0.0075F * (double) var8;
var1 *= (double)var7; var1 *= (double) var7;
var3 *= (double)var7; var3 *= (double) var7;
var5 *= (double)var7; var5 *= (double) var7;
this.motionX = var1; this.motionX = var1;
this.motionY = var3; this.motionY = var3;
this.motionZ = var5; this.motionZ = var5;
float var10 = MathHelper.sqrt_double(var1 * var1 + var5 * var5); float var10 = MathHelper.sqrt_double(var1 * var1 + var5 * var5);
this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(var1, var5) * 180.0D / (double)((float)Math.PI)); this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(var1, var5) * 180.0D / (double) ((float) Math.PI));
this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(var3, (double)var10) * 180.0D / (double)((float)Math.PI)); this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(var3, (double) var10) * 180.0D / (double) ((float) Math.PI));
this.ticksInGround = 0; this.ticksInGround = 0;
} }
public void onUpdate() { public void onUpdate() {
super.onUpdate(); super.onUpdate();
if(this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) {
float var1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); float var1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / (double)((float)Math.PI)); this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / (double) ((float) Math.PI));
this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)var1) * 180.0D / (double)((float)Math.PI)); this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, (double) var1) * 180.0D / (double) ((float) Math.PI));
} }
int var15 = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile); int var15 = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile);
if(var15 > 0) { if (var15 > 0) {
Block.blocksList[var15].setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile); Block.blocksList[var15].setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile);
AxisAlignedBB var2 = Block.blocksList[var15].getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile); AxisAlignedBB var2 = Block.blocksList[var15].getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile);
if(var2 != null && var2.isVecInXYZ(Vec3D.createVector(this.posX, this.posY, this.posZ))) { if (var2 != null && var2.isVecInXYZ(Vec3D.createVector(this.posX, this.posY, this.posZ))) {
this.inGround = true; this.inGround = true;
} }
} }
if(this.arrowShake > 0) { if (this.arrowShake > 0) {
--this.arrowShake; --this.arrowShake;
} }
if(this.inGround) { if (this.inGround) {
var15 = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile); var15 = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile);
int var18 = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); int var18 = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile);
if(var15 == this.inTile && var18 == this.field_28011_h) { if (var15 == this.inTile && var18 == this.field_28011_h) {
++this.ticksInGround; ++this.ticksInGround;
if(this.ticksInGround == 1200) { if (this.ticksInGround == 1200) {
this.setEntityDead(); this.setEntityDead();
} }
} else { } else {
this.inGround = false; this.inGround = false;
this.motionX *= (double)(this.rand.nextFloat() * 0.2F); this.motionX *= (double) (this.rand.nextFloat() * 0.2F);
this.motionY *= (double)(this.rand.nextFloat() * 0.2F); this.motionY *= (double) (this.rand.nextFloat() * 0.2F);
this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); this.motionZ *= (double) (this.rand.nextFloat() * 0.2F);
this.ticksInGround = 0; this.ticksInGround = 0;
this.ticksInAir = 0; this.ticksInAir = 0;
} }
@ -121,7 +122,7 @@ public class EntityArrow extends Entity {
MovingObjectPosition var3 = this.worldObj.func_28099_a(var16, var17, false, true); MovingObjectPosition var3 = this.worldObj.func_28099_a(var16, var17, false, true);
var16 = Vec3D.createVector(this.posX, this.posY, this.posZ); var16 = Vec3D.createVector(this.posX, this.posY, this.posZ);
var17 = Vec3D.createVector(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); var17 = Vec3D.createVector(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
if(var3 != null) { if (var3 != null) {
var17 = Vec3D.createVector(var3.hitVec.xCoord, var3.hitVec.yCoord, var3.hitVec.zCoord); var17 = Vec3D.createVector(var3.hitVec.xCoord, var3.hitVec.yCoord, var3.hitVec.zCoord);
} }
@ -130,15 +131,15 @@ public class EntityArrow extends Entity {
double var6 = 0.0D; double var6 = 0.0D;
float var10; float var10;
for(int var8 = 0; var8 < var5.size(); ++var8) { for (int var8 = 0; var8 < var5.size(); ++var8) {
Entity var9 = (Entity)var5.get(var8); Entity var9 = (Entity) var5.get(var8);
if(var9.canBeCollidedWith() && (var9 != this.owner || this.ticksInAir >= 5)) { if (var9.canBeCollidedWith() && (var9 != this.owner || this.ticksInAir >= 5)) {
var10 = 0.3F; var10 = 0.3F;
AxisAlignedBB var11 = var9.boundingBox.expand((double)var10, (double)var10, (double)var10); AxisAlignedBB var11 = var9.boundingBox.expand((double) var10, (double) var10, (double) var10);
MovingObjectPosition var12 = var11.func_706_a(var16, var17); MovingObjectPosition var12 = var11.func_706_a(var16, var17);
if(var12 != null) { if (var12 != null) {
double var13 = var16.distanceTo(var12.hitVec); double var13 = var16.distanceTo(var12.hitVec);
if(var13 < var6 || var6 == 0.0D) { if (var13 < var6 || var6 == 0.0D) {
var4 = var9; var4 = var9;
var6 = var13; var6 = var13;
} }
@ -146,20 +147,20 @@ public class EntityArrow extends Entity {
} }
} }
if(var4 != null) { if (var4 != null) {
var3 = new MovingObjectPosition(var4); var3 = new MovingObjectPosition(var4);
} }
float var19; float var19;
if(var3 != null) { if (var3 != null) {
if(var3.entityHit != null) { if (var3.entityHit != null) {
if(var3.entityHit.attackEntityFrom(this.owner, 4)) { if (var3.entityHit.attackEntityFrom(this.owner, 4)) {
this.worldObj.playSoundAtEntity(this, "random.drr", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); this.worldObj.playSoundAtEntity(this, "random.drr", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F));
this.setEntityDead(); this.setEntityDead();
} else { } else {
this.motionX *= (double)-0.1F; this.motionX *= (double) -0.1F;
this.motionY *= (double)-0.1F; this.motionY *= (double) -0.1F;
this.motionZ *= (double)-0.1F; this.motionZ *= (double) -0.1F;
this.rotationYaw += 180.0F; this.rotationYaw += 180.0F;
this.prevRotationYaw += 180.0F; this.prevRotationYaw += 180.0F;
this.ticksInAir = 0; this.ticksInAir = 0;
@ -170,13 +171,13 @@ public class EntityArrow extends Entity {
this.zTile = var3.blockZ; this.zTile = var3.blockZ;
this.inTile = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile); this.inTile = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile);
this.field_28011_h = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); this.field_28011_h = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile);
this.motionX = (double)((float)(var3.hitVec.xCoord - this.posX)); this.motionX = (double) ((float) (var3.hitVec.xCoord - this.posX));
this.motionY = (double)((float)(var3.hitVec.yCoord - this.posY)); this.motionY = (double) ((float) (var3.hitVec.yCoord - this.posY));
this.motionZ = (double)((float)(var3.hitVec.zCoord - this.posZ)); this.motionZ = (double) ((float) (var3.hitVec.zCoord - this.posZ));
var19 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); var19 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ);
this.posX -= this.motionX / (double)var19 * (double)0.05F; this.posX -= this.motionX / (double) var19 * (double) 0.05F;
this.posY -= this.motionY / (double)var19 * (double)0.05F; this.posY -= this.motionY / (double) var19 * (double) 0.05F;
this.posZ -= this.motionZ / (double)var19 * (double)0.05F; this.posZ -= this.motionZ / (double) var19 * (double) 0.05F;
this.worldObj.playSoundAtEntity(this, "random.drr", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); this.worldObj.playSoundAtEntity(this, "random.drr", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F));
this.inGround = true; this.inGround = true;
this.arrowShake = 7; this.arrowShake = 7;
@ -187,20 +188,20 @@ public class EntityArrow extends Entity {
this.posY += this.motionY; this.posY += this.motionY;
this.posZ += this.motionZ; this.posZ += this.motionZ;
var19 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); var19 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / (double)((float)Math.PI)); this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / (double) ((float) Math.PI));
for(this.rotationPitch = (float)(Math.atan2(this.motionY, (double)var19) * 180.0D / (double)((float)Math.PI)); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) var19) * 180.0D / (double) ((float) Math.PI)); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {
} }
while(this.rotationPitch - this.prevRotationPitch >= 180.0F) { while (this.rotationPitch - this.prevRotationPitch >= 180.0F) {
this.prevRotationPitch += 360.0F; this.prevRotationPitch += 360.0F;
} }
while(this.rotationYaw - this.prevRotationYaw < -180.0F) { while (this.rotationYaw - this.prevRotationYaw < -180.0F) {
this.prevRotationYaw -= 360.0F; this.prevRotationYaw -= 360.0F;
} }
while(this.rotationYaw - this.prevRotationYaw >= 180.0F) { while (this.rotationYaw - this.prevRotationYaw >= 180.0F) {
this.prevRotationYaw += 360.0F; this.prevRotationYaw += 360.0F;
} }
@ -208,31 +209,31 @@ public class EntityArrow extends Entity {
this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F;
float var20 = 0.99F; float var20 = 0.99F;
var10 = 0.03F; var10 = 0.03F;
if(this.isInWater()) { if (this.isInWater()) {
for(int var21 = 0; var21 < 4; ++var21) { for (int var21 = 0; var21 < 4; ++var21) {
float var22 = 0.25F; float var22 = 0.25F;
this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double)var22, this.posY - this.motionY * (double)var22, this.posZ - this.motionZ * (double)var22, this.motionX, this.motionY, this.motionZ); this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double) var22, this.posY - this.motionY * (double) var22, this.posZ - this.motionZ * (double) var22, this.motionX, this.motionY, this.motionZ);
} }
var20 = 0.8F; var20 = 0.8F;
} }
this.motionX *= (double)var20; this.motionX *= (double) var20;
this.motionY *= (double)var20; this.motionY *= (double) var20;
this.motionZ *= (double)var20; this.motionZ *= (double) var20;
this.motionY -= (double)var10; this.motionY -= (double) var10;
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
} }
} }
public void writeEntityToNBT(NBTTagCompound var1) { public void writeEntityToNBT(NBTTagCompound var1) {
var1.setShort("xTile", (short)this.xTile); var1.setShort("xTile", (short) this.xTile);
var1.setShort("yTile", (short)this.yTile); var1.setShort("yTile", (short) this.yTile);
var1.setShort("zTile", (short)this.zTile); var1.setShort("zTile", (short) this.zTile);
var1.setByte("inTile", (byte)this.inTile); var1.setByte("inTile", (byte) this.inTile);
var1.setByte("inData", (byte)this.field_28011_h); var1.setByte("inData", (byte) this.field_28011_h);
var1.setByte("shake", (byte)this.arrowShake); var1.setByte("shake", (byte) this.arrowShake);
var1.setByte("inGround", (byte)(this.inGround ? 1 : 0)); var1.setByte("inGround", (byte) (this.inGround ? 1 : 0));
var1.setBoolean("player", this.field_28012_a); var1.setBoolean("player", this.field_28012_a);
} }
@ -248,8 +249,8 @@ public class EntityArrow extends Entity {
} }
public void onCollideWithPlayer(EntityPlayer var1) { public void onCollideWithPlayer(EntityPlayer var1) {
if(!this.worldObj.singleplayerWorld) { if (!this.worldObj.singleplayerWorld) {
if(this.inGround && this.field_28012_a && this.arrowShake <= 0 && var1.inventory.addItemStackToInventory(new ItemStack(Item.arrow, 1))) { if (this.inGround && this.field_28012_a && this.arrowShake <= 0 && var1.inventory.addItemStackToInventory(new ItemStack(Item.arrow, 1))) {
this.worldObj.playSoundAtEntity(this, "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); this.worldObj.playSoundAtEntity(this, "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
var1.onItemPickup(this, 1); var1.onItemPickup(this, 1);
this.setEntityDead(); this.setEntityDead();

151
src/net/minecraft/entity/EntityBoat.java
View file

@ -1,6 +1,5 @@
package net.minecraft.entity; package net.minecraft.entity;
import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -9,6 +8,8 @@ import net.minecraft.math.MathHelper;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.List;
public class EntityBoat extends Entity { public class EntityBoat extends Entity {
public int damageTaken; public int damageTaken;
public int field_9177_b; public int field_9177_b;
@ -51,7 +52,7 @@ public class EntityBoat extends Entity {
public EntityBoat(World var1, double var2, double var4, double var6) { public EntityBoat(World var1, double var2, double var4, double var6) {
this(var1); this(var1);
this.setPosition(var2, var4 + (double)this.yOffset, var6); this.setPosition(var2, var4 + (double) this.yOffset, var6);
this.motionX = 0.0D; this.motionX = 0.0D;
this.motionY = 0.0D; this.motionY = 0.0D;
this.motionZ = 0.0D; this.motionZ = 0.0D;
@ -61,26 +62,26 @@ public class EntityBoat extends Entity {
} }
public double getMountedYOffset() { public double getMountedYOffset() {
return (double)this.height * 0.0D - (double)0.3F; return (double) this.height * 0.0D - (double) 0.3F;
} }
public boolean attackEntityFrom(Entity var1, int var2) { public boolean attackEntityFrom(Entity var1, int var2) {
if(!this.worldObj.singleplayerWorld && !this.isDead) { if (!this.worldObj.singleplayerWorld && !this.isDead) {
this.forwardDirection = -this.forwardDirection; this.forwardDirection = -this.forwardDirection;
this.field_9177_b = 10; this.field_9177_b = 10;
this.damageTaken += var2 * 10; this.damageTaken += var2 * 10;
this.setBeenAttacked(); this.setBeenAttacked();
if(this.damageTaken > 40) { if (this.damageTaken > 40) {
if(this.riddenByEntity != null) { if (this.riddenByEntity != null) {
this.riddenByEntity.mountEntity(this); this.riddenByEntity.mountEntity(this);
} }
int var3; int var3;
for(var3 = 0; var3 < 3; ++var3) { for (var3 = 0; var3 < 3; ++var3) {
this.dropItemWithOffset(Block.planks.blockID, 1, 0.0F); this.dropItemWithOffset(Block.planks.blockID, 1, 0.0F);
} }
for(var3 = 0; var3 < 2; ++var3) { for (var3 = 0; var3 < 2; ++var3) {
this.dropItemWithOffset(Item.stick.shiftedIndex, 1, 0.0F); this.dropItemWithOffset(Item.stick.shiftedIndex, 1, 0.0F);
} }
@ -99,11 +100,11 @@ public class EntityBoat extends Entity {
public void onUpdate() { public void onUpdate() {
super.onUpdate(); super.onUpdate();
if(this.field_9177_b > 0) { if (this.field_9177_b > 0) {
--this.field_9177_b; --this.field_9177_b;
} }
if(this.damageTaken > 0) { if (this.damageTaken > 0) {
--this.damageTaken; --this.damageTaken;
} }
@ -113,12 +114,12 @@ public class EntityBoat extends Entity {
byte var1 = 5; byte var1 = 5;
double var2 = 0.0D; double var2 = 0.0D;
for(int var4 = 0; var4 < var1; ++var4) { for (int var4 = 0; var4 < var1; ++var4) {
double var5 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (double)(var4 + 0) / (double)var1 - 0.125D; double var5 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (double) (var4 + 0) / (double) var1 - 0.125D;
double var7 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (double)(var4 + 1) / (double)var1 - 0.125D; double var7 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (double) (var4 + 1) / (double) var1 - 0.125D;
AxisAlignedBB var9 = AxisAlignedBB.getBoundingBoxFromPool(this.boundingBox.minX, var5, this.boundingBox.minZ, this.boundingBox.maxX, var7, this.boundingBox.maxZ); AxisAlignedBB var9 = AxisAlignedBB.getBoundingBoxFromPool(this.boundingBox.minX, var5, this.boundingBox.minZ, this.boundingBox.maxX, var7, this.boundingBox.maxZ);
if(this.worldObj.isAABBInMaterial(var9, Material.water)) { if (this.worldObj.isAABBInMaterial(var9, Material.water)) {
var2 += 1.0D / (double)var1; var2 += 1.0D / (double) var1;
} }
} }
@ -126,21 +127,21 @@ public class EntityBoat extends Entity {
double var8; double var8;
double var10; double var10;
double var21; double var21;
if(this.worldObj.singleplayerWorld) { if (this.worldObj.singleplayerWorld) {
if(this.field_9176_d > 0) { if (this.field_9176_d > 0) {
var21 = this.posX + (this.field_9174_e - this.posX) / (double)this.field_9176_d; var21 = this.posX + (this.field_9174_e - this.posX) / (double) this.field_9176_d;
var6 = this.posY + (this.field_9172_f - this.posY) / (double)this.field_9176_d; var6 = this.posY + (this.field_9172_f - this.posY) / (double) this.field_9176_d;
var8 = this.posZ + (this.field_9175_aj - this.posZ) / (double)this.field_9176_d; var8 = this.posZ + (this.field_9175_aj - this.posZ) / (double) this.field_9176_d;
for(var10 = this.field_9173_ak - (double)this.rotationYaw; var10 < -180.0D; var10 += 360.0D) { for (var10 = this.field_9173_ak - (double) this.rotationYaw; var10 < -180.0D; var10 += 360.0D) {
} }
while(var10 >= 180.0D) { while (var10 >= 180.0D) {
var10 -= 360.0D; var10 -= 360.0D;
} }
this.rotationYaw = (float)((double)this.rotationYaw + var10 / (double)this.field_9176_d); this.rotationYaw = (float) ((double) this.rotationYaw + var10 / (double) this.field_9176_d);
this.rotationPitch = (float)((double)this.rotationPitch + (this.field_9171_al - (double)this.rotationPitch) / (double)this.field_9176_d); this.rotationPitch = (float) ((double) this.rotationPitch + (this.field_9171_al - (double) this.rotationPitch) / (double) this.field_9176_d);
--this.field_9176_d; --this.field_9176_d;
this.setPosition(var21, var6, var8); this.setPosition(var21, var6, var8);
this.setRotation(this.rotationYaw, this.rotationPitch); this.setRotation(this.rotationYaw, this.rotationPitch);
@ -149,52 +150,52 @@ public class EntityBoat extends Entity {
var6 = this.posY + this.motionY; var6 = this.posY + this.motionY;
var8 = this.posZ + this.motionZ; var8 = this.posZ + this.motionZ;
this.setPosition(var21, var6, var8); this.setPosition(var21, var6, var8);
if(this.onGround) { if (this.onGround) {
this.motionX *= 0.5D; this.motionX *= 0.5D;
this.motionY *= 0.5D; this.motionY *= 0.5D;
this.motionZ *= 0.5D; this.motionZ *= 0.5D;
} }
this.motionX *= (double)0.99F; this.motionX *= (double) 0.99F;
this.motionY *= (double)0.95F; this.motionY *= (double) 0.95F;
this.motionZ *= (double)0.99F; this.motionZ *= (double) 0.99F;
} }
} else { } else {
if(var2 < 1.0D) { if (var2 < 1.0D) {
var21 = var2 * 2.0D - 1.0D; var21 = var2 * 2.0D - 1.0D;
this.motionY += (double)0.04F * var21; this.motionY += (double) 0.04F * var21;
} else { } else {
if(this.motionY < 0.0D) { if (this.motionY < 0.0D) {
this.motionY /= 2.0D; this.motionY /= 2.0D;
} }
this.motionY += (double)0.007F; this.motionY += (double) 0.007F;
} }
if(this.riddenByEntity != null) { if (this.riddenByEntity != null) {
this.motionX += this.riddenByEntity.motionX * 0.2D; this.motionX += this.riddenByEntity.motionX * 0.2D;
this.motionZ += this.riddenByEntity.motionZ * 0.2D; this.motionZ += this.riddenByEntity.motionZ * 0.2D;
} }
var21 = 0.4D; var21 = 0.4D;
if(this.motionX < -var21) { if (this.motionX < -var21) {
this.motionX = -var21; this.motionX = -var21;
} }
if(this.motionX > var21) { if (this.motionX > var21) {
this.motionX = var21; this.motionX = var21;
} }
if(this.motionZ < -var21) { if (this.motionZ < -var21) {
this.motionZ = -var21; this.motionZ = -var21;
} }
if(this.motionZ > var21) { if (this.motionZ > var21) {
this.motionZ = var21; this.motionZ = var21;
} }
if(this.onGround) { if (this.onGround) {
this.motionX *= 0.5D; this.motionX *= 0.5D;
this.motionY *= 0.5D; this.motionY *= 0.5D;
this.motionZ *= 0.5D; this.motionZ *= 0.5D;
@ -202,16 +203,16 @@ public class EntityBoat extends Entity {
this.moveEntity(this.motionX, this.motionY, this.motionZ); this.moveEntity(this.motionX, this.motionY, this.motionZ);
var6 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); var6 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
if(var6 > 0.15D) { if (var6 > 0.15D) {
var8 = Math.cos((double)this.rotationYaw * Math.PI / 180.0D); var8 = Math.cos((double) this.rotationYaw * Math.PI / 180.0D);
var10 = Math.sin((double)this.rotationYaw * Math.PI / 180.0D); var10 = Math.sin((double) this.rotationYaw * Math.PI / 180.0D);
for(int var12 = 0; (double)var12 < 1.0D + var6 * 60.0D; ++var12) { for (int var12 = 0; (double) var12 < 1.0D + var6 * 60.0D; ++var12) {
double var13 = (double)(this.rand.nextFloat() * 2.0F - 1.0F); double var13 = (double) (this.rand.nextFloat() * 2.0F - 1.0F);
double var15 = (double)(this.rand.nextInt(2) * 2 - 1) * 0.7D; double var15 = (double) (this.rand.nextInt(2) * 2 - 1) * 0.7D;
double var17; double var17;
double var19; double var19;
if(this.rand.nextBoolean()) { if (this.rand.nextBoolean()) {
var17 = this.posX - var8 * var13 * 0.8D + var10 * var15; var17 = this.posX - var8 * var13 * 0.8D + var10 * var15;
var19 = this.posZ - var10 * var13 * 0.8D - var8 * var15; var19 = this.posZ - var10 * var13 * 0.8D - var8 * var15;
this.worldObj.spawnParticle("splash", var17, this.posY - 0.125D, var19, this.motionX, this.motionY, this.motionZ); this.worldObj.spawnParticle("splash", var17, this.posY - 0.125D, var19, this.motionX, this.motionY, this.motionZ);
@ -223,72 +224,72 @@ public class EntityBoat extends Entity {
} }
} }
if(this.isCollidedHorizontally && var6 > 0.15D) { if (this.isCollidedHorizontally && var6 > 0.15D) {
if(!this.worldObj.singleplayerWorld) { if (!this.worldObj.singleplayerWorld) {
this.setEntityDead(); this.setEntityDead();
int var22; int var22;
for(var22 = 0; var22 < 3; ++var22) { for (var22 = 0; var22 < 3; ++var22) {
this.dropItemWithOffset(Block.planks.blockID, 1, 0.0F); this.dropItemWithOffset(Block.planks.blockID, 1, 0.0F);
} }
for(var22 = 0; var22 < 2; ++var22) { for (var22 = 0; var22 < 2; ++var22) {
this.dropItemWithOffset(Item.stick.shiftedIndex, 1, 0.0F); this.dropItemWithOffset(Item.stick.shiftedIndex, 1, 0.0F);
} }
} }
} else { } else {
this.motionX *= (double)0.99F; this.motionX *= (double) 0.99F;
this.motionY *= (double)0.95F; this.motionY *= (double) 0.95F;
this.motionZ *= (double)0.99F; this.motionZ *= (double) 0.99F;
} }
this.rotationPitch = 0.0F; this.rotationPitch = 0.0F;
var8 = (double)this.rotationYaw; var8 = (double) this.rotationYaw;
var10 = this.prevPosX - this.posX; var10 = this.prevPosX - this.posX;
double var23 = this.prevPosZ - this.posZ; double var23 = this.prevPosZ - this.posZ;
if(var10 * var10 + var23 * var23 > 0.001D) { if (var10 * var10 + var23 * var23 > 0.001D) {
var8 = (double)((float)(Math.atan2(var23, var10) * 180.0D / Math.PI)); var8 = (double) ((float) (Math.atan2(var23, var10) * 180.0D / Math.PI));
} }
double var14; double var14;
for(var14 = var8 - (double)this.rotationYaw; var14 >= 180.0D; var14 -= 360.0D) { for (var14 = var8 - (double) this.rotationYaw; var14 >= 180.0D; var14 -= 360.0D) {
} }
while(var14 < -180.0D) { while (var14 < -180.0D) {
var14 += 360.0D; var14 += 360.0D;
} }
if(var14 > 20.0D) { if (var14 > 20.0D) {
var14 = 20.0D; var14 = 20.0D;
} }
if(var14 < -20.0D) { if (var14 < -20.0D) {
var14 = -20.0D; var14 = -20.0D;
} }
this.rotationYaw = (float)((double)this.rotationYaw + var14); this.rotationYaw = (float) ((double) this.rotationYaw + var14);
this.setRotation(this.rotationYaw, this.rotationPitch); this.setRotation(this.rotationYaw, this.rotationPitch);
List var16 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.expand((double)0.2F, 0.0D, (double)0.2F)); List var16 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.expand((double) 0.2F, 0.0D, (double) 0.2F));
int var24; int var24;
if(var16 != null && var16.size() > 0) { if (var16 != null && var16.size() > 0) {
for(var24 = 0; var24 < var16.size(); ++var24) { for (var24 = 0; var24 < var16.size(); ++var24) {
Entity var18 = (Entity)var16.get(var24); Entity var18 = (Entity) var16.get(var24);
if(var18 != this.riddenByEntity && var18.canBePushed() && var18 instanceof EntityBoat) { if (var18 != this.riddenByEntity && var18.canBePushed() && var18 instanceof EntityBoat) {
var18.applyEntityCollision(this); var18.applyEntityCollision(this);
} }
} }
} }
for(var24 = 0; var24 < 4; ++var24) { for (var24 = 0; var24 < 4; ++var24) {
int var25 = MathHelper.floor_double(this.posX + ((double)(var24 % 2) - 0.5D) * 0.8D); int var25 = MathHelper.floor_double(this.posX + ((double) (var24 % 2) - 0.5D) * 0.8D);
int var26 = MathHelper.floor_double(this.posY); int var26 = MathHelper.floor_double(this.posY);
int var20 = MathHelper.floor_double(this.posZ + ((double)(var24 / 2) - 0.5D) * 0.8D); int var20 = MathHelper.floor_double(this.posZ + ((double) (var24 / 2) - 0.5D) * 0.8D);
if(this.worldObj.getBlockId(var25, var26, var20) == Block.snow.blockID) { if (this.worldObj.getBlockId(var25, var26, var20) == Block.snow.blockID) {
this.worldObj.setBlockWithNotify(var25, var26, var20, 0); this.worldObj.setBlockWithNotify(var25, var26, var20, 0);
} }
} }
if(this.riddenByEntity != null && this.riddenByEntity.isDead) { if (this.riddenByEntity != null && this.riddenByEntity.isDead) {
this.riddenByEntity = null; this.riddenByEntity = null;
} }
@ -296,9 +297,9 @@ public class EntityBoat extends Entity {
} }
public void updateRiderPosition() { public void updateRiderPosition() {
if(this.riddenByEntity != null) { if (this.riddenByEntity != null) {
double var1 = Math.cos((double)this.rotationYaw * Math.PI / 180.0D) * 0.4D; double var1 = Math.cos((double) this.rotationYaw * Math.PI / 180.0D) * 0.4D;
double var3 = Math.sin((double)this.rotationYaw * Math.PI / 180.0D) * 0.4D; double var3 = Math.sin((double) this.rotationYaw * Math.PI / 180.0D) * 0.4D;
this.riddenByEntity.setPosition(this.posX + var1, this.posY + this.getMountedYOffset() + this.riddenByEntity.getYOffset(), this.posZ + var3); this.riddenByEntity.setPosition(this.posX + var1, this.posY + this.getMountedYOffset() + this.riddenByEntity.getYOffset(), this.posZ + var3);
} }
} }
@ -310,10 +311,10 @@ public class EntityBoat extends Entity {
} }
public boolean interact(EntityPlayer var1) { public boolean interact(EntityPlayer var1) {
if(this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != var1) { if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != var1) {
return true; return true;
} else { } else {
if(!this.worldObj.singleplayerWorld) { if (!this.worldObj.singleplayerWorld) {
var1.mountEntity(this); var1.mountEntity(this);
} }

14
src/net/minecraft/entity/EntityChicken.java
View file

@ -25,26 +25,26 @@ public class EntityChicken extends EntityAnimal {
super.onLivingUpdate(); super.onLivingUpdate();
this.field_393_af = this.field_391_b; this.field_393_af = this.field_391_b;
this.field_394_ae = this.field_395_ad; this.field_394_ae = this.field_395_ad;
this.field_395_ad = (float)((double)this.field_395_ad + (double)(this.onGround ? -1 : 4) * 0.3D); this.field_395_ad = (float) ((double) this.field_395_ad + (double) (this.onGround ? -1 : 4) * 0.3D);
if(this.field_395_ad < 0.0F) { if (this.field_395_ad < 0.0F) {
this.field_395_ad = 0.0F; this.field_395_ad = 0.0F;
} }
if(this.field_395_ad > 1.0F) { if (this.field_395_ad > 1.0F) {
this.field_395_ad = 1.0F; this.field_395_ad = 1.0F;
} }
if(!this.onGround && this.field_390_ai < 1.0F) { if (!this.onGround && this.field_390_ai < 1.0F) {
this.field_390_ai = 1.0F; this.field_390_ai = 1.0F;
} }
this.field_390_ai = (float)((double)this.field_390_ai * 0.9D); this.field_390_ai = (float) ((double) this.field_390_ai * 0.9D);
if(!this.onGround && this.motionY < 0.0D) { if (!this.onGround && this.motionY < 0.0D) {
this.motionY *= 0.6D; this.motionY *= 0.6D;
} }
this.field_391_b += this.field_390_ai * 2.0F; this.field_391_b += this.field_390_ai * 2.0F;
if(!this.worldObj.singleplayerWorld && --this.timeUntilNextEgg <= 0) { if (!this.worldObj.singleplayerWorld && --this.timeUntilNextEgg <= 0) {
this.worldObj.playSoundAtEntity(this, "mob.chickenplop", 1.0F, (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F); this.worldObj.playSoundAtEntity(this, "mob.chickenplop", 1.0F, (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F);
this.dropItem(Item.egg.shiftedIndex, 1); this.dropItem(Item.egg.shiftedIndex, 1);
this.timeUntilNextEgg = this.rand.nextInt(6000) + 6000; this.timeUntilNextEgg = this.rand.nextInt(6000) + 6000;

2
src/net/minecraft/entity/EntityCow.java
View file

@ -42,7 +42,7 @@ public class EntityCow extends EntityAnimal {
public boolean interact(EntityPlayer var1) { public boolean interact(EntityPlayer var1) {
ItemStack var2 = var1.inventory.getCurrentItem(); ItemStack var2 = var1.inventory.getCurrentItem();
if(var2 != null && var2.itemID == Item.bucketEmpty.shiftedIndex) { if (var2 != null && var2.itemID == Item.bucketEmpty.shiftedIndex) {
var1.inventory.setInventorySlotContents(var1.inventory.currentItem, new ItemStack(Item.bucketMilk)); var1.inventory.setInventorySlotContents(var1.inventory.currentItem, new ItemStack(Item.bucketMilk));
return true; return true;
} else { } else {

60
src/net/minecraft/entity/EntityCreature.java
View file

@ -21,24 +21,24 @@ public class EntityCreature extends EntityLiving {
protected void updatePlayerActionState() { protected void updatePlayerActionState() {
this.hasAttacked = this.func_25026_u(); this.hasAttacked = this.func_25026_u();
float var1 = 16.0F; float var1 = 16.0F;
if(this.playerToAttack == null) { if (this.playerToAttack == null) {
this.playerToAttack = this.findPlayerToAttack(); this.playerToAttack = this.findPlayerToAttack();
if(this.playerToAttack != null) { if (this.playerToAttack != null) {
this.pathToEntity = this.worldObj.getPathToEntity(this, this.playerToAttack, var1); this.pathToEntity = this.worldObj.getPathToEntity(this, this.playerToAttack, var1);
} }
} else if(!this.playerToAttack.isEntityAlive()) { } else if (!this.playerToAttack.isEntityAlive()) {
this.playerToAttack = null; this.playerToAttack = null;
} else { } else {
float var2 = this.playerToAttack.getDistanceToEntity(this); float var2 = this.playerToAttack.getDistanceToEntity(this);
if(this.canEntityBeSeen(this.playerToAttack)) { if (this.canEntityBeSeen(this.playerToAttack)) {
this.attackEntity(this.playerToAttack, var2); this.attackEntity(this.playerToAttack, var2);
} else { } else {
this.func_28013_b(this.playerToAttack, var2); this.func_28013_b(this.playerToAttack, var2);
} }
} }
if(this.hasAttacked || this.playerToAttack == null || this.pathToEntity != null && this.rand.nextInt(20) != 0) { if (this.hasAttacked || this.playerToAttack == null || this.pathToEntity != null && this.rand.nextInt(20) != 0) {
if(!this.hasAttacked && (this.pathToEntity == null && this.rand.nextInt(80) == 0 || this.rand.nextInt(80) == 0)) { if (!this.hasAttacked && (this.pathToEntity == null && this.rand.nextInt(80) == 0 || this.rand.nextInt(80) == 0)) {
this.func_31021_B(); this.func_31021_B();
} }
} else { } else {
@ -49,13 +49,13 @@ public class EntityCreature extends EntityLiving {
boolean var3 = this.isInWater(); boolean var3 = this.isInWater();
boolean var4 = this.handleLavaMovement(); boolean var4 = this.handleLavaMovement();
this.rotationPitch = 0.0F; this.rotationPitch = 0.0F;
if(this.pathToEntity != null && this.rand.nextInt(100) != 0) { if (this.pathToEntity != null && this.rand.nextInt(100) != 0) {
Vec3D var5 = this.pathToEntity.getPosition(this); Vec3D var5 = this.pathToEntity.getPosition(this);
double var6 = (double)(this.width * 2.0F); double var6 = (double) (this.width * 2.0F);
while(var5 != null && var5.squareDistanceTo(this.posX, var5.yCoord, this.posZ) < var6 * var6) { while (var5 != null && var5.squareDistanceTo(this.posX, var5.yCoord, this.posZ) < var6 * var6) {
this.pathToEntity.incrementPathIndex(); this.pathToEntity.incrementPathIndex();
if(this.pathToEntity.isFinished()) { if (this.pathToEntity.isFinished()) {
var5 = null; var5 = null;
this.pathToEntity = null; this.pathToEntity = null;
} else { } else {
@ -64,53 +64,53 @@ public class EntityCreature extends EntityLiving {
} }
this.isJumping = false; this.isJumping = false;
if(var5 != null) { if (var5 != null) {
double var8 = var5.xCoord - this.posX; double var8 = var5.xCoord - this.posX;
double var10 = var5.zCoord - this.posZ; double var10 = var5.zCoord - this.posZ;
double var12 = var5.yCoord - (double)var21; double var12 = var5.yCoord - (double) var21;
float var14 = (float)(Math.atan2(var10, var8) * 180.0D / (double)((float)Math.PI)) - 90.0F; float var14 = (float) (Math.atan2(var10, var8) * 180.0D / (double) ((float) Math.PI)) - 90.0F;
float var15 = var14 - this.rotationYaw; float var15 = var14 - this.rotationYaw;
for(this.moveForward = this.moveSpeed; var15 < -180.0F; var15 += 360.0F) { for (this.moveForward = this.moveSpeed; var15 < -180.0F; var15 += 360.0F) {
} }
while(var15 >= 180.0F) { while (var15 >= 180.0F) {
var15 -= 360.0F; var15 -= 360.0F;
} }
if(var15 > 30.0F) { if (var15 > 30.0F) {
var15 = 30.0F; var15 = 30.0F;
} }
if(var15 < -30.0F) { if (var15 < -30.0F) {
var15 = -30.0F; var15 = -30.0F;
} }
this.rotationYaw += var15; this.rotationYaw += var15;
if(this.hasAttacked && this.playerToAttack != null) { if (this.hasAttacked && this.playerToAttack != null) {
double var16 = this.playerToAttack.posX - this.posX; double var16 = this.playerToAttack.posX - this.posX;
double var18 = this.playerToAttack.posZ - this.posZ; double var18 = this.playerToAttack.posZ - this.posZ;
float var20 = this.rotationYaw; float var20 = this.rotationYaw;
this.rotationYaw = (float)(Math.atan2(var18, var16) * 180.0D / (double)((float)Math.PI)) - 90.0F; this.rotationYaw = (float) (Math.atan2(var18, var16) * 180.0D / (double) ((float) Math.PI)) - 90.0F;
var15 = (var20 - this.rotationYaw + 90.0F) * (float)Math.PI / 180.0F; var15 = (var20 - this.rotationYaw + 90.0F) * (float) Math.PI / 180.0F;
this.moveStrafing = -MathHelper.sin(var15) * this.moveForward * 1.0F; this.moveStrafing = -MathHelper.sin(var15) * this.moveForward * 1.0F;
this.moveForward = MathHelper.cos(var15) * this.moveForward * 1.0F; this.moveForward = MathHelper.cos(var15) * this.moveForward * 1.0F;
} }
if(var12 > 0.0D) { if (var12 > 0.0D) {
this.isJumping = true; this.isJumping = true;
} }
} }
if(this.playerToAttack != null) { if (this.playerToAttack != null) {
this.faceEntity(this.playerToAttack, 30.0F, 30.0F); this.faceEntity(this.playerToAttack, 30.0F, 30.0F);
} }
if(this.isCollidedHorizontally && !this.getGotPath()) { if (this.isCollidedHorizontally && !this.getGotPath()) {
this.isJumping = true; this.isJumping = true;
} }
if(this.rand.nextFloat() < 0.8F && (var3 || var4)) { if (this.rand.nextFloat() < 0.8F && (var3 || var4)) {
this.isJumping = true; this.isJumping = true;
} }
@ -127,12 +127,12 @@ public class EntityCreature extends EntityLiving {
int var4 = -1; int var4 = -1;
float var5 = -99999.0F; float var5 = -99999.0F;
for(int var6 = 0; var6 < 10; ++var6) { for (int var6 = 0; var6 < 10; ++var6) {
int var7 = MathHelper.floor_double(this.posX + (double)this.rand.nextInt(13) - 6.0D); int var7 = MathHelper.floor_double(this.posX + (double) this.rand.nextInt(13) - 6.0D);
int var8 = MathHelper.floor_double(this.posY + (double)this.rand.nextInt(7) - 3.0D); int var8 = MathHelper.floor_double(this.posY + (double) this.rand.nextInt(7) - 3.0D);
int var9 = MathHelper.floor_double(this.posZ + (double)this.rand.nextInt(13) - 6.0D); int var9 = MathHelper.floor_double(this.posZ + (double) this.rand.nextInt(13) - 6.0D);
float var10 = this.getBlockPathWeight(var7, var8, var9); float var10 = this.getBlockPathWeight(var7, var8, var9);
if(var10 > var5) { if (var10 > var5) {
var5 = var10; var5 = var10;
var2 = var7; var2 = var7;
var3 = var8; var3 = var8;
@ -141,7 +141,7 @@ public class EntityCreature extends EntityLiving {
} }
} }
if(var1) { if (var1) {
this.pathToEntity = this.worldObj.getEntityPathToXYZ(this, var2, var3, var4, 10.0F); this.pathToEntity = this.worldObj.getEntityPathToXYZ(this, var2, var3, var4, 10.0F);
} }

44
src/net/minecraft/entity/EntityCreeper.java
View file

@ -15,13 +15,13 @@ public class EntityCreeper extends EntityMob {
protected void entityInit() { protected void entityInit() {
super.entityInit(); super.entityInit();
this.dataWatcher.addObject(16, Byte.valueOf((byte)-1)); this.dataWatcher.addObject(16, Byte.valueOf((byte) -1));
this.dataWatcher.addObject(17, Byte.valueOf((byte)0)); this.dataWatcher.addObject(17, Byte.valueOf((byte) 0));
} }
public void writeEntityToNBT(NBTTagCompound var1) { public void writeEntityToNBT(NBTTagCompound var1) {
super.writeEntityToNBT(var1); super.writeEntityToNBT(var1);
if(this.dataWatcher.getWatchableObjectByte(17) == 1) { if (this.dataWatcher.getWatchableObjectByte(17) == 1) {
var1.setBoolean("powered", true); var1.setBoolean("powered", true);
} }
@ -29,15 +29,15 @@ public class EntityCreeper extends EntityMob {
public void readEntityFromNBT(NBTTagCompound var1) { public void readEntityFromNBT(NBTTagCompound var1) {
super.readEntityFromNBT(var1); super.readEntityFromNBT(var1);
this.dataWatcher.updateObject(17, Byte.valueOf((byte)(var1.getBoolean("powered") ? 1 : 0))); this.dataWatcher.updateObject(17, Byte.valueOf((byte) (var1.getBoolean("powered") ? 1 : 0)));
} }
protected void func_28013_b(Entity var1, float var2) { protected void func_28013_b(Entity var1, float var2) {
if(!this.worldObj.singleplayerWorld) { if (!this.worldObj.singleplayerWorld) {
if(this.timeSinceIgnited > 0) { if (this.timeSinceIgnited > 0) {
this.setCreeperState(-1); this.setCreeperState(-1);
--this.timeSinceIgnited; --this.timeSinceIgnited;
if(this.timeSinceIgnited < 0) { if (this.timeSinceIgnited < 0) {
this.timeSinceIgnited = 0; this.timeSinceIgnited = 0;
} }
} }
@ -47,27 +47,27 @@ public class EntityCreeper extends EntityMob {
public void onUpdate() { public void onUpdate() {
this.lastActiveTime = this.timeSinceIgnited; this.lastActiveTime = this.timeSinceIgnited;
if(this.worldObj.singleplayerWorld) { if (this.worldObj.singleplayerWorld) {
int var1 = this.getCreeperState(); int var1 = this.getCreeperState();
if(var1 > 0 && this.timeSinceIgnited == 0) { if (var1 > 0 && this.timeSinceIgnited == 0) {
this.worldObj.playSoundAtEntity(this, "random.fuse", 1.0F, 0.5F); this.worldObj.playSoundAtEntity(this, "random.fuse", 1.0F, 0.5F);
} }
this.timeSinceIgnited += var1; this.timeSinceIgnited += var1;
if(this.timeSinceIgnited < 0) { if (this.timeSinceIgnited < 0) {
this.timeSinceIgnited = 0; this.timeSinceIgnited = 0;
} }
if(this.timeSinceIgnited >= 30) { if (this.timeSinceIgnited >= 30) {
this.timeSinceIgnited = 30; this.timeSinceIgnited = 30;
} }
} }
super.onUpdate(); super.onUpdate();
if(this.playerToAttack == null && this.timeSinceIgnited > 0) { if (this.playerToAttack == null && this.timeSinceIgnited > 0) {
this.setCreeperState(-1); this.setCreeperState(-1);
--this.timeSinceIgnited; --this.timeSinceIgnited;
if(this.timeSinceIgnited < 0) { if (this.timeSinceIgnited < 0) {
this.timeSinceIgnited = 0; this.timeSinceIgnited = 0;
} }
} }
@ -84,24 +84,24 @@ public class EntityCreeper extends EntityMob {
public void onDeath(Entity var1) { public void onDeath(Entity var1) {
super.onDeath(var1); super.onDeath(var1);
if(var1 instanceof EntitySkeleton) { if (var1 instanceof EntitySkeleton) {
this.dropItem(Item.record13.shiftedIndex + this.rand.nextInt(2), 1); this.dropItem(Item.record13.shiftedIndex + this.rand.nextInt(2), 1);
} }
} }
protected void attackEntity(Entity var1, float var2) { protected void attackEntity(Entity var1, float var2) {
if(!this.worldObj.singleplayerWorld) { if (!this.worldObj.singleplayerWorld) {
int var3 = this.getCreeperState(); int var3 = this.getCreeperState();
if(var3 <= 0 && var2 < 3.0F || var3 > 0 && var2 < 7.0F) { if (var3 <= 0 && var2 < 3.0F || var3 > 0 && var2 < 7.0F) {
if(this.timeSinceIgnited == 0) { if (this.timeSinceIgnited == 0) {
this.worldObj.playSoundAtEntity(this, "random.fuse", 1.0F, 0.5F); this.worldObj.playSoundAtEntity(this, "random.fuse", 1.0F, 0.5F);
} }
this.setCreeperState(1); this.setCreeperState(1);
++this.timeSinceIgnited; ++this.timeSinceIgnited;
if(this.timeSinceIgnited >= 30) { if (this.timeSinceIgnited >= 30) {
if(this.getPowered()) { if (this.getPowered()) {
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 6.0F); this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 6.0F);
} else { } else {
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3.0F); this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3.0F);
@ -114,7 +114,7 @@ public class EntityCreeper extends EntityMob {
} else { } else {
this.setCreeperState(-1); this.setCreeperState(-1);
--this.timeSinceIgnited; --this.timeSinceIgnited;
if(this.timeSinceIgnited < 0) { if (this.timeSinceIgnited < 0) {
this.timeSinceIgnited = 0; this.timeSinceIgnited = 0;
} }
} }
@ -135,11 +135,11 @@ public class EntityCreeper extends EntityMob {
} }
private void setCreeperState(int var1) { private void setCreeperState(int var1) {
this.dataWatcher.updateObject(16, Byte.valueOf((byte)var1)); this.dataWatcher.updateObject(16, Byte.valueOf((byte) var1));
} }
public void onStruckByLightning(EntityLightningBolt var1) { public void onStruckByLightning(EntityLightningBolt var1) {
super.onStruckByLightning(var1); super.onStruckByLightning(var1);
this.dataWatcher.updateObject(17, Byte.valueOf((byte)1)); this.dataWatcher.updateObject(17, Byte.valueOf((byte) 1));
} }
} }

121
src/net/minecraft/entity/EntityEgg.java
View file

@ -1,6 +1,5 @@
package net.minecraft.entity; package net.minecraft.entity;
import java.util.List;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.crafting.ItemStack; import net.minecraft.item.crafting.ItemStack;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
@ -10,6 +9,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.List;
public class EntityEgg extends Entity { public class EntityEgg extends Entity {
private int xTile = -1; private int xTile = -1;
private int yTile = -1; private int yTile = -1;
@ -33,16 +34,16 @@ public class EntityEgg extends Entity {
super(var1); super(var1);
this.field_20083_aj = var2; this.field_20083_aj = var2;
this.setSize(0.25F, 0.25F); this.setSize(0.25F, 0.25F);
this.setLocationAndAngles(var2.posX, var2.posY + (double)var2.getEyeHeight(), var2.posZ, var2.rotationYaw, var2.rotationPitch); this.setLocationAndAngles(var2.posX, var2.posY + (double) var2.getEyeHeight(), var2.posZ, var2.rotationYaw, var2.rotationPitch);
this.posX -= (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F);
this.posY -= (double)0.1F; this.posY -= (double) 0.1F;
this.posZ -= (double)(MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F);
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
this.yOffset = 0.0F; this.yOffset = 0.0F;
float var3 = 0.4F; float var3 = 0.4F;
this.motionX = (double)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * var3); this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI) * var3);
this.motionZ = (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * var3); this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI) * var3);
this.motionY = (double)(-MathHelper.sin(this.rotationPitch / 180.0F * (float)Math.PI) * var3); this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI) * var3);
this.func_20078_a(this.motionX, this.motionY, this.motionZ, 1.5F, 1.0F); this.func_20078_a(this.motionX, this.motionY, this.motionZ, 1.5F, 1.0F);
} }
@ -56,21 +57,21 @@ public class EntityEgg extends Entity {
public void func_20078_a(double var1, double var3, double var5, float var7, float var8) { public void func_20078_a(double var1, double var3, double var5, float var7, float var8) {
float var9 = MathHelper.sqrt_double(var1 * var1 + var3 * var3 + var5 * var5); float var9 = MathHelper.sqrt_double(var1 * var1 + var3 * var3 + var5 * var5);
var1 /= (double)var9; var1 /= (double) var9;
var3 /= (double)var9; var3 /= (double) var9;
var5 /= (double)var9; var5 /= (double) var9;
var1 += this.rand.nextGaussian() * (double)0.0075F * (double)var8; var1 += this.rand.nextGaussian() * (double) 0.0075F * (double) var8;
var3 += this.rand.nextGaussian() * (double)0.0075F * (double)var8; var3 += this.rand.nextGaussian() * (double) 0.0075F * (double) var8;
var5 += this.rand.nextGaussian() * (double)0.0075F * (double)var8; var5 += this.rand.nextGaussian() * (double) 0.0075F * (double) var8;
var1 *= (double)var7; var1 *= (double) var7;
var3 *= (double)var7; var3 *= (double) var7;
var5 *= (double)var7; var5 *= (double) var7;
this.motionX = var1; this.motionX = var1;
this.motionY = var3; this.motionY = var3;
this.motionZ = var5; this.motionZ = var5;
float var10 = MathHelper.sqrt_double(var1 * var1 + var5 * var5); float var10 = MathHelper.sqrt_double(var1 * var1 + var5 * var5);
this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(var1, var5) * 180.0D / (double)((float)Math.PI)); this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(var1, var5) * 180.0D / (double) ((float) Math.PI));
this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(var3, (double)var10) * 180.0D / (double)((float)Math.PI)); this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(var3, (double) var10) * 180.0D / (double) ((float) Math.PI));
this.field_20081_ak = 0; this.field_20081_ak = 0;
} }
@ -79,15 +80,15 @@ public class EntityEgg extends Entity {
this.lastTickPosY = this.posY; this.lastTickPosY = this.posY;
this.lastTickPosZ = this.posZ; this.lastTickPosZ = this.posZ;
super.onUpdate(); super.onUpdate();
if(this.shake > 0) { if (this.shake > 0) {
--this.shake; --this.shake;
} }
if(this.inGround) { if (this.inGround) {
int var1 = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile); int var1 = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile);
if(var1 == this.inTile) { if (var1 == this.inTile) {
++this.field_20081_ak; ++this.field_20081_ak;
if(this.field_20081_ak == 1200) { if (this.field_20081_ak == 1200) {
this.setEntityDead(); this.setEntityDead();
} }
@ -95,9 +96,9 @@ public class EntityEgg extends Entity {
} }
this.inGround = false; this.inGround = false;
this.motionX *= (double)(this.rand.nextFloat() * 0.2F); this.motionX *= (double) (this.rand.nextFloat() * 0.2F);
this.motionY *= (double)(this.rand.nextFloat() * 0.2F); this.motionY *= (double) (this.rand.nextFloat() * 0.2F);
this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); this.motionZ *= (double) (this.rand.nextFloat() * 0.2F);
this.field_20081_ak = 0; this.field_20081_ak = 0;
this.field_20079_al = 0; this.field_20079_al = 0;
} else { } else {
@ -109,24 +110,24 @@ public class EntityEgg extends Entity {
MovingObjectPosition var3 = this.worldObj.rayTraceBlocks(var15, var2); MovingObjectPosition var3 = this.worldObj.rayTraceBlocks(var15, var2);
var15 = Vec3D.createVector(this.posX, this.posY, this.posZ); var15 = Vec3D.createVector(this.posX, this.posY, this.posZ);
var2 = Vec3D.createVector(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); var2 = Vec3D.createVector(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
if(var3 != null) { if (var3 != null) {
var2 = Vec3D.createVector(var3.hitVec.xCoord, var3.hitVec.yCoord, var3.hitVec.zCoord); var2 = Vec3D.createVector(var3.hitVec.xCoord, var3.hitVec.yCoord, var3.hitVec.zCoord);
} }
if(!this.worldObj.singleplayerWorld) { if (!this.worldObj.singleplayerWorld) {
Entity var4 = null; Entity var4 = null;
List var5 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); List var5 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D));
double var6 = 0.0D; double var6 = 0.0D;
for(int var8 = 0; var8 < var5.size(); ++var8) { for (int var8 = 0; var8 < var5.size(); ++var8) {
Entity var9 = (Entity)var5.get(var8); Entity var9 = (Entity) var5.get(var8);
if(var9.canBeCollidedWith() && (var9 != this.field_20083_aj || this.field_20079_al >= 5)) { if (var9.canBeCollidedWith() && (var9 != this.field_20083_aj || this.field_20079_al >= 5)) {
float var10 = 0.3F; float var10 = 0.3F;
AxisAlignedBB var11 = var9.boundingBox.expand((double)var10, (double)var10, (double)var10); AxisAlignedBB var11 = var9.boundingBox.expand((double) var10, (double) var10, (double) var10);
MovingObjectPosition var12 = var11.func_706_a(var15, var2); MovingObjectPosition var12 = var11.func_706_a(var15, var2);
if(var12 != null) { if (var12 != null) {
double var13 = var15.distanceTo(var12.hitVec); double var13 = var15.distanceTo(var12.hitVec);
if(var13 < var6 || var6 == 0.0D) { if (var13 < var6 || var6 == 0.0D) {
var4 = var9; var4 = var9;
var6 = var13; var6 = var13;
} }
@ -134,29 +135,29 @@ public class EntityEgg extends Entity {
} }
} }
if(var4 != null) { if (var4 != null) {
var3 = new MovingObjectPosition(var4); var3 = new MovingObjectPosition(var4);
} }
} }
if(var3 != null) { if (var3 != null) {
if(var3.entityHit != null && var3.entityHit.attackEntityFrom(this.field_20083_aj, 0)) { if (var3.entityHit != null && var3.entityHit.attackEntityFrom(this.field_20083_aj, 0)) {
} }
if(!this.worldObj.singleplayerWorld && this.rand.nextInt(8) == 0) { if (!this.worldObj.singleplayerWorld && this.rand.nextInt(8) == 0) {
byte var16 = 1; byte var16 = 1;
if(this.rand.nextInt(32) == 0) { if (this.rand.nextInt(32) == 0) {
var16 = 4; var16 = 4;
} }
for(int var17 = 0; var17 < var16; ++var17) { for (int var17 = 0; var17 < var16; ++var17) {
EntityChicken var21 = new EntityChicken(this.worldObj); EntityChicken var21 = new EntityChicken(this.worldObj);
var21.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F); var21.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F);
this.worldObj.entityJoinedWorld(var21); this.worldObj.entityJoinedWorld(var21);
} }
} }
for(int var18 = 0; var18 < 8; ++var18) { for (int var18 = 0; var18 < 8; ++var18) {
this.worldObj.spawnParticle("snowballpoof", this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D); this.worldObj.spawnParticle("snowballpoof", this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D);
} }
@ -167,20 +168,20 @@ public class EntityEgg extends Entity {
this.posY += this.motionY; this.posY += this.motionY;
this.posZ += this.motionZ; this.posZ += this.motionZ;
float var20 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); float var20 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / (double)((float)Math.PI)); this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / (double) ((float) Math.PI));
for(this.rotationPitch = (float)(Math.atan2(this.motionY, (double)var20) * 180.0D / (double)((float)Math.PI)); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) var20) * 180.0D / (double) ((float) Math.PI)); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {
} }
while(this.rotationPitch - this.prevRotationPitch >= 180.0F) { while (this.rotationPitch - this.prevRotationPitch >= 180.0F) {
this.prevRotationPitch += 360.0F; this.prevRotationPitch += 360.0F;
} }
while(this.rotationYaw - this.prevRotationYaw < -180.0F) { while (this.rotationYaw - this.prevRotationYaw < -180.0F) {
this.prevRotationYaw -= 360.0F; this.prevRotationYaw -= 360.0F;
} }
while(this.rotationYaw - this.prevRotationYaw >= 180.0F) { while (this.rotationYaw - this.prevRotationYaw >= 180.0F) {
this.prevRotationYaw += 360.0F; this.prevRotationYaw += 360.0F;
} }
@ -188,29 +189,29 @@ public class EntityEgg extends Entity {
this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F;
float var19 = 0.99F; float var19 = 0.99F;
float var22 = 0.03F; float var22 = 0.03F;
if(this.isInWater()) { if (this.isInWater()) {
for(int var7 = 0; var7 < 4; ++var7) { for (int var7 = 0; var7 < 4; ++var7) {
float var23 = 0.25F; float var23 = 0.25F;
this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double)var23, this.posY - this.motionY * (double)var23, this.posZ - this.motionZ * (double)var23, this.motionX, this.motionY, this.motionZ); this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double) var23, this.posY - this.motionY * (double) var23, this.posZ - this.motionZ * (double) var23, this.motionX, this.motionY, this.motionZ);
} }
var19 = 0.8F; var19 = 0.8F;
} }
this.motionX *= (double)var19; this.motionX *= (double) var19;
this.motionY *= (double)var19; this.motionY *= (double) var19;
this.motionZ *= (double)var19; this.motionZ *= (double) var19;
this.motionY -= (double)var22; this.motionY -= (double) var22;
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
} }
public void writeEntityToNBT(NBTTagCompound var1) { public void writeEntityToNBT(NBTTagCompound var1) {
var1.setShort("xTile", (short)this.xTile); var1.setShort("xTile", (short) this.xTile);
var1.setShort("yTile", (short)this.yTile); var1.setShort("yTile", (short) this.yTile);
var1.setShort("zTile", (short)this.zTile); var1.setShort("zTile", (short) this.zTile);
var1.setByte("inTile", (byte)this.inTile); var1.setByte("inTile", (byte) this.inTile);
var1.setByte("shake", (byte)this.shake); var1.setByte("shake", (byte) this.shake);
var1.setByte("inGround", (byte)(this.inGround ? 1 : 0)); var1.setByte("inGround", (byte) (this.inGround ? 1 : 0));
} }
public void readEntityFromNBT(NBTTagCompound var1) { public void readEntityFromNBT(NBTTagCompound var1) {
@ -223,7 +224,7 @@ public class EntityEgg extends Entity {
} }
public void onCollideWithPlayer(EntityPlayer var1) { public void onCollideWithPlayer(EntityPlayer var1) {
if(this.inGround && this.field_20083_aj == var1 && this.shake <= 0 && var1.inventory.addItemStackToInventory(new ItemStack(Item.arrow, 1))) { if (this.inGround && this.field_20083_aj == var1 && this.shake <= 0 && var1.inventory.addItemStackToInventory(new ItemStack(Item.arrow, 1))) {
this.worldObj.playSoundAtEntity(this, "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); this.worldObj.playSoundAtEntity(this, "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
var1.onItemPickup(this, 1); var1.onItemPickup(this, 1);
this.setEntityDead(); this.setEntityDead();

24
src/net/minecraft/entity/EntityFallingSand.java
View file

@ -40,34 +40,34 @@ public class EntityFallingSand extends Entity {
} }
public void onUpdate() { public void onUpdate() {
if(this.blockID == 0) { if (this.blockID == 0) {
this.setEntityDead(); this.setEntityDead();
} else { } else {
this.prevPosX = this.posX; this.prevPosX = this.posX;
this.prevPosY = this.posY; this.prevPosY = this.posY;
this.prevPosZ = this.posZ; this.prevPosZ = this.posZ;
++this.fallTime; ++this.fallTime;
this.motionY -= (double)0.04F; this.motionY -= (double) 0.04F;
this.moveEntity(this.motionX, this.motionY, this.motionZ); this.moveEntity(this.motionX, this.motionY, this.motionZ);
this.motionX *= (double)0.98F; this.motionX *= (double) 0.98F;
this.motionY *= (double)0.98F; this.motionY *= (double) 0.98F;
this.motionZ *= (double)0.98F; this.motionZ *= (double) 0.98F;
int var1 = MathHelper.floor_double(this.posX); int var1 = MathHelper.floor_double(this.posX);
int var2 = MathHelper.floor_double(this.posY); int var2 = MathHelper.floor_double(this.posY);
int var3 = MathHelper.floor_double(this.posZ); int var3 = MathHelper.floor_double(this.posZ);
if(this.worldObj.getBlockId(var1, var2, var3) == this.blockID) { if (this.worldObj.getBlockId(var1, var2, var3) == this.blockID) {
this.worldObj.setBlockWithNotify(var1, var2, var3, 0); this.worldObj.setBlockWithNotify(var1, var2, var3, 0);
} }
if(this.onGround) { if (this.onGround) {
this.motionX *= (double)0.7F; this.motionX *= (double) 0.7F;
this.motionZ *= (double)0.7F; this.motionZ *= (double) 0.7F;
this.motionY *= -0.5D; this.motionY *= -0.5D;
this.setEntityDead(); this.setEntityDead();
if((!this.worldObj.canBlockBePlacedAt(this.blockID, var1, var2, var3, true, 1) || BlockSand.canFallBelow(this.worldObj, var1, var2 - 1, var3) || !this.worldObj.setBlockWithNotify(var1, var2, var3, this.blockID)) && !this.worldObj.singleplayerWorld) { if ((!this.worldObj.canBlockBePlacedAt(this.blockID, var1, var2, var3, true, 1) || BlockSand.canFallBelow(this.worldObj, var1, var2 - 1, var3) || !this.worldObj.setBlockWithNotify(var1, var2, var3, this.blockID)) && !this.worldObj.singleplayerWorld) {
this.dropItem(this.blockID, 1); this.dropItem(this.blockID, 1);
} }
} else if(this.fallTime > 100 && !this.worldObj.singleplayerWorld) { } else if (this.fallTime > 100 && !this.worldObj.singleplayerWorld) {
this.dropItem(this.blockID, 1); this.dropItem(this.blockID, 1);
this.setEntityDead(); this.setEntityDead();
} }
@ -76,7 +76,7 @@ public class EntityFallingSand extends Entity {
} }
protected void writeEntityToNBT(NBTTagCompound var1) { protected void writeEntityToNBT(NBTTagCompound var1) {
var1.setByte("Tile", (byte)this.blockID); var1.setByte("Tile", (byte) this.blockID);
} }
protected void readEntityFromNBT(NBTTagCompound var1) { protected void readEntityFromNBT(NBTTagCompound var1) {

81
src/net/minecraft/entity/EntityFireball.java
View file

@ -1,6 +1,5 @@
package net.minecraft.entity; package net.minecraft.entity;
import java.util.List;
import net.minecraft.math.AxisAlignedBB; import net.minecraft.math.AxisAlignedBB;
import net.minecraft.math.MathHelper; import net.minecraft.math.MathHelper;
import net.minecraft.math.Vec3D; import net.minecraft.math.Vec3D;
@ -8,6 +7,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.List;
public class EntityFireball extends Entity { public class EntityFireball extends Entity {
private int xTile = -1; private int xTile = -1;
private int yTile = -1; private int yTile = -1;
@ -41,7 +42,7 @@ public class EntityFireball extends Entity {
var3 += this.rand.nextGaussian() * 0.4D; var3 += this.rand.nextGaussian() * 0.4D;
var5 += this.rand.nextGaussian() * 0.4D; var5 += this.rand.nextGaussian() * 0.4D;
var7 += this.rand.nextGaussian() * 0.4D; var7 += this.rand.nextGaussian() * 0.4D;
double var9 = (double)MathHelper.sqrt_double(var3 * var3 + var5 * var5 + var7 * var7); double var9 = (double) MathHelper.sqrt_double(var3 * var3 + var5 * var5 + var7 * var7);
this.field_9199_b = var3 / var9 * 0.1D; this.field_9199_b = var3 / var9 * 0.1D;
this.field_9198_c = var5 / var9 * 0.1D; this.field_9198_c = var5 / var9 * 0.1D;
this.field_9196_d = var7 / var9 * 0.1D; this.field_9196_d = var7 / var9 * 0.1D;
@ -50,15 +51,15 @@ public class EntityFireball extends Entity {
public void onUpdate() { public void onUpdate() {
super.onUpdate(); super.onUpdate();
this.fire = 10; this.fire = 10;
if(this.shake > 0) { if (this.shake > 0) {
--this.shake; --this.shake;
} }
if(this.inGround) { if (this.inGround) {
int var1 = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile); int var1 = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile);
if(var1 == this.inTile) { if (var1 == this.inTile) {
++this.field_9190_an; ++this.field_9190_an;
if(this.field_9190_an == 1200) { if (this.field_9190_an == 1200) {
this.setEntityDead(); this.setEntityDead();
} }
@ -66,9 +67,9 @@ public class EntityFireball extends Entity {
} }
this.inGround = false; this.inGround = false;
this.motionX *= (double)(this.rand.nextFloat() * 0.2F); this.motionX *= (double) (this.rand.nextFloat() * 0.2F);
this.motionY *= (double)(this.rand.nextFloat() * 0.2F); this.motionY *= (double) (this.rand.nextFloat() * 0.2F);
this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); this.motionZ *= (double) (this.rand.nextFloat() * 0.2F);
this.field_9190_an = 0; this.field_9190_an = 0;
this.ticksInAir = 0; this.ticksInAir = 0;
} else { } else {
@ -80,7 +81,7 @@ public class EntityFireball extends Entity {
MovingObjectPosition var3 = this.worldObj.rayTraceBlocks(var15, var2); MovingObjectPosition var3 = this.worldObj.rayTraceBlocks(var15, var2);
var15 = Vec3D.createVector(this.posX, this.posY, this.posZ); var15 = Vec3D.createVector(this.posX, this.posY, this.posZ);
var2 = Vec3D.createVector(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); var2 = Vec3D.createVector(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
if(var3 != null) { if (var3 != null) {
var2 = Vec3D.createVector(var3.hitVec.xCoord, var3.hitVec.yCoord, var3.hitVec.zCoord); var2 = Vec3D.createVector(var3.hitVec.xCoord, var3.hitVec.yCoord, var3.hitVec.zCoord);
} }
@ -88,15 +89,15 @@ public class EntityFireball extends Entity {
List var5 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); List var5 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D));
double var6 = 0.0D; double var6 = 0.0D;
for(int var8 = 0; var8 < var5.size(); ++var8) { for (int var8 = 0; var8 < var5.size(); ++var8) {
Entity var9 = (Entity)var5.get(var8); Entity var9 = (Entity) var5.get(var8);
if(var9.canBeCollidedWith() && (var9 != this.owner || this.ticksInAir >= 25)) { if (var9.canBeCollidedWith() && (var9 != this.owner || this.ticksInAir >= 25)) {
float var10 = 0.3F; float var10 = 0.3F;
AxisAlignedBB var11 = var9.boundingBox.expand((double)var10, (double)var10, (double)var10); AxisAlignedBB var11 = var9.boundingBox.expand((double) var10, (double) var10, (double) var10);
MovingObjectPosition var12 = var11.func_706_a(var15, var2); MovingObjectPosition var12 = var11.func_706_a(var15, var2);
if(var12 != null) { if (var12 != null) {
double var13 = var15.distanceTo(var12.hitVec); double var13 = var15.distanceTo(var12.hitVec);
if(var13 < var6 || var6 == 0.0D) { if (var13 < var6 || var6 == 0.0D) {
var4 = var9; var4 = var9;
var6 = var13; var6 = var13;
} }
@ -104,16 +105,16 @@ public class EntityFireball extends Entity {
} }
} }
if(var4 != null) { if (var4 != null) {
var3 = new MovingObjectPosition(var4); var3 = new MovingObjectPosition(var4);
} }
if(var3 != null) { if (var3 != null) {
if(!this.worldObj.singleplayerWorld) { if (!this.worldObj.singleplayerWorld) {
if(var3.entityHit != null && var3.entityHit.attackEntityFrom(this.owner, 0)) { if (var3.entityHit != null && var3.entityHit.attackEntityFrom(this.owner, 0)) {
} }
this.worldObj.newExplosion((Entity)null, this.posX, this.posY, this.posZ, 1.0F, true); this.worldObj.newExplosion((Entity) null, this.posX, this.posY, this.posZ, 1.0F, true);
} }
this.setEntityDead(); this.setEntityDead();
@ -123,30 +124,30 @@ public class EntityFireball extends Entity {
this.posY += this.motionY; this.posY += this.motionY;
this.posZ += this.motionZ; this.posZ += this.motionZ;
float var16 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); float var16 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / (double)((float)Math.PI)); this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / (double) ((float) Math.PI));
for(this.rotationPitch = (float)(Math.atan2(this.motionY, (double)var16) * 180.0D / (double)((float)Math.PI)); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) var16) * 180.0D / (double) ((float) Math.PI)); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {
} }
while(this.rotationPitch - this.prevRotationPitch >= 180.0F) { while (this.rotationPitch - this.prevRotationPitch >= 180.0F) {
this.prevRotationPitch += 360.0F; this.prevRotationPitch += 360.0F;
} }
while(this.rotationYaw - this.prevRotationYaw < -180.0F) { while (this.rotationYaw - this.prevRotationYaw < -180.0F) {
this.prevRotationYaw -= 360.0F; this.prevRotationYaw -= 360.0F;
} }
while(this.rotationYaw - this.prevRotationYaw >= 180.0F) { while (this.rotationYaw - this.prevRotationYaw >= 180.0F) {
this.prevRotationYaw += 360.0F; this.prevRotationYaw += 360.0F;
} }
this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F;
this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F;
float var17 = 0.95F; float var17 = 0.95F;
if(this.isInWater()) { if (this.isInWater()) {
for(int var18 = 0; var18 < 4; ++var18) { for (int var18 = 0; var18 < 4; ++var18) {
float var19 = 0.25F; float var19 = 0.25F;
this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double)var19, this.posY - this.motionY * (double)var19, this.posZ - this.motionZ * (double)var19, this.motionX, this.motionY, this.motionZ); this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double) var19, this.posY - this.motionY * (double) var19, this.posZ - this.motionZ * (double) var19, this.motionX, this.motionY, this.motionZ);
} }
var17 = 0.8F; var17 = 0.8F;
@ -155,20 +156,20 @@ public class EntityFireball extends Entity {
this.motionX += this.field_9199_b; this.motionX += this.field_9199_b;
this.motionY += this.field_9198_c; this.motionY += this.field_9198_c;
this.motionZ += this.field_9196_d; this.motionZ += this.field_9196_d;
this.motionX *= (double)var17; this.motionX *= (double) var17;
this.motionY *= (double)var17; this.motionY *= (double) var17;
this.motionZ *= (double)var17; this.motionZ *= (double) var17;
this.worldObj.spawnParticle("smoke", this.posX, this.posY + 0.5D, this.posZ, 0.0D, 0.0D, 0.0D); this.worldObj.spawnParticle("smoke", this.posX, this.posY + 0.5D, this.posZ, 0.0D, 0.0D, 0.0D);
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
} }
public void writeEntityToNBT(NBTTagCompound var1) { public void writeEntityToNBT(NBTTagCompound var1) {
var1.setShort("xTile", (short)this.xTile); var1.setShort("xTile", (short) this.xTile);
var1.setShort("yTile", (short)this.yTile); var1.setShort("yTile", (short) this.yTile);
var1.setShort("zTile", (short)this.zTile); var1.setShort("zTile", (short) this.zTile);
var1.setByte("inTile", (byte)this.inTile); var1.setByte("inTile", (byte) this.inTile);
var1.setByte("shake", (byte)this.shake); var1.setByte("shake", (byte) this.shake);
var1.setByte("inGround", (byte)(this.inGround ? 1 : 0)); var1.setByte("inGround", (byte) (this.inGround ? 1 : 0));
} }
public void readEntityFromNBT(NBTTagCompound var1) { public void readEntityFromNBT(NBTTagCompound var1) {
@ -186,9 +187,9 @@ public class EntityFireball extends Entity {
public boolean attackEntityFrom(Entity var1, int var2) { public boolean attackEntityFrom(Entity var1, int var2) {
this.setBeenAttacked(); this.setBeenAttacked();
if(var1 != null) { if (var1 != null) {
Vec3D var3 = var1.getLookVec(); Vec3D var3 = var1.getLookVec();
if(var3 != null) { if (var3 != null) {
this.motionX = var3.xCoord; this.motionX = var3.xCoord;
this.motionY = var3.yCoord; this.motionY = var3.yCoord;
this.motionZ = var3.zCoord; this.motionZ = var3.zCoord;

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