diff options
author | Dream-Master <dream-master@gmx.net> | 2018-09-15 22:58:32 +0200 |
---|---|---|
committer | Dream-Master <dream-master@gmx.net> | 2018-09-15 22:58:32 +0200 |
commit | 109a4bd7704ef26177105ad965dc3f0a6d5e06b8 (patch) | |
tree | a2f838f41c1466e74796e9ec382c0d02cb5bc11f /src/main/java | |
parent | 606610937e26ab0916f0413c84d1f331fc1ae12c (diff) | |
download | GT5-Unofficial-109a4bd7704ef26177105ad965dc3f0a6d5e06b8.tar.gz GT5-Unofficial-109a4bd7704ef26177105ad965dc3f0a6d5e06b8.tar.bz2 GT5-Unofficial-109a4bd7704ef26177105ad965dc3f0a6d5e06b8.zip |
Fix name spaces and derps
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java | 28 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/misc/GT_Bees.java | 9 |
2 files changed, 19 insertions, 18 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 237b3b85cf..b59d58301e 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -279,7 +279,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Demonic"), getSpecies(EXTRABEES,"volcanic"), 10); tMutation.requireResource(Block.getBlockFromItem(GT_ModHandler.getModItem("IC2", "fluidHotCoolant", 1).getItem()), 0); - tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(128));//Boneyard Biome + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(128, "Boneyard Biome"));//Boneyard Biome } }, LAPOTRON(GT_BranchDefinition.IC2, "Lapotron", false, 0x6478FF, 0x1414FF) { @@ -535,7 +535,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }, //thaumic - THAUMIMDUST(GT_BranchDefinition.THAUMIC, "ThaumiumDust", true, 0x7A007A, 0x5C005C) { + THAUMIUMDUST(GT_BranchDefinition.THAUMIC, "ThaumiumDust", true, 0x7A007A, 0x5C005C) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 3), 0.30f); @@ -558,7 +558,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(getSpecies(MAGICBEES,"TCFire"), getSpecies(FORRESTRY,"Edenic"), 10); tMutation.requireResource("blockThaumium"); - tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192));//magical forest + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest"));//magical forest } }, THAUMIMSHARD(GT_BranchDefinition.THAUMIC, "ThaumiumShard", true, 0x9966FF, 0xAD85FF) { @@ -583,8 +583,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(THAUMIMDUST.species, getSpecies(MAGICBEES,"TCWater"), 10); - tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192));//magical forest + IBeeMutationCustom tMutation = registerMutation(THAUMIUMDUST.species, getSpecies(MAGICBEES,"TCWater"), 10); + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest"));//magical forest } }, AMBER(GT_BranchDefinition.THAUMIC, "Amber", true, 0xEE7700, 0x774B15) { @@ -606,7 +606,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(THAUMIMDUST.species, STICKYRESIN.species, 10); + IBeeMutationCustom tMutation = registerMutation(THAUMIUMDUST.species, STICKYRESIN.species, 10); tMutation.requireResource("blockAmber"); } }, @@ -630,7 +630,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(THAUMIMDUST.species, SILVER.species, 10); + IBeeMutationCustom tMutation = registerMutation(THAUMIUMDUST.species, SILVER.species, 10); } }, SALISMUNDUS(GT_BranchDefinition.THAUMIC, "SalisMundus", true, 0xF7ADDE, 0x592582) { @@ -653,8 +653,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(THAUMIMDUST.species, THAUMIMSHARD.species, 8); - tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192));//magical forest + IBeeMutationCustom tMutation = registerMutation(THAUMIUMDUST.species, THAUMIMSHARD.species, 8); + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest"));//magical forest } }, TAINTED(GT_BranchDefinition.THAUMIC, "Tainted", true, 0x904BB8, 0xE800FF) { @@ -681,8 +681,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(THAUMIMDUST.species, THAUMIMSHARD.species, 8); - tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(193));//Tainted Land + IBeeMutationCustom tMutation = registerMutation(THAUMIUMDUST.species, THAUMIMSHARD.species, 8); + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(193, "Tainted Land"));//Tainted Land } }, MITHRIL(GT_BranchDefinition.THAUMIC, "Mithril", true, 0xF0E68C, 0xFFFFD2) { @@ -763,7 +763,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(getSpecies(MAGICBEES,"TCOrder"), THAUMIMDUST.species, 8); + IBeeMutationCustom tMutation = registerMutation(getSpecies(MAGICBEES,"TCOrder"), THAUMIUMDUST.species, 8); tMutation.requireResource(GameRegistry.findBlock("thaumicbases", "thauminiteBlock"), 0); } }, @@ -812,7 +812,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(DIAMOND.species, IRON.species, 3); - tMutation.requireResource(GameRegistry.findBlock("ExtraUtilities", "decorativeBlock1"), 2); + tMutation.requireResource(GameRegistry.findBlock("ExtraUtilities", "decorativeBlock1"), 5); } }, SPARKELING(GT_BranchDefinition.THAUMIC, "NetherStar", true, 0x7A007A, 0xFFFFFF) { @@ -840,7 +840,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(getSpecies(MAGICBEES,"Withering"), getSpecies(MAGICBEES, "Draconic"), 1); tMutation.requireResource(GregTech_API.sBlockGem3, 3); - tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9));//sky end biome + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Dimension"));//sky end biome } }, //gems diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GT_Bees.java index b4f49e8dca..1dc1479acb 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Bees.java +++ b/src/main/java/gregtech/loaders/misc/GT_Bees.java @@ -142,7 +142,7 @@ public class GT_Bees { @Override public String getDescription() { - return StringUtil.localizeAndFormat("mutation.condition.dim") + dimName; + return StringUtil.localizeAndFormat("mutation.condition.dim") + " " + dimName; } } @@ -150,9 +150,11 @@ public class GT_Bees { public static class BiomeIDMutationCondition implements IMutationCondition { int biomeID; + String biomeName; - public BiomeIDMutationCondition(int id) { + public BiomeIDMutationCondition(int id, String name) { biomeID = id; + biomeName = name; } @Override @@ -164,8 +166,7 @@ public class GT_Bees { @Override public String getDescription() { if (BiomeGenBase.getBiome(biomeID)!=null) { - String biomeName = BiomeGenBase.getBiome(biomeID).biomeName.toLowerCase(Locale.ENGLISH); - return StringUtil.localizeAndFormat("mutation.condition.biomeid") + biomeName; + return StringUtil.localizeAndFormat("mutation.condition.biomeid") + " " + biomeName; } return ""; } |