Skip to content

Commit fc61896

Browse files
DinnerboneDinnerbone
committed
1.1.0 release
1 parent 349dda5 commit fc61896

File tree

190 files changed

+3118
-1581
lines changed

Some content is hidden

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

190 files changed

+3118
-1581
lines changed

‎lang/languages.txt

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
af_ZA=Afrikaans (ZA)
2+
ar_SA=العربية (العالم العربي)
3+
bg_BG=Български (BG)
4+
ca_ES=Català (CAT)
5+
cs_CZ=Čeština (CZ)
6+
cy_GB=Cymraeg (CY)
7+
da_DK=Dansk (Danmark)
8+
de_DE=Deutsch (Deutschland)
9+
el_GR=Ελληνικά (GR)
10+
en_US=English (US)
11+
en_GB=Canadian English (CA)
12+
en_CA=English (UK)
13+
en_PT=Pirate Speak (PIRATE)
14+
es_AR=Español (Argentina)
15+
es_ES=Español (España)
16+
es_MX=Español (MX)
17+
es_UY=Español (Uruguay)
18+
es_VE=Español Venezolano (Ve)
19+
et_EE=Eesti (ET)
20+
eu_ES=Euskara (ES)
21+
fi_FI=Suomi (Suomi)
22+
fr_FR=Français (France)
23+
fr_CA=Français (CA)
24+
gl_ES=Galego (Galicia)
25+
he_IL=עברית (IL)
26+
ky_KG=अंग्रेज़ी (भारत)
27+
hr_HR=Hrvatski (HR)
28+
hu_HU=Български (Bulgarian)
29+
is_IS=Íslenska (IS)
30+
it_IT=Italiano (Italia)
31+
ja_JP=日本語 (日本)
32+
ka_GE=ქართული (საქართველო)
33+
ko_KR=한국어 (한국)
34+
lt_LT=Lietuvių (Lietuva)
35+
lv_LV=Latviešu (Latvija)
36+
mi_NZ=Bahasa Melayu (MS)
37+
nl_NL=Nederlands (Nederland)
38+
nn_NO=Norsk nynorsk (Norge)
39+
nb_NO=Norsk (NO)
40+
pl_PL=Polski (Polska)
41+
pt_BR=Português (Brasil)
42+
pt_PT=Portuguese (Portugal)
43+
qya_AA=Quenya (Arda)
44+
ro_RO=Română (RO)
45+
ru_RU=Русский (Россия)
46+
sk_SK=Slovenčina (SK)
47+
sl_SI=Angleščina (Slovenija)
48+
sr_SP=Srpski (Србија)
49+
sv_SE=Svenska (Sverige)
50+
th_TH=ภาษาไทย (TH)
51+
tlh_AA=tlhIngan Hol (US)
52+
tr_TR=Türkçe (TR)
53+
uk_UA=Українська (Україна)
54+
vi_VN=Tiếng Việt (US)
55+
zh_CN=简体中文 (中国)
56+
zh_TW=繁體中文 (台灣)

