Skip to content

Commit

Permalink
1.1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Dinnerbone committed Jan 12, 2012
1 parent 349dda5 commit fc61896
Show file tree
Hide file tree
Showing 190 changed files with 3,118 additions and 1,581 deletions.
56 changes: 56 additions & 0 deletions lang/languages.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
af_ZA=Afrikaans (ZA)
ar_SA=العربية (العالم العربي)
bg_BG=Български (BG)
ca_ES=Català (CAT)
cs_CZ=Čeština (CZ)
cy_GB=Cymraeg (CY)
da_DK=Dansk (Danmark)
de_DE=Deutsch (Deutschland)
el_GR=Ελληνικά (GR)
en_US=English (US)
en_GB=Canadian English (CA)
en_CA=English (UK)
en_PT=Pirate Speak (PIRATE)
es_AR=Español (Argentina)
es_ES=Español (España)
es_MX=Español (MX)
es_UY=Español (Uruguay)
es_VE=Español Venezolano (Ve)
et_EE=Eesti (ET)
eu_ES=Euskara (ES)
fi_FI=Suomi (Suomi)
fr_FR=Français (France)
fr_CA=Français (CA)
gl_ES=Galego (Galicia)
he_IL=עברית (IL)
ky_KG=अंग्रेज़ी (भारत)
hr_HR=Hrvatski (HR)
hu_HU=Български (Bulgarian)
is_IS=Íslenska (IS)
it_IT=Italiano (Italia)
ja_JP=日本語 (日本)
ka_GE=ქართული (საქართველო)
ko_KR=한국어 (한국)
lt_LT=Lietuvių (Lietuva)
lv_LV=Latviešu (Latvija)
mi_NZ=Bahasa Melayu (MS)
nl_NL=Nederlands (Nederland)
nn_NO=Norsk nynorsk (Norge)
nb_NO=Norsk (NO)
pl_PL=Polski (Polska)
pt_BR=Português (Brasil)
pt_PT=Portuguese (Portugal)
qya_AA=Quenya (Arda)
ro_RO=Română (RO)
ru_RU=Русский (Россия)
sk_SK=Slovenčina (SK)
sl_SI=Angleščina (Slovenija)
sr_SP=Srpski (Србија)
sv_SE=Svenska (Sverige)
th_TH=ภาษาไทย (TH)
tlh_AA=tlhIngan Hol (US)
tr_TR=Türkçe (TR)
uk_UA=Українська (Україна)
vi_VN=Tiếng Việt (US)
zh_CN=简体中文 (中国)
zh_TW=繁體中文 (台灣)
12 changes: 6 additions & 6 deletions net/minecraft/server/Achievement.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ public class Achievement extends Statistic {
public final int a;
public final int b;
public final Achievement c;
private final String l;
private final String k;
public final ItemStack d;
private boolean m;
private boolean l;

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

public Achievement(int i, String s, int j, int k, ItemStack itemstack, Achievement achievement) {
super(5242880 + i, LocaleI18n.a("achievement." + s));
super(5242880 + i, "achievement." + s);
this.d = itemstack;
this.l = LocaleI18n.a("achievement." + s + ".desc");
this.k = "achievement." + s + ".desc";
this.a = j;
this.b = k;
if (j < AchievementList.a) {
Expand All @@ -43,12 +43,12 @@ public Achievement(int i, String s, int j, int k, ItemStack itemstack, Achieveme
}

public Achievement a() {
this.g = true;
this.f = true;
return this;
}

public Achievement b() {
this.m = true;
this.l = true;
return this;
}

Expand Down
139 changes: 72 additions & 67 deletions net/minecraft/server/BiomeBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,72 +10,77 @@ public abstract class BiomeBase {
public static final BiomeBase OCEAN = (new BiomeOcean(0)).b(112).a("Ocean").b(-1.0F, 0.4F);
public static final BiomeBase PLAINS = (new BiomePlains(1)).b(9286496).a("Plains").a(0.8F, 0.4F);
public static final BiomeBase DESERT = (new BiomeDesert(2)).b(16421912).a("Desert").g().a(2.0F, 0.0F).b(0.1F, 0.2F);
public static final BiomeBase EXTREME_HILLS = (new BiomeBigHills(3)).b(6316128).a("Extreme Hills").b(0.2F, 1.8F).a(0.2F, 0.3F);
public static final BiomeBase EXTREME_HILLS = (new BiomeBigHills(3)).b(6316128).a("Extreme Hills").b(0.2F, 1.3F).a(0.2F, 0.3F);
public static final BiomeBase FOREST = (new BiomeForest(4)).b(353825).a("Forest").a(5159473).a(0.7F, 0.8F);
public static final BiomeBase TAIGA = (new BiomeTaiga(5)).b(747097).a("Taiga").a(5159473).a(0.3F, 0.8F).b(0.1F, 0.4F);
public static final BiomeBase TAIGA = (new BiomeTaiga(5)).b(747097).a("Taiga").a(5159473).a(0.05F, 0.8F).b(0.1F, 0.4F);
public static final BiomeBase SWAMPLAND = (new BiomeSwamp(6)).b(522674).a("Swampland").a(9154376).b(-0.2F, 0.1F).a(0.8F, 0.9F);
public static final BiomeBase RIVER = (new BiomeRiver(7)).b(255).a("River").b(-0.5F, 0.0F);
public static final BiomeBase HELL = (new BiomeHell(8)).b(16711680).a("Hell").g().a(2.0F, 0.0F);
public static final BiomeBase SKY = (new BiomeTheEnd(9)).b(8421631).a("Sky").g();
public static final BiomeBase FROZEN_OCEAN = (new BiomeOcean(10)).b(9474208).a("FrozenOcean").b(-1.0F, 0.5F).a(0.0F, 0.5F);
public static final BiomeBase FROZEN_RIVER = (new BiomeRiver(11)).b(10526975).a("FrozenRiver").b(-0.5F, 0.0F).a(0.0F, 0.5F);
public static final BiomeBase ICE_PLAINS = (new BiomeIcePlains(12)).b(16777215).a("Ice Plains").a(0.0F, 0.5F);
public static final BiomeBase ICE_MOUNTAINS = (new BiomeIcePlains(13)).b(10526880).a("Ice Mountains").b(0.2F, 1.8F).a(0.0F, 0.5F);
public static final BiomeBase ICE_MOUNTAINS = (new BiomeIcePlains(13)).b(10526880).a("Ice Mountains").b(0.2F, 1.2F).a(0.0F, 0.5F);
public static final BiomeBase MUSHROOM_ISLAND = (new BiomeMushrooms(14)).b(16711935).a("MushroomIsland").a(0.9F, 1.0F).b(0.2F, 1.0F);
public static final BiomeBase MUSHROOM_SHORE = (new BiomeMushrooms(15)).b(10486015).a("MushroomIslandShore").a(0.9F, 1.0F).b(-1.0F, 0.1F);
public String r;
public int s;
public byte t;
public byte u;
public int v;
public float w;
public float x;
public float y;
public float z;
public static final BiomeBase BEACH = (new BiomeBeach(16)).b(16440917).a("Beach").a(0.8F, 0.4F).b(0.0F, 0.1F);
public static final BiomeBase DESERT_HILLS = (new BiomeDesert(17)).b(13786898).a("DesertHills").g().a(2.0F, 0.0F).b(0.2F, 0.7F);
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);
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);
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);
public String w;
public int x;
public byte y;
public byte z;
public int A;
public BiomeDecorator B;
protected List C;
protected List D;
protected List E;
private boolean K;
private boolean L;
public final int F;
protected WorldGenTrees G;
protected WorldGenBigTree H;
protected WorldGenForest I;
protected WorldGenSwampTree J;
public float B;
public float C;
public float D;
public float E;
public int F;
public BiomeDecorator G;
protected List H;
protected List I;
protected List J;
private boolean P;
private boolean Q;
public final int K;
protected WorldGenTrees L;
protected WorldGenBigTree M;
protected WorldGenForest N;
protected WorldGenSwampTree O;

protected BiomeBase(int i) {
this.t = (byte) Block.GRASS.id;
this.u = (byte) Block.DIRT.id;
this.v = 5169201;
this.w = 0.1F;
this.x = 0.3F;
this.y = 0.5F;
this.z = 0.5F;
this.A = 16777215;
this.C = new ArrayList();
this.D = new ArrayList();
this.E = new ArrayList();
this.L = true;
this.G = new WorldGenTrees(false);
this.H = new WorldGenBigTree(false);
this.I = new WorldGenForest(false);
this.J = new WorldGenSwampTree();
this.F = i;
this.y = (byte) Block.GRASS.id;
this.z = (byte) Block.DIRT.id;
this.A = 5169201;
this.B = 0.1F;
this.C = 0.3F;
this.D = 0.5F;
this.E = 0.5F;
this.F = 16777215;
this.H = new ArrayList();
this.I = new ArrayList();
this.J = new ArrayList();
this.Q = true;
this.L = new WorldGenTrees(false);
this.M = new WorldGenBigTree(false);
this.N = new WorldGenForest(false);
this.O = new WorldGenSwampTree();
this.K = i;
a[i] = this;
this.B = this.a();
this.D.add(new BiomeMeta(EntitySheep.class, 12, 4, 4));
this.D.add(new BiomeMeta(EntityPig.class, 10, 4, 4));
this.D.add(new BiomeMeta(EntityChicken.class, 10, 4, 4));
this.D.add(new BiomeMeta(EntityCow.class, 8, 4, 4));
this.C.add(new BiomeMeta(EntitySpider.class, 10, 4, 4));
this.C.add(new BiomeMeta(EntityZombie.class, 10, 4, 4));
this.C.add(new BiomeMeta(EntitySkeleton.class, 10, 4, 4));
this.C.add(new BiomeMeta(EntityCreeper.class, 10, 4, 4));
this.C.add(new BiomeMeta(EntitySlime.class, 10, 4, 4));
this.C.add(new BiomeMeta(EntityEnderman.class, 1, 1, 4));
this.E.add(new BiomeMeta(EntitySquid.class, 10, 4, 4));
this.G = this.a();
this.I.add(new BiomeMeta(EntitySheep.class, 12, 4, 4));
this.I.add(new BiomeMeta(EntityPig.class, 10, 4, 4));
this.I.add(new BiomeMeta(EntityChicken.class, 10, 4, 4));
this.I.add(new BiomeMeta(EntityCow.class, 8, 4, 4));
this.H.add(new BiomeMeta(EntitySpider.class, 10, 4, 4));
this.H.add(new BiomeMeta(EntityZombie.class, 10, 4, 4));
this.H.add(new BiomeMeta(EntitySkeleton.class, 10, 4, 4));
this.H.add(new BiomeMeta(EntityCreeper.class, 10, 4, 4));
this.H.add(new BiomeMeta(EntitySlime.class, 10, 4, 4));
this.H.add(new BiomeMeta(EntityEnderman.class, 1, 1, 4));
this.J.add(new BiomeMeta(EntitySquid.class, 10, 4, 4));
}

protected BiomeDecorator a() {
Expand All @@ -86,67 +91,67 @@ private BiomeBase a(float f, float f1) {
if (f > 0.1F && f < 0.2F) {
throw new IllegalArgumentException("Please avoid temperatures in the range 0.1 - 0.2 because of snow");
} else {
this.y = f;
this.z = f1;
this.D = f;
this.E = f1;
return this;
}
}

private BiomeBase b(float f, float f1) {
this.w = f;
this.x = f1;
this.B = f;
this.C = f1;
return this;
}

private BiomeBase g() {
this.L = false;
this.Q = false;
return this;
}

public WorldGenerator a(Random random) {
return (WorldGenerator) (random.nextInt(10) == 0 ? this.H : this.G);
return (WorldGenerator) (random.nextInt(10) == 0 ? this.M : this.L);
}

protected BiomeBase a(String s) {
this.r = s;
this.w = s;
return this;
}

protected BiomeBase a(int i) {
this.v = i;
this.A = i;
return this;
}

protected BiomeBase b(int i) {
this.s = i;
this.x = i;
return this;
}

public List getMobs(EnumCreatureType enumcreaturetype) {
return enumcreaturetype == EnumCreatureType.MONSTER ? this.C : (enumcreaturetype == EnumCreatureType.CREATURE ? this.D : (enumcreaturetype == EnumCreatureType.WATER_CREATURE ? this.E : null));
return enumcreaturetype == EnumCreatureType.MONSTER ? this.H : (enumcreaturetype == EnumCreatureType.CREATURE ? this.I : (enumcreaturetype == EnumCreatureType.WATER_CREATURE ? this.J : null));
}

public boolean b() {
return this.K;
return this.P;
}

public boolean c() {
return this.K ? false : this.L;
return this.P ? false : this.Q;
}

public float d() {
return 0.1F;
}

public final int e() {
return (int) (this.z * 65536.0F);
return (int) (this.E * 65536.0F);
}

public final int f() {
return (int) (this.y * 65536.0F);
return (int) (this.D * 65536.0F);
}

public void a(World world, Random random, int i, int j) {
this.B.a(world, random, i, j);
this.G.a(world, random, i, j);
}
}
15 changes: 15 additions & 0 deletions net/minecraft/server/BiomeBeach.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package net.minecraft.server;

public class BiomeBeach extends BiomeBase {

public BiomeBeach(int i) {
super(i);
this.I.clear();
this.y = (byte) Block.SAND.id;
this.z = (byte) Block.SAND.id;
this.G.z = -999;
this.G.C = 0;
this.G.E = 0;
this.G.F = 0;
}
}
14 changes: 7 additions & 7 deletions net/minecraft/server/BiomeDesert.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ public class BiomeDesert extends BiomeBase {

public BiomeDesert(int i) {
super(i);
this.D.clear();
this.t = (byte) Block.SAND.id;
this.u = (byte) Block.SAND.id;
this.B.z = -999;
this.B.C = 2;
this.B.E = 50;
this.B.F = 10;
this.I.clear();
this.y = (byte) Block.SAND.id;
this.z = (byte) Block.SAND.id;
this.G.z = -999;
this.G.C = 2;
this.G.E = 50;
this.G.F = 10;
}
}
8 changes: 4 additions & 4 deletions net/minecraft/server/BiomeForest.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ public class BiomeForest extends BiomeBase {

public BiomeForest(int i) {
super(i);
this.D.add(new BiomeMeta(EntityWolf.class, 5, 4, 4));
this.B.z = 10;
this.B.B = 2;
this.I.add(new BiomeMeta(EntityWolf.class, 5, 4, 4));
this.G.z = 10;
this.G.B = 2;
}

public WorldGenerator a(Random random) {
return (WorldGenerator) (random.nextInt(5) == 0 ? this.I : (random.nextInt(10) == 0 ? this.H : this.G));
return (WorldGenerator) (random.nextInt(5) == 0 ? this.N : (random.nextInt(10) == 0 ? this.M : this.L));
}
}
12 changes: 6 additions & 6 deletions net/minecraft/server/BiomeHell.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ public class BiomeHell extends BiomeBase {

public BiomeHell(int i) {
super(i);
this.C.clear();
this.D.clear();
this.E.clear();
this.C.add(new BiomeMeta(EntityGhast.class, 50, 4, 4));
this.C.add(new BiomeMeta(EntityPigZombie.class, 100, 4, 4));
this.C.add(new BiomeMeta(EntityMagmaCube.class, 1, 4, 4));
this.H.clear();
this.I.clear();
this.J.clear();
this.H.add(new BiomeMeta(EntityGhast.class, 50, 4, 4));
this.H.add(new BiomeMeta(EntityPigZombie.class, 100, 4, 4));
this.H.add(new BiomeMeta(EntityMagmaCube.class, 1, 4, 4));
}
}
Loading

0 comments on commit fc61896

Please sign in to comment.