Skip to content

Commit c1627dc

Browse files
mbaxamaranth
mbax
authored and
amaranth
committed
Update to 1.7.10
1 parent 3f6cb64 commit c1627dc

File tree

358 files changed

+2038
-1978
lines changed

Some content is hidden

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

358 files changed

+2038
-1978
lines changed

‎net/minecraft/server/AttributeBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ protected AttributeBase(String s, double d0) {
1414
}
1515
}
1616

17-
public String a() {
17+
public String getName() {
1818
return this.a;
1919
}
2020

‎net/minecraft/server/AttributeInstance.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
public interface AttributeInstance {
77

8-
IAttribute a();
8+
IAttribute getAttribute();
99

1010
double b();
1111

‎net/minecraft/server/AttributeMapServer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public AttributeModifiable b(String s) {
3030
}
3131

3232
public AttributeInstance b(IAttribute iattribute) {
33-
if (this.b.containsKey(iattribute.a())) {
33+
if (this.b.containsKey(iattribute.getName())) {
3434
throw new IllegalArgumentException("Attribute is already registered!");
3535
} else {
3636
AttributeModifiable attributemodifiable = new AttributeModifiable(this, iattribute);
3737

38-
this.b.put(iattribute.a(), attributemodifiable);
38+
this.b.put(iattribute.getName(), attributemodifiable);
3939
if (iattribute instanceof AttributeRanged && ((AttributeRanged) iattribute).f() != null) {
4040
this.c.put(((AttributeRanged) iattribute).f(), attributemodifiable);
4141
}
@@ -46,12 +46,12 @@ public AttributeInstance b(IAttribute iattribute) {
4646
}
4747

4848
public void a(AttributeModifiable attributemodifiable) {
49-
if (attributemodifiable.a().c()) {
49+
if (attributemodifiable.getAttribute().c()) {
5050
this.d.add(attributemodifiable);
5151
}
5252
}
5353

54-
public Set b() {
54+
public Set getAttributes() {
5555
return this.d;
5656
}
5757

@@ -62,7 +62,7 @@ public Collection c() {
6262
while (iterator.hasNext()) {
6363
AttributeInstance attributeinstance = (AttributeInstance) iterator.next();
6464

65-
if (attributeinstance.a().c()) {
65+
if (attributeinstance.getAttribute().c()) {
6666
hashset.add(attributeinstance);
6767
}
6868
}

‎net/minecraft/server/AttributeModifiable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public AttributeModifiable(AttributeMapBase attributemapbase, IAttribute iattrib
3030
}
3131
}
3232

33-
public IAttribute a() {
33+
public IAttribute getAttribute() {
3434
return this.b;
3535
}
3636

‎net/minecraft/server/EmptyClass2.java ‎net/minecraft/server/BananaAPI.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package net.minecraft.server;
22

3-
class EmptyClass2 {}
3+
class BananaAPI {}

‎net/minecraft/server/BiomeBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ public EnumTemperature m() {
334334
return (double) this.temperature < 0.2D ? EnumTemperature.COLD : ((double) this.temperature < 1.0D ? EnumTemperature.MEDIUM : EnumTemperature.WARM);
335335
}
336336

337-
public static BiomeBase[] n() {
337+
public static BiomeBase[] getBiomes() {
338338
return biomes;
339339
}
340340

‎net/minecraft/server/BiomeBigHills.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void a(World world, Random random, int i, int j) {
5151
l = i + random.nextInt(16);
5252
i1 = random.nextInt(64);
5353
j1 = j + random.nextInt(16);
54-
this.aC.a(world, random, l, i1, j1);
54+
this.aC.generate(world, random, l, i1, j1);
5555
}
5656
}
5757

‎net/minecraft/server/BiomeDecorator.java

+21-21
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,19 @@ protected void a(BiomeBase biomebase) {
9090
for (i = 0; i < this.F; ++i) {
9191
j = this.c + this.b.nextInt(16) + 8;
9292
k = this.d + this.b.nextInt(16) + 8;
93-
this.f.a(this.a, this.b, j, this.a.i(j, k), k);
93+
this.f.generate(this.a, this.b, j, this.a.i(j, k), k);
9494
}
9595

9696
for (i = 0; i < this.G; ++i) {
9797
j = this.c + this.b.nextInt(16) + 8;
9898
k = this.d + this.b.nextInt(16) + 8;
99-
this.e.a(this.a, this.b, j, this.a.i(j, k), k);
99+
this.e.generate(this.a, this.b, j, this.a.i(j, k), k);
100100
}
101101

102102
for (i = 0; i < this.E; ++i) {
103103
j = this.c + this.b.nextInt(16) + 8;
104104
k = this.d + this.b.nextInt(16) + 8;
105-
this.g.a(this.a, this.b, j, this.a.i(j, k), k);
105+
this.g.generate(this.a, this.b, j, this.a.i(j, k), k);
106106
}
107107

108108
i = this.x;
@@ -120,15 +120,15 @@ protected void a(BiomeBase biomebase) {
120120
WorldGenTreeAbstract worldgentreeabstract = biomebase.a(this.b);
121121

122122
worldgentreeabstract.a(1.0D, 1.0D, 1.0D);
123-
if (worldgentreeabstract.a(this.a, this.b, k, i1, l)) {
123+
if (worldgentreeabstract.generate(this.a, this.b, k, i1, l)) {
124124
worldgentreeabstract.b(this.a, this.b, k, i1, l);
125125
}
126126
}
127127

128128
for (j = 0; j < this.H; ++j) {
129129
k = this.c + this.b.nextInt(16) + 8;
130130
l = this.d + this.b.nextInt(16) + 8;
131-
this.s.a(this.a, this.b, k, this.a.getHighestBlockYAt(k, l), l);
131+
this.s.generate(this.a, this.b, k, this.a.getHighestBlockYAt(k, l), l);
132132
}
133133

134134
for (j = 0; j < this.y; ++j) {
@@ -140,7 +140,7 @@ protected void a(BiomeBase biomebase) {
140140

141141
if (blockflowers.getMaterial() != Material.AIR) {
142142
this.p.a(blockflowers, BlockFlowers.f(s));
143-
this.p.a(this.a, this.b, k, i1, l);
143+
this.p.generate(this.a, this.b, k, i1, l);
144144
}
145145
}
146146

@@ -150,14 +150,14 @@ protected void a(BiomeBase biomebase) {
150150
i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
151151
WorldGenerator worldgenerator = biomebase.b(this.b);
152152

153-
worldgenerator.a(this.a, this.b, k, i1, l);
153+
worldgenerator.generate(this.a, this.b, k, i1, l);
154154
}
155155

156156
for (j = 0; j < this.A; ++j) {
157157
k = this.c + this.b.nextInt(16) + 8;
158158
l = this.d + this.b.nextInt(16) + 8;
159159
i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
160-
(new WorldGenDeadBush(Blocks.DEAD_BUSH)).a(this.a, this.b, k, i1, l);
160+
(new WorldGenDeadBush(Blocks.DEAD_BUSH)).generate(this.a, this.b, k, i1, l);
161161
}
162162

163163
for (j = 0; j < this.w; ++j) {
@@ -168,80 +168,80 @@ protected void a(BiomeBase biomebase) {
168168
;
169169
}
170170

171-
this.v.a(this.a, this.b, k, i1, l);
171+
this.v.generate(this.a, this.b, k, i1, l);
172172
}
173173

174174
for (j = 0; j < this.B; ++j) {
175175
if (this.b.nextInt(4) == 0) {
176176
k = this.c + this.b.nextInt(16) + 8;
177177
l = this.d + this.b.nextInt(16) + 8;
178178
i1 = this.a.getHighestBlockYAt(k, l);
179-
this.q.a(this.a, this.b, k, i1, l);
179+
this.q.generate(this.a, this.b, k, i1, l);
180180
}
181181

182182
if (this.b.nextInt(8) == 0) {
183183
k = this.c + this.b.nextInt(16) + 8;
184184
l = this.d + this.b.nextInt(16) + 8;
185185
i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
186-
this.r.a(this.a, this.b, k, i1, l);
186+
this.r.generate(this.a, this.b, k, i1, l);
187187
}
188188
}
189189

190190
if (this.b.nextInt(4) == 0) {
191191
j = this.c + this.b.nextInt(16) + 8;
192192
k = this.d + this.b.nextInt(16) + 8;
193193
l = this.b.nextInt(this.a.getHighestBlockYAt(j, k) * 2);
194-
this.q.a(this.a, this.b, j, l, k);
194+
this.q.generate(this.a, this.b, j, l, k);
195195
}
196196

197197
if (this.b.nextInt(8) == 0) {
198198
j = this.c + this.b.nextInt(16) + 8;
199199
k = this.d + this.b.nextInt(16) + 8;
200200
l = this.b.nextInt(this.a.getHighestBlockYAt(j, k) * 2);
201-
this.r.a(this.a, this.b, j, l, k);
201+
this.r.generate(this.a, this.b, j, l, k);
202202
}
203203

204204
for (j = 0; j < this.C; ++j) {
205205
k = this.c + this.b.nextInt(16) + 8;
206206
l = this.d + this.b.nextInt(16) + 8;
207207
i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
208-
this.t.a(this.a, this.b, k, i1, l);
208+
this.t.generate(this.a, this.b, k, i1, l);
209209
}
210210

211211
for (j = 0; j < 10; ++j) {
212212
k = this.c + this.b.nextInt(16) + 8;
213213
l = this.d + this.b.nextInt(16) + 8;
214214
i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
215-
this.t.a(this.a, this.b, k, i1, l);
215+
this.t.generate(this.a, this.b, k, i1, l);
216216
}
217217

218218
if (this.b.nextInt(32) == 0) {
219219
j = this.c + this.b.nextInt(16) + 8;
220220
k = this.d + this.b.nextInt(16) + 8;
221221
l = this.b.nextInt(this.a.getHighestBlockYAt(j, k) * 2);
222-
(new WorldGenPumpkin()).a(this.a, this.b, j, l, k);
222+
(new WorldGenPumpkin()).generate(this.a, this.b, j, l, k);
223223
}
224224

225225
for (j = 0; j < this.D; ++j) {
226226
k = this.c + this.b.nextInt(16) + 8;
227227
l = this.d + this.b.nextInt(16) + 8;
228228
i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
229-
this.u.a(this.a, this.b, k, i1, l);
229+
this.u.generate(this.a, this.b, k, i1, l);
230230
}
231231

232232
if (this.I) {
233233
for (j = 0; j < 50; ++j) {
234234
k = this.c + this.b.nextInt(16) + 8;
235235
l = this.b.nextInt(this.b.nextInt(248) + 8);
236236
i1 = this.d + this.b.nextInt(16) + 8;
237-
(new WorldGenLiquids(Blocks.WATER)).a(this.a, this.b, k, l, i1);
237+
(new WorldGenLiquids(Blocks.WATER)).generate(this.a, this.b, k, l, i1);
238238
}
239239

240240
for (j = 0; j < 20; ++j) {
241241
k = this.c + this.b.nextInt(16) + 8;
242242
l = this.b.nextInt(this.b.nextInt(this.b.nextInt(240) + 8) + 8);
243243
i1 = this.d + this.b.nextInt(16) + 8;
244-
(new WorldGenLiquids(Blocks.LAVA)).a(this.a, this.b, k, l, i1);
244+
(new WorldGenLiquids(Blocks.LAVA)).generate(this.a, this.b, k, l, i1);
245245
}
246246
}
247247
}
@@ -252,7 +252,7 @@ protected void a(int i, WorldGenerator worldgenerator, int j, int k) {
252252
int j1 = this.b.nextInt(k - j) + j;
253253
int k1 = this.d + this.b.nextInt(16);
254254

255-
worldgenerator.a(this.a, this.b, i1, j1, k1);
255+
worldgenerator.generate(this.a, this.b, i1, j1, k1);
256256
}
257257
}
258258

@@ -262,7 +262,7 @@ protected void b(int i, WorldGenerator worldgenerator, int j, int k) {
262262
int j1 = this.b.nextInt(k) + this.b.nextInt(k) + (j - k);
263263
int k1 = this.d + this.b.nextInt(16);
264264

265-
worldgenerator.a(this.a, this.b, i1, j1, k1);
265+
worldgenerator.generate(this.a, this.b, i1, j1, k1);
266266
}
267267
}
268268

‎net/minecraft/server/BiomeDesert.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void a(World world, Random random, int i, int j) {
2323
int l = j + random.nextInt(16) + 8;
2424
WorldGenDesertWell worldgendesertwell = new WorldGenDesertWell();
2525

26-
worldgendesertwell.a(world, random, k, world.getHighestBlockYAt(k, l) + 1, l);
26+
worldgendesertwell.generate(world, random, k, world.getHighestBlockYAt(k, l) + 1, l);
2727
}
2828
}
2929
}

‎net/minecraft/server/BiomeForest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ public void a(World world, Random random, int i, int j) {
8686
if (random.nextInt(20) == 0) {
8787
WorldGenHugeMushroom worldgenhugemushroom = new WorldGenHugeMushroom();
8888

89-
worldgenhugemushroom.a(world, random, i1, k1, j1);
89+
worldgenhugemushroom.generate(world, random, i1, k1, j1);
9090
} else {
9191
WorldGenTreeAbstract worldgentreeabstract = this.a(random);
9292

9393
worldgentreeabstract.a(1.0D, 1.0D, 1.0D);
94-
if (worldgentreeabstract.a(world, random, i1, k1, j1)) {
94+
if (worldgentreeabstract.generate(world, random, i1, k1, j1)) {
9595
worldgentreeabstract.b(world, random, i1, k1, j1);
9696
}
9797
}
@@ -124,7 +124,7 @@ public void a(World world, Random random, int i, int j) {
124124
int l1 = j + random.nextInt(16) + 8;
125125
int i2 = random.nextInt(world.getHighestBlockYAt(k1, l1) + 32);
126126

127-
if (!ae.a(world, random, k1, i2, l1)) {
127+
if (!ae.generate(world, random, k1, i2, l1)) {
128128
++j1;
129129
continue;
130130
}

‎net/minecraft/server/BiomeIcePlains.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ public void a(World world, Random random, int i, int j) {
2727
for (k = 0; k < 3; ++k) {
2828
l = i + random.nextInt(16) + 8;
2929
i1 = j + random.nextInt(16) + 8;
30-
this.aD.a(world, random, l, world.getHighestBlockYAt(l, i1), i1);
30+
this.aD.generate(world, random, l, world.getHighestBlockYAt(l, i1), i1);
3131
}
3232

3333
for (k = 0; k < 2; ++k) {
3434
l = i + random.nextInt(16) + 8;
3535
i1 = j + random.nextInt(16) + 8;
36-
this.aE.a(world, random, l, world.getHighestBlockYAt(l, i1), i1);
36+
this.aE.generate(world, random, l, world.getHighestBlockYAt(l, i1), i1);
3737
}
3838
}
3939

‎net/minecraft/server/BiomeJungle.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ public void a(World world, Random random, int i, int j) {
3838
int l = j + random.nextInt(16) + 8;
3939
int i1 = random.nextInt(world.getHighestBlockYAt(k, l) * 2);
4040

41-
(new WorldGenMelon()).a(world, random, k, i1, l);
41+
(new WorldGenMelon()).generate(world, random, k, i1, l);
4242
WorldGenVines worldgenvines = new WorldGenVines();
4343

4444
for (l = 0; l < 50; ++l) {
4545
i1 = i + random.nextInt(16) + 8;
4646
short short1 = 128;
4747
int j1 = j + random.nextInt(16) + 8;
4848

49-
worldgenvines.a(world, random, i1, short1, j1);
49+
worldgenvines.generate(world, random, i1, short1, j1);
5050
}
5151
}
5252
}

‎net/minecraft/server/BiomePlains.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void a(World world, Random random, int i, int j) {
5050
l = i + random.nextInt(16) + 8;
5151
i1 = j + random.nextInt(16) + 8;
5252
j1 = random.nextInt(world.getHighestBlockYAt(l, i1) + 32);
53-
ae.a(world, random, l, j1, i1);
53+
ae.generate(world, random, l, j1, i1);
5454
}
5555
}
5656

@@ -61,7 +61,7 @@ public void a(World world, Random random, int i, int j) {
6161
l = i + random.nextInt(16) + 8;
6262
i1 = j + random.nextInt(16) + 8;
6363
j1 = random.nextInt(world.getHighestBlockYAt(l, i1) + 32);
64-
ae.a(world, random, l, j1, i1);
64+
ae.generate(world, random, l, j1, i1);
6565
}
6666
}
6767

‎net/minecraft/server/BiomeSavanna.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void a(World world, Random random, int i, int j) {
3535
int i1 = j + random.nextInt(16) + 8;
3636
int j1 = random.nextInt(world.getHighestBlockYAt(l, i1) + 32);
3737

38-
ae.a(world, random, l, j1, i1);
38+
ae.generate(world, random, l, j1, i1);
3939
}
4040

4141
super.a(world, random, i, j);

‎net/minecraft/server/BiomeTaiga.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void a(World world, Random random, int i, int j) {
4848
j1 = j + random.nextInt(16) + 8;
4949
int k1 = world.getHighestBlockYAt(i1, j1);
5050

51-
aG.a(world, random, i1, k1, j1);
51+
aG.generate(world, random, i1, k1, j1);
5252
}
5353
}
5454

@@ -58,7 +58,7 @@ public void a(World world, Random random, int i, int j) {
5858
l = i + random.nextInt(16) + 8;
5959
i1 = j + random.nextInt(16) + 8;
6060
j1 = random.nextInt(world.getHighestBlockYAt(l, i1) + 32);
61-
ae.a(world, random, l, j1, i1);
61+
ae.generate(world, random, l, j1, i1);
6262
}
6363

6464
super.a(world, random, i, j);

‎net/minecraft/server/BiomeTheEndDecorator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ protected void a(BiomeBase biomebase) {
1515
int j = this.d + this.b.nextInt(16) + 8;
1616
int k = this.a.i(i, j);
1717

18-
this.J.a(this.a, this.b, i, k, j);
18+
this.J.generate(this.a, this.b, i, k, j);
1919
}
2020

2121
if (this.c == 0 && this.d == 0) {

0 commit comments

Comments
 (0)