‎net/minecraft/server/Achievement.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ public class Achievement extends Statistic {
55
public final int a;
66
public final int b;
77
public final Achievement c;
8-
private final String l;
8+
private final String k;
99
public final ItemStack d;
10-
private boolean m;
10+
private boolean l;
1111

1212
public Achievement(int i, String s, int j, int k, Item item, Achievement achievement) {
1313
this(i, s, j, k, new ItemStack(item), achievement);
@@ -18,9 +18,9 @@ public Achievement(int i, String s, int j, int k, Block block, Achievement achie
1818
}
1919

2020
public Achievement(int i, String s, int j, int k, ItemStack itemstack, Achievement achievement) {
21-
super(5242880 + i, LocaleI18n.a("achievement." + s));
21+
super(5242880 + i, "achievement." + s);
2222
this.d = itemstack;
23-
this.l = LocaleI18n.a("achievement." + s + ".desc");
23+
this.k = "achievement." + s + ".desc";
2424
this.a = j;
2525
this.b = k;
2626
if (j < AchievementList.a) {
@@ -43,12 +43,12 @@ public Achievement(int i, String s, int j, int k, ItemStack itemstack, Achieveme
4343
}
4444

4545
public Achievement a() {
46-
this.g = true;
46+
this.f = true;
4747
return this;
4848
}
4949

5050
public Achievement b() {
51-
this.m = true;
51+
this.l = true;
5252
return this;
5353
}
5454

‎net/minecraft/server/BiomeBase.java

+72-67
Original file line numberDiff line numberDiff line change
@@ -10,72 +10,77 @@ public abstract class BiomeBase {
1010
public static final BiomeBase OCEAN = (new BiomeOcean(0)).b(112).a("Ocean").b(-1.0F, 0.4F);
1111
public static final BiomeBase PLAINS = (new BiomePlains(1)).b(9286496).a("Plains").a(0.8F, 0.4F);
1212
public static final BiomeBase DESERT = (new BiomeDesert(2)).b(16421912).a("Desert").g().a(2.0F, 0.0F).b(0.1F, 0.2F);
13-
public static final BiomeBase EXTREME_HILLS = (new BiomeBigHills(3)).b(6316128).a("Extreme Hills").b(0.2F, 1.8F).a(0.2F, 0.3F);
13+
public static final BiomeBase EXTREME_HILLS = (new BiomeBigHills(3)).b(6316128).a("Extreme Hills").b(0.2F, 1.3F).a(0.2F, 0.3F);
1414
public static final BiomeBase FOREST = (new BiomeForest(4)).b(353825).a("Forest").a(5159473).a(0.7F, 0.8F);
15-
public static final BiomeBase TAIGA = (new BiomeTaiga(5)).b(747097).a("Taiga").a(5159473).a(0.3F, 0.8F).b(0.1F, 0.4F);
15+
public static final BiomeBase TAIGA = (new BiomeTaiga(5)).b(747097).a("Taiga").a(5159473).a(0.05F, 0.8F).b(0.1F, 0.4F);
1616
public static final BiomeBase SWAMPLAND = (new BiomeSwamp(6)).b(522674).a("Swampland").a(9154376).b(-0.2F, 0.1F).a(0.8F, 0.9F);
1717
public static final BiomeBase RIVER = (new BiomeRiver(7)).b(255).a("River").b(-0.5F, 0.0F);
1818
public static final BiomeBase HELL = (new BiomeHell(8)).b(16711680).a("Hell").g().a(2.0F, 0.0F);
1919
public static final BiomeBase SKY = (new BiomeTheEnd(9)).b(8421631).a("Sky").g();
2020
public static final BiomeBase FROZEN_OCEAN = (new BiomeOcean(10)).b(9474208).a("FrozenOcean").b(-1.0F, 0.5F).a(0.0F, 0.5F);
2121
public static final BiomeBase FROZEN_RIVER = (new BiomeRiver(11)).b(10526975).a("FrozenRiver").b(-0.5F, 0.0F).a(0.0F, 0.5F);
2222
public static final BiomeBase ICE_PLAINS = (new BiomeIcePlains(12)).b(16777215).a("Ice Plains").a(0.0F, 0.5F);
23-
public static final BiomeBase ICE_MOUNTAINS = (new BiomeIcePlains(13)).b(10526880).a("Ice Mountains").b(0.2F, 1.8F).a(0.0F, 0.5F);
23+
public static final BiomeBase ICE_MOUNTAINS = (new BiomeIcePlains(13)).b(10526880).a("Ice Mountains").b(0.2F, 1.2F).a(0.0F, 0.5F);
2424
public static final BiomeBase MUSHROOM_ISLAND = (new BiomeMushrooms(14)).b(16711935).a("MushroomIsland").a(0.9F, 1.0F).b(0.2F, 1.0F);
2525
public static final BiomeBase MUSHROOM_SHORE = (new BiomeMushrooms(15)).b(10486015).a("MushroomIslandShore").a(0.9F, 1.0F).b(-1.0F, 0.1F);
26-
public String r;
27-
public int s;
28-
public byte t;
29-
public byte u;
30-
public int v;
31-
public float w;
32-
public float x;
33-
public float y;
34-
public float z;
26+
public static final BiomeBase BEACH = (new BiomeBeach(16)).b(16440917).a("Beach").a(0.8F, 0.4F).b(0.0F, 0.1F);
27+
public static final BiomeBase DESERT_HILLS = (new BiomeDesert(17)).b(13786898).a("DesertHills").g().a(2.0F, 0.0F).b(0.2F, 0.7F);
28+
public static final BiomeBase FOREST_HILLS = (new BiomeForest(18)).b(2250012).a("ForestHills").a(5159473).a(0.7F, 0.8F).b(0.2F, 0.6F);
29+
public static final BiomeBase TAIGA_HILLS = (new BiomeTaiga(19)).b(1456435).a("TaigaHills").a(5159473).a(0.05F, 0.8F).b(0.2F, 0.7F);
30+
public static final BiomeBase SMALL_MOUNTAINS = (new BiomeBigHills(20)).b(7501978).a("Extreme Hills Edge").b(0.2F, 0.8F).a(0.2F, 0.3F);
31+
public String w;
32+
public int x;
33+
public byte y;
34+
public byte z;
3535
public int A;
36-
public BiomeDecorator B;
37-
protected List C;
38-
protected List D;
39-
protected List E;
40-
private boolean K;
41-
private boolean L;
42-
public final int F;
43-
protected WorldGenTrees G;
44-
protected WorldGenBigTree H;
45-
protected WorldGenForest I;
46-
protected WorldGenSwampTree J;
36+
public float B;
37+
public float C;
38+
public float D;
39+
public float E;
40+
public int F;
41+
public BiomeDecorator G;
42+
protected List H;
43+
protected List I;
44+
protected List J;
45+
private boolean P;
46+
private boolean Q;
47+
public final int K;
48+
protected WorldGenTrees L;
49+
protected WorldGenBigTree M;
50+
protected WorldGenForest N;
51+
protected WorldGenSwampTree O;
4752

4853
protected BiomeBase(int i) {
49-
this.t = (byte) Block.GRASS.id;
50-
this.u = (byte) Block.DIRT.id;
51-
this.v = 5169201;
52-
this.w = 0.1F;
53-
this.x = 0.3F;
54-
this.y = 0.5F;
55-
this.z = 0.5F;
56-
this.A = 16777215;
57-
this.C = new ArrayList();
58-
this.D = new ArrayList();
59-
this.E = new ArrayList();
60-
this.L = true;
61-
this.G = new WorldGenTrees(false);
62-
this.H = new WorldGenBigTree(false);
63-
this.I = new WorldGenForest(false);
64-
this.J = new WorldGenSwampTree();
65-
this.F = i;
54+
this.y = (byte) Block.GRASS.id;
55+
this.z = (byte) Block.DIRT.id;
56+
this.A = 5169201;
57+
this.B = 0.1F;
58+
this.C = 0.3F;
59+
this.D = 0.5F;
60+
this.E = 0.5F;
61+
this.F = 16777215;
62+
this.H = new ArrayList();
63+
this.I = new ArrayList();
64+
this.J = new ArrayList();
65+
this.Q = true;
66+
this.L = new WorldGenTrees(false);
67+
this.M = new WorldGenBigTree(false);
68+
this.N = new WorldGenForest(false);
69+
this.O = new WorldGenSwampTree();
70+
this.K = i;
6671
a[i] = this;
67-
this.B = this.a();
68-
this.D.add(new BiomeMeta(EntitySheep.class, 12, 4, 4));
69-
this.D.add(new BiomeMeta(EntityPig.class, 10, 4, 4));
70-
this.D.add(new BiomeMeta(EntityChicken.class, 10, 4, 4));
71-
this.D.add(new BiomeMeta(EntityCow.class, 8, 4, 4));
72-
this.C.add(new BiomeMeta(EntitySpider.class, 10, 4, 4));
73-
this.C.add(new BiomeMeta(EntityZombie.class, 10, 4, 4));
74-
this.C.add(new BiomeMeta(EntitySkeleton.class, 10, 4, 4));
75-
this.C.add(new BiomeMeta(EntityCreeper.class, 10, 4, 4));
76-
this.C.add(new BiomeMeta(EntitySlime.class, 10, 4, 4));
77-
this.C.add(new BiomeMeta(EntityEnderman.class, 1, 1, 4));
78-
this.E.add(new BiomeMeta(EntitySquid.class, 10, 4, 4));
72+
this.G = this.a();
73+
this.I.add(new BiomeMeta(EntitySheep.class, 12, 4, 4));
74+
this.I.add(new BiomeMeta(EntityPig.class, 10, 4, 4));
75+
this.I.add(new BiomeMeta(EntityChicken.class, 10, 4, 4));
76+
this.I.add(new BiomeMeta(EntityCow.class, 8, 4, 4));
77+
this.H.add(new BiomeMeta(EntitySpider.class, 10, 4, 4));
78+
this.H.add(new BiomeMeta(EntityZombie.class, 10, 4, 4));
79+
this.H.add(new BiomeMeta(EntitySkeleton.class, 10, 4, 4));
80+
this.H.add(new BiomeMeta(EntityCreeper.class, 10, 4, 4));
81+
this.H.add(new BiomeMeta(EntitySlime.class, 10, 4, 4));
82+
this.H.add(new BiomeMeta(EntityEnderman.class, 1, 1, 4));
83+
this.J.add(new BiomeMeta(EntitySquid.class, 10, 4, 4));
7984
}
8085

8186
protected BiomeDecorator a() {
@@ -86,67 +91,67 @@ private BiomeBase a(float f, float f1) {
8691
if (f > 0.1F && f < 0.2F) {
8792
throw new IllegalArgumentException("Please avoid temperatures in the range 0.1 - 0.2 because of snow");
8893
} else {
89-
this.y = f;
90-
this.z = f1;
94+
this.D = f;
95+
this.E = f1;
9196
return this;
9297
}
9398
}
9499

95100
private BiomeBase b(float f, float f1) {
96-
this.w = f;
97-
this.x = f1;
101+
this.B = f;
102+
this.C = f1;
98103
return this;
99104
}
100105

101106
private BiomeBase g() {
102-
this.L = false;
107+
this.Q = false;
103108
return this;
104109
}
105110

106111
public WorldGenerator a(Random random) {
107-
return (WorldGenerator) (random.nextInt(10) == 0 ? this.H : this.G);
112+
return (WorldGenerator) (random.nextInt(10) == 0 ? this.M : this.L);
108113
}
109114

110115
protected BiomeBase a(String s) {
111-
this.r = s;
116+
this.w = s;
112117
return this;
113118
}
114119

115120
protected BiomeBase a(int i) {
116-
this.v = i;
121+
this.A = i;
117122
return this;
118123
}
119124

120125
protected BiomeBase b(int i) {
121-
this.s = i;
126+
this.x = i;
122127
return this;
123128
}
124129

125130
public List getMobs(EnumCreatureType enumcreaturetype) {
126-
return enumcreaturetype == EnumCreatureType.MONSTER ? this.C : (enumcreaturetype == EnumCreatureType.CREATURE ? this.D : (enumcreaturetype == EnumCreatureType.WATER_CREATURE ? this.E : null));
131+
return enumcreaturetype == EnumCreatureType.MONSTER ? this.H : (enumcreaturetype == EnumCreatureType.CREATURE ? this.I : (enumcreaturetype == EnumCreatureType.WATER_CREATURE ? this.J : null));
127132
}
128133

129134
public boolean b() {
130-
return this.K;
135+
return this.P;
131136
}
132137

133138
public boolean c() {
134-
return this.K ? false : this.L;
139+
return this.P ? false : this.Q;
135140
}
136141

137142
public float d() {
138143
return 0.1F;
139144
}
140145

141146
public final int e() {
142-
return (int) (this.z * 65536.0F);
147+
return (int) (this.E * 65536.0F);
143148
}
144149

145150
public final int f() {
146-
return (int) (this.y * 65536.0F);
151+
return (int) (this.D * 65536.0F);
147152
}
148153

149154
public void a(World world, Random random, int i, int j) {
150-
this.B.a(world, random, i, j);
155+
this.G.a(world, random, i, j);
151156
}
152157
}

‎net/minecraft/server/BiomeBeach.java

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package net.minecraft.server;
2+
3+
public class BiomeBeach extends BiomeBase {
4+
5+
public BiomeBeach(int i) {
6+
super(i);
7+
this.I.clear();
8+
this.y = (byte) Block.SAND.id;
9+
this.z = (byte) Block.SAND.id;
10+
this.G.z = -999;
11+
this.G.C = 0;
12+
this.G.E = 0;
13+
this.G.F = 0;
14+
}
15+
}

‎net/minecraft/server/BiomeDesert.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ public class BiomeDesert extends BiomeBase {
44

55
public BiomeDesert(int i) {
66
super(i);
7-
this.D.clear();
8-
this.t = (byte) Block.SAND.id;
9-
this.u = (byte) Block.SAND.id;
10-
this.B.z = -999;
11-
this.B.C = 2;
12-
this.B.E = 50;
13-
this.B.F = 10;
7+
this.I.clear();
8+
this.y = (byte) Block.SAND.id;
9+
this.z = (byte) Block.SAND.id;
10+
this.G.z = -999;
11+
this.G.C = 2;
12+
this.G.E = 50;
13+
this.G.F = 10;
1414
}
1515
}

‎net/minecraft/server/BiomeForest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ public class BiomeForest extends BiomeBase {
66

77
public BiomeForest(int i) {
88
super(i);
9-
this.D.add(new BiomeMeta(EntityWolf.class, 5, 4, 4));
10-
this.B.z = 10;
11-
this.B.B = 2;
9+
this.I.add(new BiomeMeta(EntityWolf.class, 5, 4, 4));
10+
this.G.z = 10;
11+
this.G.B = 2;
1212
}
1313

1414
public WorldGenerator a(Random random) {
15-
return (WorldGenerator) (random.nextInt(5) == 0 ? this.I : (random.nextInt(10) == 0 ? this.H : this.G));
15+
return (WorldGenerator) (random.nextInt(5) == 0 ? this.N : (random.nextInt(10) == 0 ? this.M : this.L));
1616
}
1717
}

‎net/minecraft/server/BiomeHell.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ public class BiomeHell extends BiomeBase {
44

55
public BiomeHell(int i) {
66
super(i);
7-
this.C.clear();
8-
this.D.clear();
9-
this.E.clear();
10-
this.C.add(new BiomeMeta(EntityGhast.class, 50, 4, 4));
11-
this.C.add(new BiomeMeta(EntityPigZombie.class, 100, 4, 4));
12-
this.C.add(new BiomeMeta(EntityMagmaCube.class, 1, 4, 4));
7+
this.H.clear();
8+
this.I.clear();
9+
this.J.clear();
10+
this.H.add(new BiomeMeta(EntityGhast.class, 50, 4, 4));
11+
this.H.add(new BiomeMeta(EntityPigZombie.class, 100, 4, 4));
12+
this.H.add(new BiomeMeta(EntityMagmaCube.class, 1, 4, 4));
1313
}
1414
}

0 commit comments

Comments
 (0)