Skip to content

Commit 3d1bab6

Browse files
colbster937colbster937
committed
idk
1 parent 494bc94 commit 3d1bab6

File tree

238 files changed

+9923
-8389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+9923
-8389
lines changed

‎src/game/java/net/minecraft/src/Block.java‎

Lines changed: 283 additions & 158 deletions
Large diffs are not rendered by default.

‎src/game/java/net/minecraft/src/BlockBed.java‎

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,63 @@
44
import net.lax1dude.eaglercraft.Random;
55

66
public class BlockBed extends Block {
7-
public static final int[][] headBlockToFootBlockMap = new int[][]{{0, 1}, {-1, 0}, {0, -1}, {1, 0}};
7+
public static final int[][] headBlockToFootBlockMap = new int[][] { { 0, 1 }, { -1, 0 }, { 0, -1 }, { 1, 0 } };
88

99
public BlockBed(int var1) {
1010
super(var1, 134, Material.cloth);
1111
this.setBounds();
1212
}
1313

1414
public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPlayer var5) {
15-
if(var1.multiplayerWorld) {
15+
if (var1.multiplayerWorld) {
1616
return true;
1717
} else {
1818
int var6 = var1.getBlockMetadata(var2, var3, var4);
19-
if(!isBlockFootOfBed(var6)) {
19+
if (!isBlockFootOfBed(var6)) {
2020
int var7 = getDirectionFromMetadata(var6);
2121
var2 += headBlockToFootBlockMap[var7][0];
2222
var4 += headBlockToFootBlockMap[var7][1];
23-
if(var1.getBlockId(var2, var3, var4) != this.blockID) {
23+
if (var1.getBlockId(var2, var3, var4) != this.blockID) {
2424
return true;
2525
}
2626

2727
var6 = var1.getBlockMetadata(var2, var3, var4);
2828
}
2929

30-
if(!var1.worldProvider.canRespawnHere()) {
31-
double var16 = (double)var2 + 0.5D;
32-
double var17 = (double)var3 + 0.5D;
33-
double var11 = (double)var4 + 0.5D;
30+
if (!var1.worldProvider.canRespawnHere()) {
31+
double var16 = (double) var2 + 0.5D;
32+
double var17 = (double) var3 + 0.5D;
33+
double var11 = (double) var4 + 0.5D;
3434
var1.setBlockWithNotify(var2, var3, var4, 0);
3535
int var13 = getDirectionFromMetadata(var6);
3636
var2 += headBlockToFootBlockMap[var13][0];
3737
var4 += headBlockToFootBlockMap[var13][1];
38-
if(var1.getBlockId(var2, var3, var4) == this.blockID) {
38+
if (var1.getBlockId(var2, var3, var4) == this.blockID) {
3939
var1.setBlockWithNotify(var2, var3, var4, 0);
40-
var16 = (var16 + (double)var2 + 0.5D) / 2.0D;
41-
var17 = (var17 + (double)var3 + 0.5D) / 2.0D;
42-
var11 = (var11 + (double)var4 + 0.5D) / 2.0D;
40+
var16 = (var16 + (double) var2 + 0.5D) / 2.0D;
41+
var17 = (var17 + (double) var3 + 0.5D) / 2.0D;
42+
var11 = (var11 + (double) var4 + 0.5D) / 2.0D;
4343
}
4444

45-
var1.newExplosion((Entity)null, (double)((float)var2 + 0.5F), (double)((float)var3 + 0.5F), (double)((float)var4 + 0.5F), 5.0F, true);
45+
var1.newExplosion((Entity) null, (double) ((float) var2 + 0.5F), (double) ((float) var3 + 0.5F),
46+
(double) ((float) var4 + 0.5F), 5.0F, true);
4647
return true;
4748
} else {
48-
if(isBedOccupied(var6)) {
49+
if (isBedOccupied(var6)) {
4950
EntityPlayer var14 = null;
5051
Iterator var8 = var1.playerEntities.iterator();
5152

52-
while(var8.hasNext()) {
53-
EntityPlayer var9 = (EntityPlayer)var8.next();
54-
if(var9.isPlayerSleeping()) {
53+
while (var8.hasNext()) {
54+
EntityPlayer var9 = (EntityPlayer) var8.next();
55+
if (var9.isPlayerSleeping()) {
5556
ChunkCoordinates var10 = var9.bedChunkCoordinates;
56-
if(var10.posX == var2 && var10.posY == var3 && var10.posZ == var4) {
57+
if (var10.posX == var2 && var10.posY == var3 && var10.posZ == var4) {
5758
var14 = var9;
5859
}
5960
}
6061
}
6162

62-
if(var14 != null) {
63+
if (var14 != null) {
6364
var5.addChatMessage("tile.bed.occupied");
6465
return true;
6566
}
@@ -68,11 +69,11 @@ public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPl
6869
}
6970

7071
EnumStatus var15 = var5.sleepInBedAt(var2, var3, var4);
71-
if(var15 == EnumStatus.OK) {
72+
if (var15 == EnumStatus.OK) {
7273
setBedOccupied(var1, var2, var3, var4, true);
7374
return true;
7475
} else {
75-
if(var15 == EnumStatus.NOT_POSSIBLE_NOW) {
76+
if (var15 == EnumStatus.NOT_POSSIBLE_NOW) {
7677
var5.addChatMessage("tile.bed.noSleep");
7778
}
7879

@@ -83,12 +84,16 @@ public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPl
8384
}
8485

8586
public int getBlockTextureFromSideAndMetadata(int var1, int var2) {
86-
if(var1 == 0) {
87+
if (var1 == 0) {
8788
return Block.planks.blockIndexInTexture;
8889
} else {
8990
int var3 = getDirectionFromMetadata(var2);
9091
int var4 = ModelBed.bedDirection[var3][var1];
91-
return isBlockFootOfBed(var2) ? (var4 == 2 ? this.blockIndexInTexture + 2 + 16 : (var4 != 5 && var4 != 4 ? this.blockIndexInTexture + 1 : this.blockIndexInTexture + 1 + 16)) : (var4 == 3 ? this.blockIndexInTexture - 1 + 16 : (var4 != 5 && var4 != 4 ? this.blockIndexInTexture : this.blockIndexInTexture + 16));
92+
return isBlockFootOfBed(var2)
93+
? (var4 == 2 ? this.blockIndexInTexture + 2 + 16
94+
: (var4 != 5 && var4 != 4 ? this.blockIndexInTexture + 1 : this.blockIndexInTexture + 1 + 16))
95+
: (var4 == 3 ? this.blockIndexInTexture - 1 + 16
96+
: (var4 != 5 && var4 != 4 ? this.blockIndexInTexture : this.blockIndexInTexture + 16));
9297
}
9398
}
9499

@@ -111,13 +116,15 @@ public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, in
111116
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
112117
int var6 = var1.getBlockMetadata(var2, var3, var4);
113118
int var7 = getDirectionFromMetadata(var6);
114-
if(isBlockFootOfBed(var6)) {
115-
if(var1.getBlockId(var2 - headBlockToFootBlockMap[var7][0], var3, var4 - headBlockToFootBlockMap[var7][1]) != this.blockID) {
119+
if (isBlockFootOfBed(var6)) {
120+
if (var1.getBlockId(var2 - headBlockToFootBlockMap[var7][0], var3,
121+
var4 - headBlockToFootBlockMap[var7][1]) != this.blockID) {
116122
var1.setBlockWithNotify(var2, var3, var4, 0);
117123
}
118-
} else if(var1.getBlockId(var2 + headBlockToFootBlockMap[var7][0], var3, var4 + headBlockToFootBlockMap[var7][1]) != this.blockID) {
124+
} else if (var1.getBlockId(var2 + headBlockToFootBlockMap[var7][0], var3,
125+
var4 + headBlockToFootBlockMap[var7][1]) != this.blockID) {
119126
var1.setBlockWithNotify(var2, var3, var4, 0);
120-
if(!var1.multiplayerWorld) {
127+
if (!var1.multiplayerWorld) {
121128
this.dropBlockAsItem(var1, var2, var3, var4, var6);
122129
}
123130
}
@@ -146,7 +153,7 @@ public static boolean isBedOccupied(int var0) {
146153

147154
public static void setBedOccupied(World var0, int var1, int var2, int var3, boolean var4) {
148155
int var5 = var0.getBlockMetadata(var1, var2, var3);
149-
if(var4) {
156+
if (var4) {
150157
var5 |= 4;
151158
} else {
152159
var5 &= -5;
@@ -159,16 +166,17 @@ public static ChunkCoordinates getNearestEmptyChunkCoordinates(World var0, int v
159166
int var5 = var0.getBlockMetadata(var1, var2, var3);
160167
int var6 = getDirectionFromMetadata(var5);
161168

162-
for(int var7 = 0; var7 <= 1; ++var7) {
169+
for (int var7 = 0; var7 <= 1; ++var7) {
163170
int var8 = var1 - headBlockToFootBlockMap[var6][0] * var7 - 1;
164171
int var9 = var3 - headBlockToFootBlockMap[var6][1] * var7 - 1;
165172
int var10 = var8 + 2;
166173
int var11 = var9 + 2;
167174

168-
for(int var12 = var8; var12 <= var10; ++var12) {
169-
for(int var13 = var9; var13 <= var11; ++var13) {
170-
if(var0.isBlockNormalCube(var12, var2 - 1, var13) && var0.isAirBlock(var12, var2, var13) && var0.isAirBlock(var12, var2 + 1, var13)) {
171-
if(var4 <= 0) {
175+
for (int var12 = var8; var12 <= var10; ++var12) {
176+
for (int var13 = var9; var13 <= var11; ++var13) {
177+
if (var0.isBlockNormalCube(var12, var2 - 1, var13) && var0.isAirBlock(var12, var2, var13)
178+
&& var0.isAirBlock(var12, var2 + 1, var13)) {
179+
if (var4 <= 0) {
172180
return new ChunkCoordinates(var12, var2, var13);
173181
}
174182

@@ -182,7 +190,7 @@ public static ChunkCoordinates getNearestEmptyChunkCoordinates(World var0, int v
182190
}
183191

184192
public void dropBlockAsItemWithChance(World var1, int var2, int var3, int var4, int var5, float var6) {
185-
if(!isBlockFootOfBed(var5)) {
193+
if (!isBlockFootOfBed(var5)) {
186194
super.dropBlockAsItemWithChance(var1, var2, var3, var4, var5, var6);
187195
}
188196

‎src/game/java/net/minecraft/src/BlockButton.java‎

Lines changed: 51 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,29 @@ public boolean renderAsNormalBlock() {
2525
}
2626

2727
public boolean canPlaceBlockOnSide(World var1, int var2, int var3, int var4, int var5) {
28-
return var5 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1) ? true : (var5 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1) ? true : (var5 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4) ? true : var5 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)));
28+
return var5 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1) ? true
29+
: (var5 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1) ? true
30+
: (var5 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4) ? true
31+
: var5 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)));
2932
}
3033

3134
public boolean canPlaceBlockAt(World var1, int var2, int var3, int var4) {
32-
return var1.isBlockNormalCube(var2 - 1, var3, var4) ? true : (var1.isBlockNormalCube(var2 + 1, var3, var4) ? true : (var1.isBlockNormalCube(var2, var3, var4 - 1) ? true : var1.isBlockNormalCube(var2, var3, var4 + 1)));
35+
return var1.isBlockNormalCube(var2 - 1, var3, var4) ? true
36+
: (var1.isBlockNormalCube(var2 + 1, var3, var4) ? true
37+
: (var1.isBlockNormalCube(var2, var3, var4 - 1) ? true : var1.isBlockNormalCube(var2, var3, var4 + 1)));
3338
}
3439

3540
public void onBlockPlaced(World var1, int var2, int var3, int var4, int var5) {
3641
int var6 = var1.getBlockMetadata(var2, var3, var4);
3742
int var7 = var6 & 8;
3843
var6 &= 7;
39-
if(var5 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1)) {
44+
if (var5 == 2 && var1.isBlockNormalCube(var2, var3, var4 + 1)) {
4045
var6 = 4;
41-
} else if(var5 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1)) {
46+
} else if (var5 == 3 && var1.isBlockNormalCube(var2, var3, var4 - 1)) {
4247
var6 = 3;
43-
} else if(var5 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4)) {
48+
} else if (var5 == 4 && var1.isBlockNormalCube(var2 + 1, var3, var4)) {
4449
var6 = 2;
45-
} else if(var5 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)) {
50+
} else if (var5 == 5 && var1.isBlockNormalCube(var2 - 1, var3, var4)) {
4651
var6 = 1;
4752
} else {
4853
var6 = this.getOrientation(var1, var2, var3, var4);
@@ -52,30 +57,33 @@ public void onBlockPlaced(World var1, int var2, int var3, int var4, int var5) {
5257
}
5358

5459
private int getOrientation(World var1, int var2, int var3, int var4) {
55-
return var1.isBlockNormalCube(var2 - 1, var3, var4) ? 1 : (var1.isBlockNormalCube(var2 + 1, var3, var4) ? 2 : (var1.isBlockNormalCube(var2, var3, var4 - 1) ? 3 : (var1.isBlockNormalCube(var2, var3, var4 + 1) ? 4 : 1)));
60+
return var1.isBlockNormalCube(var2 - 1, var3, var4) ? 1
61+
: (var1.isBlockNormalCube(var2 + 1, var3, var4) ? 2
62+
: (var1.isBlockNormalCube(var2, var3, var4 - 1) ? 3
63+
: (var1.isBlockNormalCube(var2, var3, var4 + 1) ? 4 : 1)));
5664
}
5765

5866
public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int var5) {
59-
if(this.func_305_h(var1, var2, var3, var4)) {
67+
if (this.func_305_h(var1, var2, var3, var4)) {
6068
int var6 = var1.getBlockMetadata(var2, var3, var4) & 7;
6169
boolean var7 = false;
62-
if(!var1.isBlockNormalCube(var2 - 1, var3, var4) && var6 == 1) {
70+
if (!var1.isBlockNormalCube(var2 - 1, var3, var4) && var6 == 1) {
6371
var7 = true;
6472
}
6573

66-
if(!var1.isBlockNormalCube(var2 + 1, var3, var4) && var6 == 2) {
74+
if (!var1.isBlockNormalCube(var2 + 1, var3, var4) && var6 == 2) {
6775
var7 = true;
6876
}
6977

70-
if(!var1.isBlockNormalCube(var2, var3, var4 - 1) && var6 == 3) {
78+
if (!var1.isBlockNormalCube(var2, var3, var4 - 1) && var6 == 3) {
7179
var7 = true;
7280
}
7381

74-
if(!var1.isBlockNormalCube(var2, var3, var4 + 1) && var6 == 4) {
82+
if (!var1.isBlockNormalCube(var2, var3, var4 + 1) && var6 == 4) {
7583
var7 = true;
7684
}
7785

78-
if(var7) {
86+
if (var7) {
7987
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
8088
var1.setBlockWithNotify(var2, var3, var4, 0);
8189
}
@@ -84,7 +92,7 @@ public void onNeighborBlockChange(World var1, int var2, int var3, int var4, int
8492
}
8593

8694
private boolean func_305_h(World var1, int var2, int var3, int var4) {
87-
if(!this.canPlaceBlockAt(var1, var2, var3, var4)) {
95+
if (!this.canPlaceBlockAt(var1, var2, var3, var4)) {
8896
this.dropBlockAsItem(var1, var2, var3, var4, var1.getBlockMetadata(var2, var3, var4));
8997
var1.setBlockWithNotify(var2, var3, var4, 0);
9098
return false;
@@ -101,17 +109,17 @@ public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, in
101109
float var9 = 10.0F / 16.0F;
102110
float var10 = 3.0F / 16.0F;
103111
float var11 = 2.0F / 16.0F;
104-
if(var7) {
112+
if (var7) {
105113
var11 = 1.0F / 16.0F;
106114
}
107115

108-
if(var6 == 1) {
116+
if (var6 == 1) {
109117
this.setBlockBounds(0.0F, var8, 0.5F - var10, var11, var9, 0.5F + var10);
110-
} else if(var6 == 2) {
118+
} else if (var6 == 2) {
111119
this.setBlockBounds(1.0F - var11, var8, 0.5F - var10, 1.0F, var9, 0.5F + var10);
112-
} else if(var6 == 3) {
120+
} else if (var6 == 3) {
113121
this.setBlockBounds(0.5F - var10, var8, 0.0F, 0.5F + var10, var9, var11);
114-
} else if(var6 == 4) {
122+
} else if (var6 == 4) {
115123
this.setBlockBounds(0.5F - var10, var8, 1.0F - var11, 0.5F + var10, var9, 1.0F);
116124
}
117125

@@ -125,20 +133,21 @@ public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPl
125133
int var6 = var1.getBlockMetadata(var2, var3, var4);
126134
int var7 = var6 & 7;
127135
int var8 = 8 - (var6 & 8);
128-
if(var8 == 0) {
136+
if (var8 == 0) {
129137
return true;
130138
} else {
131139
var1.setBlockMetadataWithNotify(var2, var3, var4, var7 + var8);
132140
var1.markBlocksDirty(var2, var3, var4, var2, var3, var4);
133-
var1.playSoundEffect((double)var2 + 0.5D, (double)var3 + 0.5D, (double)var4 + 0.5D, "random.click", 0.3F, 0.6F);
141+
var1.playSoundEffect((double) var2 + 0.5D, (double) var3 + 0.5D, (double) var4 + 0.5D, "random.click", 0.3F,
142+
0.6F);
134143
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
135-
if(var7 == 1) {
144+
if (var7 == 1) {
136145
var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID);
137-
} else if(var7 == 2) {
146+
} else if (var7 == 2) {
138147
var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID);
139-
} else if(var7 == 3) {
148+
} else if (var7 == 3) {
140149
var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID);
141-
} else if(var7 == 4) {
150+
} else if (var7 == 4) {
142151
var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID);
143152
} else {
144153
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
@@ -151,16 +160,16 @@ public boolean blockActivated(World var1, int var2, int var3, int var4, EntityPl
151160

152161
public void onBlockRemoval(World var1, int var2, int var3, int var4) {
153162
int var5 = var1.getBlockMetadata(var2, var3, var4);
154-
if((var5 & 8) > 0) {
163+
if ((var5 & 8) > 0) {
155164
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
156165
int var6 = var5 & 7;
157-
if(var6 == 1) {
166+
if (var6 == 1) {
158167
var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID);
159-
} else if(var6 == 2) {
168+
} else if (var6 == 2) {
160169
var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID);
161-
} else if(var6 == 3) {
170+
} else if (var6 == 3) {
162171
var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID);
163-
} else if(var6 == 4) {
172+
} else if (var6 == 4) {
164173
var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID);
165174
} else {
166175
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
@@ -176,11 +185,13 @@ public boolean isPoweringTo(IBlockAccess var1, int var2, int var3, int var4, int
176185

177186
public boolean isIndirectlyPoweringTo(World var1, int var2, int var3, int var4, int var5) {
178187
int var6 = var1.getBlockMetadata(var2, var3, var4);
179-
if((var6 & 8) == 0) {
188+
if ((var6 & 8) == 0) {
180189
return false;
181190
} else {
182191
int var7 = var6 & 7;
183-
return var7 == 5 && var5 == 1 ? true : (var7 == 4 && var5 == 2 ? true : (var7 == 3 && var5 == 3 ? true : (var7 == 2 && var5 == 4 ? true : var7 == 1 && var5 == 5)));
192+
return var7 == 5 && var5 == 1 ? true
193+
: (var7 == 4 && var5 == 2 ? true
194+
: (var7 == 3 && var5 == 3 ? true : (var7 == 2 && var5 == 4 ? true : var7 == 1 && var5 == 5)));
184195
}
185196
}
186197

@@ -189,25 +200,26 @@ public boolean canProvidePower() {
189200
}
190201

191202
public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
192-
if(!var1.multiplayerWorld) {
203+
if (!var1.multiplayerWorld) {
193204
int var6 = var1.getBlockMetadata(var2, var3, var4);
194-
if((var6 & 8) != 0) {
205+
if ((var6 & 8) != 0) {
195206
var1.setBlockMetadataWithNotify(var2, var3, var4, var6 & 7);
196207
var1.notifyBlocksOfNeighborChange(var2, var3, var4, this.blockID);
197208
int var7 = var6 & 7;
198-
if(var7 == 1) {
209+
if (var7 == 1) {
199210
var1.notifyBlocksOfNeighborChange(var2 - 1, var3, var4, this.blockID);
200-
} else if(var7 == 2) {
211+
} else if (var7 == 2) {
201212
var1.notifyBlocksOfNeighborChange(var2 + 1, var3, var4, this.blockID);
202-
} else if(var7 == 3) {
213+
} else if (var7 == 3) {
203214
var1.notifyBlocksOfNeighborChange(var2, var3, var4 - 1, this.blockID);
204-
} else if(var7 == 4) {
215+
} else if (var7 == 4) {
205216
var1.notifyBlocksOfNeighborChange(var2, var3, var4 + 1, this.blockID);
206217
} else {
207218
var1.notifyBlocksOfNeighborChange(var2, var3 - 1, var4, this.blockID);
208219
}
209220

210-
var1.playSoundEffect((double)var2 + 0.5D, (double)var3 + 0.5D, (double)var4 + 0.5D, "random.click", 0.3F, 0.5F);
221+
var1.playSoundEffect((double) var2 + 0.5D, (double) var3 + 0.5D, (double) var4 + 0.5D, "random.click", 0.3F,
222+
0.5F);
211223
var1.markBlocksDirty(var2, var3, var4, var2, var3, var4);
212224
}
213225
}

0 commit comments

Comments
 (0)