Skip to content

Commit 494bc94

Browse files
colbster937colbster937
committed
yee
1 parent 048ec0b commit 494bc94

File tree

73 files changed

+3179
-2731
lines changed

Some content is hidden

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

73 files changed

+3179
-2731
lines changed

‎gradle/jars/brownies-collections-0.9.23.jar‎

656 KB
Binary file not shown.

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

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,41 @@ public class AchievementList {
88
public static int minDisplayRow;
99
public static int maxDisplayColumn;
1010
public static int maxDisplayRow;
11-
public static List achievementList = new ArrayList();
12-
public static Achievement openInventory = (new Achievement(0, "openInventory", 0, 0, Item.book, (Achievement)null)).setIndependent().registerAchievement();
13-
public static Achievement mineWood = (new Achievement(1, "mineWood", 2, 1, Block.wood, openInventory)).registerAchievement();
14-
public static Achievement buildWorkBench = (new Achievement(2, "buildWorkBench", 4, -1, Block.workbench, mineWood)).registerAchievement();
15-
public static Achievement buildPickaxe = (new Achievement(3, "buildPickaxe", 4, 2, Item.pickaxeWood, buildWorkBench)).registerAchievement();
16-
public static Achievement buildFurnace = (new Achievement(4, "buildFurnace", 3, 4, Block.stoneOvenActive, buildPickaxe)).registerAchievement();
17-
public static Achievement acquireIron = (new Achievement(5, "acquireIron", 1, 4, Item.ingotIron, buildFurnace)).registerAchievement();
18-
public static Achievement buildHoe = (new Achievement(6, "buildHoe", 2, -3, Item.hoeWood, buildWorkBench)).registerAchievement();
19-
public static Achievement makeBread = (new Achievement(7, "makeBread", -1, -3, Item.bread, buildHoe)).registerAchievement();
20-
public static Achievement bakeCake = (new Achievement(8, "bakeCake", 0, -5, Item.cake, buildHoe)).registerAchievement();
21-
public static Achievement buildBetterPickaxe = (new Achievement(9, "buildBetterPickaxe", 6, 2, Item.pickaxeStone, buildPickaxe)).registerAchievement();
22-
public static Achievement cookFish = (new Achievement(10, "cookFish", 2, 6, Item.fishCooked, buildFurnace)).registerAchievement();
23-
public static Achievement onARail = (new Achievement(11, "onARail", 2, 3, Block.rail, acquireIron)).setSpecial().registerAchievement();
24-
public static Achievement buildSword = (new Achievement(12, "buildSword", 6, -1, Item.swordWood, buildWorkBench)).registerAchievement();
25-
public static Achievement killEnemy = (new Achievement(13, "killEnemy", 8, -1, Item.bone, buildSword)).registerAchievement();
26-
public static Achievement killCow = (new Achievement(14, "killCow", 7, -3, Item.leather, buildSword)).registerAchievement();
27-
public static Achievement flyPig = (new Achievement(15, "flyPig", 8, -4, Item.saddle, killCow)).setSpecial().registerAchievement();
28-
public static Achievement field_35608_v = (new Achievement(16, "snipeSkeleton", 7, 0, Item.bow, killEnemy)).setSpecial().registerAchievement();
11+
public static List achievementList = new ArrayList<>();
12+
public static Achievement openInventory = (new Achievement(0, "openInventory", 0, 0, Item.book, (Achievement) null))
13+
.setIndependent().registerAchievement();
14+
public static Achievement mineWood = (new Achievement(1, "mineWood", 2, 1, Block.wood, openInventory))
15+
.registerAchievement();
16+
public static Achievement buildWorkBench = (new Achievement(2, "buildWorkBench", 4, -1, Block.workbench, mineWood))
17+
.registerAchievement();
18+
public static Achievement buildPickaxe = (new Achievement(3, "buildPickaxe", 4, 2, Item.pickaxeWood, buildWorkBench))
19+
.registerAchievement();
20+
public static Achievement buildFurnace = (new Achievement(4, "buildFurnace", 3, 4, Block.stoneOvenActive,
21+
buildPickaxe)).registerAchievement();
22+
public static Achievement acquireIron = (new Achievement(5, "acquireIron", 1, 4, Item.ingotIron, buildFurnace))
23+
.registerAchievement();
24+
public static Achievement buildHoe = (new Achievement(6, "buildHoe", 2, -3, Item.hoeWood, buildWorkBench))
25+
.registerAchievement();
26+
public static Achievement makeBread = (new Achievement(7, "makeBread", -1, -3, Item.bread, buildHoe))
27+
.registerAchievement();
28+
public static Achievement bakeCake = (new Achievement(8, "bakeCake", 0, -5, Item.cake, buildHoe))
29+
.registerAchievement();
30+
public static Achievement buildBetterPickaxe = (new Achievement(9, "buildBetterPickaxe", 6, 2, Item.pickaxeStone,
31+
buildPickaxe)).registerAchievement();
32+
public static Achievement cookFish = (new Achievement(10, "cookFish", 2, 6, Item.fishCooked, buildFurnace))
33+
.registerAchievement();
34+
public static Achievement onARail = (new Achievement(11, "onARail", 2, 3, Block.rail, acquireIron)).setSpecial()
35+
.registerAchievement();
36+
public static Achievement buildSword = (new Achievement(12, "buildSword", 6, -1, Item.swordWood, buildWorkBench))
37+
.registerAchievement();
38+
public static Achievement killEnemy = (new Achievement(13, "killEnemy", 8, -1, Item.bone, buildSword))
39+
.registerAchievement();
40+
public static Achievement killCow = (new Achievement(14, "killCow", 7, -3, Item.leather, buildSword))
41+
.registerAchievement();
42+
public static Achievement flyPig = (new Achievement(15, "flyPig", 8, -4, Item.saddle, killCow)).setSpecial()
43+
.registerAchievement();
44+
public static Achievement field_35608_v = (new Achievement(16, "snipeSkeleton", 7, 0, Item.bow, killEnemy))
45+
.setSpecial().registerAchievement();
2946

3047
public static void func_27374_a() {
3148
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
public class AchievementMap {
1111
public static AchievementMap instance = new AchievementMap();
12-
private Map guidMap = new HashMap();
12+
private Map guidMap = new HashMap<>();
1313

1414
private AchievementMap() {
1515
try {

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

Lines changed: 67 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.List;
55

66
public class AxisAlignedBB {
7-
private static List boundingBoxes = new ArrayList();
7+
private static List boundingBoxes = new ArrayList<>();
88
private static int numBoundingBoxesInUse = 0;
99
public double minX;
1010
public double minY;
@@ -13,7 +13,8 @@ public class AxisAlignedBB {
1313
public double maxY;
1414
public double maxZ;
1515

16-
public static AxisAlignedBB getBoundingBox(double var0, double var2, double var4, double var6, double var8, double var10) {
16+
public static AxisAlignedBB getBoundingBox(double var0, double var2, double var4, double var6, double var8,
17+
double var10) {
1718
return new AxisAlignedBB(var0, var2, var4, var6, var8, var10);
1819
}
1920

@@ -26,12 +27,13 @@ public static void clearBoundingBoxPool() {
2627
numBoundingBoxesInUse = 0;
2728
}
2829

29-
public static AxisAlignedBB getBoundingBoxFromPool(double var0, double var2, double var4, double var6, double var8, double var10) {
30-
if(numBoundingBoxesInUse >= boundingBoxes.size()) {
30+
public static AxisAlignedBB getBoundingBoxFromPool(double var0, double var2, double var4, double var6, double var8,
31+
double var10) {
32+
if (numBoundingBoxesInUse >= boundingBoxes.size()) {
3133
boundingBoxes.add(getBoundingBox(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D));
3234
}
3335

34-
return ((AxisAlignedBB)boundingBoxes.get(numBoundingBoxesInUse++)).setBounds(var0, var2, var4, var6, var8, var10);
36+
return ((AxisAlignedBB) boundingBoxes.get(numBoundingBoxesInUse++)).setBounds(var0, var2, var4, var6, var8, var10);
3537
}
3638

3739
private AxisAlignedBB(double var1, double var3, double var5, double var7, double var9, double var11) {
@@ -60,27 +62,27 @@ public AxisAlignedBB addCoord(double var1, double var3, double var5) {
6062
double var13 = this.maxX;
6163
double var15 = this.maxY;
6264
double var17 = this.maxZ;
63-
if(var1 < 0.0D) {
65+
if (var1 < 0.0D) {
6466
var7 += var1;
6567
}
6668

67-
if(var1 > 0.0D) {
69+
if (var1 > 0.0D) {
6870
var13 += var1;
6971
}
7072

71-
if(var3 < 0.0D) {
73+
if (var3 < 0.0D) {
7274
var9 += var3;
7375
}
7476

75-
if(var3 > 0.0D) {
77+
if (var3 > 0.0D) {
7678
var15 += var3;
7779
}
7880

79-
if(var5 < 0.0D) {
81+
if (var5 < 0.0D) {
8082
var11 += var5;
8183
}
8284

83-
if(var5 > 0.0D) {
85+
if (var5 > 0.0D) {
8486
var17 += var5;
8587
}
8688

@@ -98,23 +100,24 @@ public AxisAlignedBB expand(double var1, double var3, double var5) {
98100
}
99101

100102
public AxisAlignedBB getOffsetBoundingBox(double var1, double var3, double var5) {
101-
return getBoundingBoxFromPool(this.minX + var1, this.minY + var3, this.minZ + var5, this.maxX + var1, this.maxY + var3, this.maxZ + var5);
103+
return getBoundingBoxFromPool(this.minX + var1, this.minY + var3, this.minZ + var5, this.maxX + var1,
104+
this.maxY + var3, this.maxZ + var5);
102105
}
103106

104107
public double calculateXOffset(AxisAlignedBB var1, double var2) {
105-
if(var1.maxY > this.minY && var1.minY < this.maxY) {
106-
if(var1.maxZ > this.minZ && var1.minZ < this.maxZ) {
108+
if (var1.maxY > this.minY && var1.minY < this.maxY) {
109+
if (var1.maxZ > this.minZ && var1.minZ < this.maxZ) {
107110
double var4;
108-
if(var2 > 0.0D && var1.maxX <= this.minX) {
111+
if (var2 > 0.0D && var1.maxX <= this.minX) {
109112
var4 = this.minX - var1.maxX;
110-
if(var4 < var2) {
113+
if (var4 < var2) {
111114
var2 = var4;
112115
}
113116
}
114117

115-
if(var2 < 0.0D && var1.minX >= this.maxX) {
118+
if (var2 < 0.0D && var1.minX >= this.maxX) {
116119
var4 = this.maxX - var1.minX;
117-
if(var4 > var2) {
120+
if (var4 > var2) {
118121
var2 = var4;
119122
}
120123
}
@@ -129,19 +132,19 @@ public double calculateXOffset(AxisAlignedBB var1, double var2) {
129132
}
130133

131134
public double calculateYOffset(AxisAlignedBB var1, double var2) {
132-
if(var1.maxX > this.minX && var1.minX < this.maxX) {
133-
if(var1.maxZ > this.minZ && var1.minZ < this.maxZ) {
135+
if (var1.maxX > this.minX && var1.minX < this.maxX) {
136+
if (var1.maxZ > this.minZ && var1.minZ < this.maxZ) {
134137
double var4;
135-
if(var2 > 0.0D && var1.maxY <= this.minY) {
138+
if (var2 > 0.0D && var1.maxY <= this.minY) {
136139
var4 = this.minY - var1.maxY;
137-
if(var4 < var2) {
140+
if (var4 < var2) {
138141
var2 = var4;
139142
}
140143
}
141144

142-
if(var2 < 0.0D && var1.minY >= this.maxY) {
145+
if (var2 < 0.0D && var1.minY >= this.maxY) {
143146
var4 = this.maxY - var1.minY;
144-
if(var4 > var2) {
147+
if (var4 > var2) {
145148
var2 = var4;
146149
}
147150
}
@@ -156,19 +159,19 @@ public double calculateYOffset(AxisAlignedBB var1, double var2) {
156159
}
157160

158161
public double calculateZOffset(AxisAlignedBB var1, double var2) {
159-
if(var1.maxX > this.minX && var1.minX < this.maxX) {
160-
if(var1.maxY > this.minY && var1.minY < this.maxY) {
162+
if (var1.maxX > this.minX && var1.minX < this.maxX) {
163+
if (var1.maxY > this.minY && var1.minY < this.maxY) {
161164
double var4;
162-
if(var2 > 0.0D && var1.maxZ <= this.minZ) {
165+
if (var2 > 0.0D && var1.maxZ <= this.minZ) {
163166
var4 = this.minZ - var1.maxZ;
164-
if(var4 < var2) {
167+
if (var4 < var2) {
165168
var2 = var4;
166169
}
167170
}
168171

169-
if(var2 < 0.0D && var1.minZ >= this.maxZ) {
172+
if (var2 < 0.0D && var1.minZ >= this.maxZ) {
170173
var4 = this.maxZ - var1.minZ;
171-
if(var4 > var2) {
174+
if (var4 > var2) {
172175
var2 = var4;
173176
}
174177
}
@@ -183,7 +186,9 @@ public double calculateZOffset(AxisAlignedBB var1, double var2) {
183186
}
184187

185188
public boolean intersectsWith(AxisAlignedBB var1) {
186-
return var1.maxX > this.minX && var1.minX < this.maxX ? (var1.maxY > this.minY && var1.minY < this.maxY ? var1.maxZ > this.minZ && var1.minZ < this.maxZ : false) : false;
189+
return var1.maxX > this.minX && var1.minX < this.maxX
190+
? (var1.maxY > this.minY && var1.minY < this.maxY ? var1.maxZ > this.minZ && var1.minZ < this.maxZ : false)
191+
: false;
187192
}
188193

189194
public AxisAlignedBB offset(double var1, double var3, double var5) {
@@ -197,7 +202,10 @@ public AxisAlignedBB offset(double var1, double var3, double var5) {
197202
}
198203

199204
public boolean isVecInside(Vec3D var1) {
200-
return var1.xCoord > this.minX && var1.xCoord < this.maxX ? (var1.yCoord > this.minY && var1.yCoord < this.maxY ? var1.zCoord > this.minZ && var1.zCoord < this.maxZ : false) : false;
205+
return var1.xCoord > this.minX && var1.xCoord < this.maxX
206+
? (var1.yCoord > this.minY && var1.yCoord < this.maxY ? var1.zCoord > this.minZ && var1.zCoord < this.maxZ
207+
: false)
208+
: false;
201209
}
202210

203211
public double getAverageEdgeLength() {
@@ -228,80 +236,80 @@ public MovingObjectPosition func_1169_a(Vec3D var1, Vec3D var2) {
228236
Vec3D var6 = var1.getIntermediateWithYValue(var2, this.maxY);
229237
Vec3D var7 = var1.getIntermediateWithZValue(var2, this.minZ);
230238
Vec3D var8 = var1.getIntermediateWithZValue(var2, this.maxZ);
231-
if(!this.isVecInYZ(var3)) {
239+
if (!this.isVecInYZ(var3)) {
232240
var3 = null;
233241
}
234242

235-
if(!this.isVecInYZ(var4)) {
243+
if (!this.isVecInYZ(var4)) {
236244
var4 = null;
237245
}
238246

239-
if(!this.isVecInXZ(var5)) {
247+
if (!this.isVecInXZ(var5)) {
240248
var5 = null;
241249
}
242250

243-
if(!this.isVecInXZ(var6)) {
251+
if (!this.isVecInXZ(var6)) {
244252
var6 = null;
245253
}
246254

247-
if(!this.isVecInXY(var7)) {
255+
if (!this.isVecInXY(var7)) {
248256
var7 = null;
249257
}
250258

251-
if(!this.isVecInXY(var8)) {
259+
if (!this.isVecInXY(var8)) {
252260
var8 = null;
253261
}
254262

255263
Vec3D var9 = null;
256-
if(var3 != null && (var9 == null || var1.squareDistanceTo(var3) < var1.squareDistanceTo(var9))) {
264+
if (var3 != null && (var9 == null || var1.squareDistanceTo(var3) < var1.squareDistanceTo(var9))) {
257265
var9 = var3;
258266
}
259267

260-
if(var4 != null && (var9 == null || var1.squareDistanceTo(var4) < var1.squareDistanceTo(var9))) {
268+
if (var4 != null && (var9 == null || var1.squareDistanceTo(var4) < var1.squareDistanceTo(var9))) {
261269
var9 = var4;
262270
}
263271

264-
if(var5 != null && (var9 == null || var1.squareDistanceTo(var5) < var1.squareDistanceTo(var9))) {
272+
if (var5 != null && (var9 == null || var1.squareDistanceTo(var5) < var1.squareDistanceTo(var9))) {
265273
var9 = var5;
266274
}
267275

268-
if(var6 != null && (var9 == null || var1.squareDistanceTo(var6) < var1.squareDistanceTo(var9))) {
276+
if (var6 != null && (var9 == null || var1.squareDistanceTo(var6) < var1.squareDistanceTo(var9))) {
269277
var9 = var6;
270278
}
271279

272-
if(var7 != null && (var9 == null || var1.squareDistanceTo(var7) < var1.squareDistanceTo(var9))) {
280+
if (var7 != null && (var9 == null || var1.squareDistanceTo(var7) < var1.squareDistanceTo(var9))) {
273281
var9 = var7;
274282
}
275283

276-
if(var8 != null && (var9 == null || var1.squareDistanceTo(var8) < var1.squareDistanceTo(var9))) {
284+
if (var8 != null && (var9 == null || var1.squareDistanceTo(var8) < var1.squareDistanceTo(var9))) {
277285
var9 = var8;
278286
}
279287

280-
if(var9 == null) {
288+
if (var9 == null) {
281289
return null;
282290
} else {
283291
byte var10 = -1;
284-
if(var9 == var3) {
292+
if (var9 == var3) {
285293
var10 = 4;
286294
}
287295

288-
if(var9 == var4) {
296+
if (var9 == var4) {
289297
var10 = 5;
290298
}
291299

292-
if(var9 == var5) {
300+
if (var9 == var5) {
293301
var10 = 0;
294302
}
295303

296-
if(var9 == var6) {
304+
if (var9 == var6) {
297305
var10 = 1;
298306
}
299307

300-
if(var9 == var7) {
308+
if (var9 == var7) {
301309
var10 = 2;
302310
}
303311

304-
if(var9 == var8) {
312+
if (var9 == var8) {
305313
var10 = 3;
306314
}
307315

@@ -310,15 +318,18 @@ public MovingObjectPosition func_1169_a(Vec3D var1, Vec3D var2) {
310318
}
311319

312320
private boolean isVecInYZ(Vec3D var1) {
313-
return var1 == null ? false : var1.yCoord >= this.minY && var1.yCoord <= this.maxY && var1.zCoord >= this.minZ && var1.zCoord <= this.maxZ;
321+
return var1 == null ? false
322+
: var1.yCoord >= this.minY && var1.yCoord <= this.maxY && var1.zCoord >= this.minZ && var1.zCoord <= this.maxZ;
314323
}
315324

316325
private boolean isVecInXZ(Vec3D var1) {
317-
return var1 == null ? false : var1.xCoord >= this.minX && var1.xCoord <= this.maxX && var1.zCoord >= this.minZ && var1.zCoord <= this.maxZ;
326+
return var1 == null ? false
327+
: var1.xCoord >= this.minX && var1.xCoord <= this.maxX && var1.zCoord >= this.minZ && var1.zCoord <= this.maxZ;
318328
}
319329

320330
private boolean isVecInXY(Vec3D var1) {
321-
return var1 == null ? false : var1.xCoord >= this.minX && var1.xCoord <= this.maxX && var1.yCoord >= this.minY && var1.yCoord <= this.maxY;
331+
return var1 == null ? false
332+
: var1.xCoord >= this.minX && var1.xCoord <= this.maxX && var1.yCoord >= this.minY && var1.yCoord <= this.maxY;
322333
}
323334

324335
public void setBB(AxisAlignedBB var1) {
@@ -331,6 +342,7 @@ public void setBB(AxisAlignedBB var1) {
331342
}
332343

333344
public String toString() {
334-
return "box[" + this.minX + ", " + this.minY + ", " + this.minZ + " -> " + this.maxX + ", " + this.maxY + ", " + this.maxZ + "]";
345+
return "box[" + this.minX + ", " + this.minY + ", " + this.minZ + " -> " + this.maxX + ", " + this.maxY + ", "
346+
+ this.maxZ + "]";
335347
}
336348
}

0 commit comments

Comments
 (0)