From 5563b518c5a509283d6fcea57a39e422b6e71aea Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 12 May 2013 05:55:44 -0400 Subject: [PATCH 01/10] Added slimes to other swampy biomes. Added poison dart textures. Tweaked crafting recipes and Promised Land biomes. --- .../biomesoplenty/biomes/BiomeGenBayou.java | 3 +++ .../biomesoplenty/biomes/BiomeGenDeadSwamp.java | 3 +++ .../biomesoplenty/biomes/BiomeGenFen.java | 3 +++ .../biomesoplenty/biomes/BiomeGenMarsh.java | 3 +++ .../biomes/BiomeGenPromisedLandForest.java | 3 ++- .../biomes/BiomeGenPromisedLandPlains.java | 5 ++++- .../biomes/BiomeGenPromisedLandSwamp.java | 5 ++++- .../biomesoplenty/biomes/BiomeGenQuagmire.java | 3 +++ .../biomes/BiomeGenSwampwoods.java | 1 + .../biomesoplenty/biomes/BiomeGenWetland.java | 3 +++ .../configuration/BOPConfiguration.java | 12 ++++-------- .../configuration/BOPCrafting.java | 5 ++--- .../BiomesOPlenty/textures/items/poisondart.png | Bin 256 -> 282 bytes .../mods/BiomesOPlenty/textures/mobs/glob.png | Bin 0 -> 594 bytes .../textures/projectiles/poisondart.png | Bin 355 -> 273 bytes 15 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/mobs/glob.png diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java b/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java index 9fac51e88..f55ef168c 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java @@ -9,8 +9,10 @@ import biomesoplenty.worldgen.WorldGenBayou2; import biomesoplenty.worldgen.WorldGenBayou3; import biomesoplenty.worldgen.WorldGenMoss; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; public class BiomeGenBayou extends BiomeGenBase @@ -39,6 +41,7 @@ public class BiomeGenBayou extends BiomeGenBase this.customBiomeDecorator.generatePumpkins = false; this.waterColorMultiplier = 16767282; this.spawnableWaterCreatureList.clear(); + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } /** diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java index 83231ef51..769f923d5 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java @@ -9,7 +9,9 @@ import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.worldgen.WorldGenDeadTree; import net.minecraft.block.Block; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; @@ -35,6 +37,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase this.spawnableCreatureList.clear(); this.spawnableWaterCreatureList.clear(); this.waterColorMultiplier = 10661201; + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } /** diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenFen.java b/src/minecraft/biomesoplenty/biomes/BiomeGenFen.java index dc58feb86..e6ccddce0 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenFen.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenFen.java @@ -10,9 +10,11 @@ import biomesoplenty.worldgen.WorldGenFen2; import biomesoplenty.worldgen.WorldGenMoss; import net.minecraft.block.Block; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; @@ -41,6 +43,7 @@ public class BiomeGenFen extends BiomeGenBase this.customBiomeDecorator.reedsBOPPerChunk = 5; this.customBiomeDecorator.algaePerChunk = 1; this.customBiomeDecorator.portobellosPerChunk = 1; + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } /** diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenMarsh.java b/src/minecraft/biomesoplenty/biomes/BiomeGenMarsh.java index 96dcfd93b..78e37ded2 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenMarsh.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenMarsh.java @@ -7,9 +7,11 @@ import biomesoplenty.configuration.BOPBlocks; import biomesoplenty.worldgen.WorldGenMarsh; import net.minecraft.block.Block; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; @@ -29,6 +31,7 @@ public class BiomeGenMarsh extends BiomeGenBase this.customBiomeDecorator.grassPerChunk = 65; this.customBiomeDecorator.highGrassPerChunk = 25; this.customBiomeDecorator.generatePumpkins = false; + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } public void decorate(World par1World, Random par2Random, int par3, int par4) diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java index 9538036dc..def2747e1 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java @@ -15,6 +15,7 @@ import biomesoplenty.worldgen.WorldGenWaterSpring; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenerator; @@ -91,7 +92,7 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase { if (BOPConfiguration.skyColors = true) { - return BOPConfiguration.pLForestSkyColour; + return BOPConfiguration.promisedLandSkyColor; } else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java index 6005ffccb..f555ede65 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java @@ -14,8 +14,10 @@ import biomesoplenty.worldgen.WorldGenPromisedTree3; import biomesoplenty.worldgen.WorldGenWaterSpring; import net.minecraft.block.Block; +import net.minecraft.entity.passive.EntityChicken; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenerator; @@ -48,6 +50,7 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase this.customBiomeDecorator.generateClouds = true; //this.customBiomeDecorator.generateLakes = false; this.theWorldGenerator = new WorldGenWaterSpring(Block.waterMoving.blockID, 8); + this.spawnableCreatureList.add(new SpawnListEntry(EntityChicken.class, 10, 4, 4)); } /** @@ -90,7 +93,7 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase { if (BOPConfiguration.skyColors = true) { - return BOPConfiguration.pLPlainsSkyColour; + return BOPConfiguration.promisedLandSkyColor; } else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java index 4cc92d674..b14cfb39f 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java @@ -12,8 +12,10 @@ import biomesoplenty.worldgen.WorldGenPromisedWillowTree; import biomesoplenty.worldgen.WorldGenWaterSpring; import net.minecraft.block.Block; +import net.minecraft.entity.passive.EntityPig; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; public class BiomeGenPromisedLandSwamp extends BiomeGenBase @@ -47,6 +49,7 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase this.spawnableCaveCreatureList.clear(); this.customBiomeDecorator.generatePumpkins = false; this.customBiomeDecorator.generateClouds = true; + this.spawnableCreatureList.add(new SpawnListEntry(EntityPig.class, 10, 4, 4)); //this.customBiomeDecorator.generateLakes = false; this.theWorldGenerator = new WorldGenWaterSpring(Block.waterMoving.blockID, 8); } @@ -91,7 +94,7 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase { if (BOPConfiguration.skyColors = true) { - return BOPConfiguration.pLSwampSkyColour; + return BOPConfiguration.promisedLandSkyColor; } else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java b/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java index 6151a32d6..929d0864d 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java @@ -3,7 +3,9 @@ package biomesoplenty.biomes; import java.awt.Color; import java.util.Random; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.BOPConfiguration; @@ -29,6 +31,7 @@ public class BiomeGenQuagmire extends BiomeGenBase this.customBiomeDecorator.sandPerChunk2 = -999; this.waterColorMultiplier = 13390080; this.customBiomeDecorator.generateQuagmire = true; + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } /** diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenSwampwoods.java b/src/minecraft/biomesoplenty/biomes/BiomeGenSwampwoods.java index 7a845f82a..216c07800 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenSwampwoods.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenSwampwoods.java @@ -8,6 +8,7 @@ import biomesoplenty.worldgen.WorldGenCypress; import biomesoplenty.worldgen.WorldGenMarsh; import net.minecraft.block.Block; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenWetland.java b/src/minecraft/biomesoplenty/biomes/BiomeGenWetland.java index 5d64631df..ed63e94a3 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenWetland.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenWetland.java @@ -7,8 +7,10 @@ import biomesoplenty.worldgen.WorldGenTaiga5; import biomesoplenty.worldgen.WorldGenWillow; import net.minecraft.block.Block; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; @@ -41,6 +43,7 @@ public class BiomeGenWetland extends BiomeGenBase this.customBiomeDecorator.portobellosPerChunk = 1; this.spawnableCreatureList.clear(); this.spawnableWaterCreatureList.clear(); + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); this.waterColorMultiplier = 6512772; } diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index 590b0bfca..932a0c705 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -21,9 +21,7 @@ public class BOPConfiguration { public static int promisedLandDimID; - public static int pLSwampSkyColour; - public static int pLPlainsSkyColour; - public static int pLForestSkyColour; + public static int promisedLandSkyColor; public static boolean alpsGen; public static boolean arcticGen; @@ -422,12 +420,10 @@ public class BOPConfiguration { if (villageDistance < 8) villageDistance = 8; - //Sky colour - skyColors = config.get("Sky Colours", "Enable Sky Colours", true).getBoolean(false); + //Hard-Coded Colors + skyColors = config.get("Hard-Coded Colors", "Enable Sky Colors", true).getBoolean(false); - pLSwampSkyColour = config.get("Sky Colours", "Promised Land Swamp Sky Colour", 50175, null).getInt(); - pLPlainsSkyColour = config.get("Sky Colours", "Promised Land Plains Sky Colour", 50175, null).getInt(); - pLForestSkyColour = config.get("Sky Colours", "Promised Land Forest Sky Colour", 50175, null).getInt(); + promisedLandSkyColor = config.get("Hard-Coded Colors", "Promised Land Sky Color", 50175, null).getInt(); //Biome generation alpsGen = config.get("Biomes To Generate", "Alps", true).getBoolean(false); diff --git a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java index ce14a791f..8aa85fe00 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java +++ b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java @@ -156,9 +156,8 @@ public class BOPCrafting //Dart Blower GameRegistry.addRecipe(new ItemStack(Items.dartBlower.get(), 1), new Object[] {"R R", "R R", "R R", Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 8)}); - GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 4, 0), new Object[] {"T", "R", Character.valueOf('T'), new ItemStack(Blocks.plants.get(), 1, 5), Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 7)}); - GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 4, 1), new Object[] {"P", "T", "R", Character.valueOf('P'), new ItemStack(Items.miscItems.get(), 1, 3), Character.valueOf('T'), new ItemStack(Blocks.plants.get(), 1, 5), Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 7)}); - GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 4, 1), new Object[] {" D ", "DPD", " D ", Character.valueOf('P'), new ItemStack(Items.miscItems.get(), 1, 3), Character.valueOf('D'), new ItemStack(Items.dart.get(), 1, 0)}); + GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 4, 0), new Object[] {"T", "R", "F", Character.valueOf('T'), new ItemStack(Blocks.plants.get(), 1, 5), Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 8), Character.valueOf('F'), Item.feather}); + GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 1, 1), new Object[] {"P", "D", Character.valueOf('P'), new ItemStack(Items.miscItems.get(), 1, 3), Character.valueOf('D'), new ItemStack(Items.dart.get(), 1, 0)}); GameRegistry.addRecipe(new ItemStack(Blocks.planks.get(), 1, 10), new Object[] {"##", "##", '#', Blocks.bamboo.get()}); diff --git a/src/minecraft/mods/BiomesOPlenty/textures/items/poisondart.png b/src/minecraft/mods/BiomesOPlenty/textures/items/poisondart.png index 99bc3541ef8c6b265d4d45b7d108b759d476ac6c..a6de29464f0bc25e8c783559ec45f3c77ed7121e 100644 GIT binary patch delta 193 zcmV;y06zbK0-6GlJPN@801m+cxRGn^kwz(hmPtfGR5(v#7-pdLQO$o4F3(H;4;3N} zBpeI>pLrwx|N2`C{~x`!g*<~QR^6|BP^6iLfPn!3N={}0ucU?X00000NkvXXu0mjfsVP$` delta 167 zcmV;Y09gN;0)PULJPN`901mR5(v#7-r!1rQ`oWxI8cUKU9b` zFtMxY|G}N>z=n`*5V9d;8vw$cMPXp9%Ev&uA-ZaE|HIr({ud{BkZ%YGARBTd!U>EM z7)Ue>WC#d@G|zN{&?FgBWUT%lgpoCqYye0zh~^_zGYr5qgD_NxbU=}28Uh9e09RWQ VXJ}JGo1Fjv002ovPDHLkV1ik>KxqH~ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/mobs/glob.png b/src/minecraft/mods/BiomesOPlenty/textures/mobs/glob.png new file mode 100644 index 0000000000000000000000000000000000000000..4223e8376d60d3d727f308ff65afaa40dea84b28 GIT binary patch literal 594 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F52SJ!|$HeTnKtZVz*NBqf{Irtt#G+J&fW*wa5hJyShH1A{L`3mF&~ z&w08yhGaOu4Keg$aTK_7;RgE;HbLK~4h902EP*{PHiCvGhK4)tcdn0GxzzjBt#`I! zF==;aH!VuvonEzS*3Rs0iGORpvF?kTU*ndYI%T_==B;gSQwuM2%&OjL_3oN{e>d;u zixbxPcAeO=$zqSL<-TCk*4&YQ1*#_Dko4&eTd8zo zhJ2r!-K$0<@@QhFz{ZCz(ubC;jtV#*X|R@X0V4)zO9C?uDNnNFzn zakH$LsB$*F^uqg#;tNdqRIIXr#yW*eSvU2}{`>R)t@>*CntfK!%fy`)Iqetv&axYP zEhygSIIDKo?l=1+)2$m$WXL+m9^m6m;COrEzjMkn{mkn=;sTaWRyIdym+lv`+?}?o z;l$OquIVik+pa7*U#wv=>*?EBFPW4=O_X?3E7wfj72i20);QMT$+`UvhMCtxfWSw< b_cL$8RqK_^r=8`1@z3Dt>gTe~DWM4f4%GiS literal 0 HcmV?d00001 diff --git a/src/minecraft/mods/BiomesOPlenty/textures/projectiles/poisondart.png b/src/minecraft/mods/BiomesOPlenty/textures/projectiles/poisondart.png index 7851c176442d90e5598f9338f034c0ebb0dd02af..8d6b62717061cc9cf4547212dc6569709a9aac7e 100644 GIT binary patch delta 187 zcmV;s07U=e0+9lcB#|)~3c>&Y4#EKyC`y2lQz?IqNkl9Bd6rfD{0$3El@PLKHfQ0}I p40t0N7zLwX6pVsVFhT(X0{}7bnR|x*C}aQt002ovPDHLkV1g>{NJ#(y delta 267 zcmV+m0rdWn0^ Date: Sun, 12 May 2013 07:31:51 -0400 Subject: [PATCH 02/10] Changed the names of some of the Promised Land blocks. --- .../biomesoplenty/blocks/BlockBOPSapling.java | 2 +- .../configuration/BOPBlocks.java | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java b/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java index 8ffa00b72..1e3c98ece 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java @@ -78,7 +78,7 @@ public class BlockBOPSapling extends BlockSapling if (itemStack.itemID == this.blockID) switch (meta) { - case 7: // Holy + case 7: // Loftwood return id == Blocks.holyGrass.get().blockID; default: diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index b2504e55e..e4d24b841 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -319,14 +319,14 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,0), "Acacia Sapling"); LanguageRegistry.addName(Blocks.hardDirt.get(), "Hard Dirt"); // LanguageRegistry.addName(Blocks.holyGrass.get(), "Holy Grass"); - LanguageRegistry.addName(new ItemStack(Blocks.holyGrass.get(), 1, 0), "Holy Grass"); + LanguageRegistry.addName(new ItemStack(Blocks.holyGrass.get(), 1, 0), "Purified Grass"); LanguageRegistry.addName(new ItemStack(Blocks.holyGrass.get(), 1, 1), "Smoldering Grass"); - LanguageRegistry.addName(Blocks.holyDirt.get(), "Holy Dirt"); - LanguageRegistry.addName(Blocks.holyStone.get(), "Holy Stone"); + LanguageRegistry.addName(Blocks.holyDirt.get(), "Purified Dirt"); + LanguageRegistry.addName(Blocks.holyStone.get(), "Skystone"); LanguageRegistry.addName(Blocks.crystal.get(), "Celestial Crystal"); - LanguageRegistry.addName(new ItemStack(Blocks.plants.get(),1,4), "Holy Tall Grass"); + LanguageRegistry.addName(new ItemStack(Blocks.plants.get(),1,4), "Purified Tall Grass"); LanguageRegistry.addName(Blocks.promisedPortal.get(), "Promised Land Portal"); - LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,7), "Holy Sapling"); + LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,7), "Loftwood Sapling"); // LanguageRegistry.addName(Blocks.amethystOre.get(), "Amethyst Ore"); // LanguageRegistry.addName(Blocks.amethystBlock.get(), "Block of Amethyst"); LanguageRegistry.addName(new ItemStack(Blocks.amethystOre.get(),1,0), "Amethyst Ore"); @@ -345,7 +345,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 1), "Cherry Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 2), "Dark Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 3), "Fir Wood Planks"); - LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 4), "Holy Wood Planks"); + LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 4), "Loftwood Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 5), "Magic Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 6), "Mangrove Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 7), "Palm Wood Planks"); @@ -358,7 +358,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.logs1.get(),1,2), "Dark Wood"); LanguageRegistry.addName(new ItemStack(Blocks.logs1.get(),1,3), "Fir Wood"); - LanguageRegistry.addName(new ItemStack(Blocks.logs2.get(),1,0), "Holy Wood"); + LanguageRegistry.addName(new ItemStack(Blocks.logs2.get(),1,0), "Loftwood Wood"); LanguageRegistry.addName(new ItemStack(Blocks.logs2.get(),1,1), "Magic Wood"); LanguageRegistry.addName(new ItemStack(Blocks.logs2.get(),1,2), "Mangrove Wood"); LanguageRegistry.addName(new ItemStack(Blocks.logs2.get(),1,3), "Palm Wood"); @@ -372,7 +372,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,1), "Cherry Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,2), "Dark Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,3), "Fir Wood Slab"); - LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,4), "Holy Wood Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,4), "Loftwood Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,5), "Magic Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,6), "Mangrove Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,7), "Palm Wood Slab"); @@ -383,7 +383,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,1), "Cherry Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,2), "Dark Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,3), "Fir Wood Slab"); - LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,4), "Holy Wood Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,4), "Loftwood Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,5), "Magic Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,6), "Mangrove Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,7), "Palm Wood Slab"); @@ -394,7 +394,7 @@ public class BOPBlocks { LanguageRegistry.addName(Blocks.cherryStairs.get(), "Cherry Wood Stairs"); LanguageRegistry.addName(Blocks.darkStairs.get(), "Dark Wood Stairs"); LanguageRegistry.addName(Blocks.firStairs.get(), "Fir Wood Stairs"); - LanguageRegistry.addName(Blocks.holyStairs.get(), "Holy Wood Stairs"); + LanguageRegistry.addName(Blocks.holyStairs.get(), "Loftwood Wood Stairs"); LanguageRegistry.addName(Blocks.magicStairs.get(), "Magic Wood Stairs"); LanguageRegistry.addName(Blocks.mangroveStairs.get(), "Mangrove Wood Stairs"); LanguageRegistry.addName(Blocks.palmStairs.get(), "Palm Wood Stairs"); @@ -408,7 +408,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,3), "Dark Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,2), "Palm Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,1), "Mangrove Leaves"); - LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,6), "Holy Leaves"); + LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,6), "Loftwood Leaves"); } private static void addGrassPlants() From e85443bdd0090126b59de85503258e7117345034 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 12 May 2013 08:38:39 -0400 Subject: [PATCH 03/10] Added Skystone Cobble/Brick, along with stairs and slabs for both. --- .../biomesoplenty/api/BlockReferences.java | 1 + src/minecraft/biomesoplenty/api/Blocks.java | 2 + .../blocks/BlockBOPSkystone.java | 108 ++++++++++++++++++ .../biomesoplenty/blocks/BlockBOPSlab.java | 20 +++- .../biomesoplenty/blocks/BlockBOPStairs.java | 4 +- .../configuration/BOPBlocks.java | 16 ++- .../configuration/BOPConfiguration.java | 7 +- .../biomesoplenty/items/ItemBOPSkystone.java | 27 +++++ .../textures/blocks/amethystore.png | Bin 366 -> 450 bytes .../textures/blocks/holybrick.png | Bin 0 -> 325 bytes .../textures/blocks/holycobble.png | Bin 0 -> 552 bytes .../textures/blocks/holystone.png | Bin 334 -> 334 bytes 12 files changed, 177 insertions(+), 8 deletions(-) create mode 100644 src/minecraft/biomesoplenty/blocks/BlockBOPSkystone.java create mode 100644 src/minecraft/biomesoplenty/items/ItemBOPSkystone.java create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/holybrick.png create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/holycobble.png diff --git a/src/minecraft/biomesoplenty/api/BlockReferences.java b/src/minecraft/biomesoplenty/api/BlockReferences.java index 613806478..68e629d74 100644 --- a/src/minecraft/biomesoplenty/api/BlockReferences.java +++ b/src/minecraft/biomesoplenty/api/BlockReferences.java @@ -102,6 +102,7 @@ public class BlockReferences { holyGrass (Blocks.holyGrass, 0), holyDirt (Blocks.holyDirt, 0), holyStone (Blocks.holyStone, 0), + holyStoneCobble (Blocks.holyStone, 1), crystal (Blocks.crystal, 0), cragRock (Blocks.cragRock, 0), quicksand (Blocks.mud, 1), diff --git a/src/minecraft/biomesoplenty/api/Blocks.java b/src/minecraft/biomesoplenty/api/Blocks.java index f8c99f57a..09b0456b6 100644 --- a/src/minecraft/biomesoplenty/api/Blocks.java +++ b/src/minecraft/biomesoplenty/api/Blocks.java @@ -46,6 +46,8 @@ public class Blocks public static Optional redCobbleStairs = Optional.absent(); public static Optional redBricksStairs = Optional.absent(); public static Optional mudBricksStairs = Optional.absent(); + public static Optional holyCobbleStairs = Optional.absent(); + public static Optional holyBricksStairs = Optional.absent(); // Slabs public static Optional woodenSingleSlab1 = Optional.absent(); diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPSkystone.java b/src/minecraft/biomesoplenty/blocks/BlockBOPSkystone.java new file mode 100644 index 000000000..864a0a9f6 --- /dev/null +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPSkystone.java @@ -0,0 +1,108 @@ +package biomesoplenty.blocks; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import biomesoplenty.BiomesOPlenty; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockBOPSkystone extends Block +{ + private static final String[] types = new String[] {"holystone", "holycobble", "holybrick"}; + private Icon[] textures = {null, null, null}; + + public BlockBOPSkystone(int par1) + { + super(par1, Material.rock); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); + setStepSound(Block.soundStoneFootstep); + } + + @Override + public void registerIcons(IconRegister iconRegister) + { + textures = new Icon[types.length]; + + for (int i = 0; i < types.length; ++i) + textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+types[i]); + } + + @Override + public Icon getIcon(int side, int meta) + { + if (meta < 0 || meta >= textures.length) + meta = 0; + + return textures[meta]; + } + + @Override + public int getDamageValue(World world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z); + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) { + for (int i = 0; i < types.length; ++i) + list.add(new ItemStack(blockID, 1, i)); + } + + @Override + public int damageDropped(int meta) + { + return meta == 0 ? 1 : meta; + } + + @Override + public float getBlockHardness(World world, int x, int y, int z) + { + int meta = world.getBlockMetadata(x, y, z); + float hardness = this.blockHardness; + + switch (meta) + { + case 0: + hardness = 1.0F; + break; + + case 1: + hardness = 1.6F; + break; + + case 2: + hardness = 1.1F; + break; + } + + return hardness; + } + + @Override + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) + { + int meta = world.getBlockMetadata(x, y, z); + float resistance = this.blockResistance; + + switch (meta) + { + case 1: + resistance = 7.5F; + break; + + case 2: + resistance = 7.0F; + break; + } + + return resistance / 5.0F; + } +} diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java b/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java index 22461df23..439c183d3 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java @@ -26,7 +26,7 @@ public class BlockBOPSlab extends BlockHalfSlab WOOD1, WOOD2, STONE; } private static final String[] woodTypes = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow"}; - private static final String[] rockTypes = new String[] {"redcobble", "redbrick", "mudbrick"}; + private static final String[] rockTypes = new String[] {"redcobble", "redbrick", "mudbrick", "holycobble", "holybrick"}; private Icon[] textures; protected final boolean isDoubleSlab; @@ -91,7 +91,7 @@ public class BlockBOPSlab extends BlockHalfSlab else if (category == SlabCategory.WOOD2) max = 2; else if (category == SlabCategory.STONE) - max = 3; + max = 5; for (int i = 0; i < max; ++i) list.add(new ItemStack(blockID, 1, i)); @@ -148,6 +148,14 @@ public class BlockBOPSlab extends BlockHalfSlab case 2: hardness = 1.0F; + break; + + case 3: + hardness = 1.6F; + break; + + case 4: + hardness = 1.1F; break; } } @@ -175,6 +183,14 @@ public class BlockBOPSlab extends BlockHalfSlab case 2: resistance = 2.0F; + break; + + case 3: + resistance = 7.0F; + break; + + case 4: + resistance = 7.5F; break; } } diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java b/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java index db86a4f54..07d0b85cb 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java @@ -13,10 +13,10 @@ public class BlockBOPStairs extends BlockStairs { public static enum Category { - ACACIA, CHERRY, DARK, FIR, HOLY, MAGIC, MANGROVE, PALM, REDWOOD, WILLOW, RED_COBBLE, RED_BRICKS, MUD_BRICKS; + ACACIA, CHERRY, DARK, FIR, HOLY, MAGIC, MANGROVE, PALM, REDWOOD, WILLOW, RED_COBBLE, RED_BRICKS, MUD_BRICKS, HOLY_COBBLE, HOLY_BRICKS; } - private static final String[] types = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "redcobble", "redbrick", "mudbrick"}; + private static final String[] types = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "redcobble", "redbrick", "mudbrick", "holycobble", "holybrick"}; private Icon[] textures; private final Category category; diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index e4d24b841..3858a382a 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -25,6 +25,7 @@ import biomesoplenty.blocks.BlockBOPPlank; import biomesoplenty.blocks.BlockBOPPlant; import biomesoplenty.blocks.BlockBOPRedRock; import biomesoplenty.blocks.BlockBOPSapling; +import biomesoplenty.blocks.BlockBOPSkystone; import biomesoplenty.blocks.BlockBOPSlab; import biomesoplenty.blocks.BlockBOPSlab.SlabCategory; import biomesoplenty.blocks.BlockBOPStairs; @@ -54,6 +55,7 @@ import biomesoplenty.items.ItemBOPPlank; import biomesoplenty.items.ItemBOPPlant; import biomesoplenty.items.ItemBOPRedRock; import biomesoplenty.items.ItemBOPSapling; +import biomesoplenty.items.ItemBOPSkystone; import biomesoplenty.items.ItemBOPSlab; import biomesoplenty.items.ItemBOPWillow; @@ -125,7 +127,9 @@ public class BOPBlocks { Blocks.hardDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.hardDirtID, Material.rock, BlockType.HARD_DIRT)); Blocks.holyGrass = Optional.of(new BlockBOPGrass(BOPConfiguration.holyGrassID).setUnlocalizedName("holyGrass")); Blocks.holyDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.holyDirtID, Material.sand, BlockType.HOLY_DIRT)); - Blocks.holyStone = Optional.of(new BlockBOPGeneric(BOPConfiguration.holyStoneID, Material.rock, BlockType.HOLY_STONE)); + Blocks.holyStone = Optional.of((new BlockBOPSkystone(BOPConfiguration.holyStoneID)).setUnlocalizedName("holyStone")); + Blocks.holyCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.holyCobbleStairsID, Blocks.holyStone.get(), Category.HOLY_COBBLE)).setUnlocalizedName("holyCobbleStairs")); + Blocks.holyBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.holyBrickStairsID, Blocks.holyStone.get(), Category.HOLY_BRICKS)).setUnlocalizedName("holyBricksStairs")); Blocks.crystal = Optional.of(new BlockBOPGeneric(BOPConfiguration.crystalID, Material.glass, BlockType.CRYSTAL)); Blocks.promisedPortal = Optional.of(new BlockPromisedPortal(BOPConfiguration.promisedLandPortalID).setUnlocalizedName("promisedPortal").setBlockUnbreakable().setResistance(6000000.0F).setLightValue(1.0F)); // Blocks.amethystOre = Optional.of(new BlockBOPGeneric(BOPConfiguration.amethystOreID, Material.rock, BlockType.AMETHYST_ORE)); @@ -194,7 +198,9 @@ public class BOPBlocks { // GameRegistry.registerBlock(Blocks.holyGrass.get(), "holyGrass"); GameRegistry.registerBlock(Blocks.holyGrass.get(), ItemBOPGrass.class, "holyGrass"); GameRegistry.registerBlock(Blocks.holyDirt.get(), "holyDirt"); - GameRegistry.registerBlock(Blocks.holyStone.get(), "holyStone"); + GameRegistry.registerBlock(Blocks.holyStone.get(), ItemBOPSkystone.class, "holyStone"); + GameRegistry.registerBlock(Blocks.holyCobbleStairs.get(), "holyCobbleStairs"); + GameRegistry.registerBlock(Blocks.holyBricksStairs.get(), "holyBricksStairs"); GameRegistry.registerBlock(Blocks.promisedPortal.get(), "promisedPortal"); GameRegistry.registerBlock(Blocks.amethystOre.get(), ItemBOPAmethyst.class, "amethystOre"); // GameRegistry.registerBlock(Blocks.amethystBlock.get(), "amethystBlock"); @@ -322,7 +328,11 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.holyGrass.get(), 1, 0), "Purified Grass"); LanguageRegistry.addName(new ItemStack(Blocks.holyGrass.get(), 1, 1), "Smoldering Grass"); LanguageRegistry.addName(Blocks.holyDirt.get(), "Purified Dirt"); - LanguageRegistry.addName(Blocks.holyStone.get(), "Skystone"); + LanguageRegistry.addName(new ItemStack(Blocks.holyStone.get(),1,0), "Skystone"); + LanguageRegistry.addName(new ItemStack(Blocks.holyStone.get(),1,1), "Skystone Cobblestone"); + LanguageRegistry.addName(Blocks.holyCobbleStairs.get(), "Skystone Cobblestone Stairs"); + LanguageRegistry.addName(new ItemStack(Blocks.holyStone.get(),1,2), "Skystone Bricks"); + LanguageRegistry.addName(Blocks.holyBricksStairs.get(), "Skystone Bricks Stairs"); LanguageRegistry.addName(Blocks.crystal.get(), "Celestial Crystal"); LanguageRegistry.addName(new ItemStack(Blocks.plants.get(),1,4), "Purified Tall Grass"); LanguageRegistry.addName(Blocks.promisedPortal.get(), "Promised Land Portal"); diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index 932a0c705..1ad641dfd 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -145,6 +145,8 @@ public class BOPConfiguration { public static int colourizedSaplingsID; public static int redCobbleStairsID; public static int redBrickStairsID; + public static int holyCobbleStairsID; + public static int holyBrickStairsID; public static int promisedLandPortalID; public static int amethystOreID; @@ -603,7 +605,7 @@ public class BOPConfiguration { hardDirtID = config.getTerrainBlock("Terrain Block IDs", "Hard Dirt ID", 168, null).getInt(); holyGrassID = config.getTerrainBlock("Terrain Block IDs", "Holy Grass ID", 169, null).getInt(); holyDirtID = config.getTerrainBlock("Terrain Block IDs", "Holy Dirt ID", 170, null).getInt(); - holyStoneID = config.getTerrainBlock("Terrain Block IDs", "Holy Stone ID", 171, null).getInt(); + holyStoneID = config.getTerrainBlock("Terrain Block IDs", "Skystone ID", 171, null).getInt(); cragRockID = config.getTerrainBlock("Terrain Block IDs", "Crag Rock ID", 172, null).getInt(); // Get Crafted Block ID's @@ -660,6 +662,9 @@ public class BOPConfiguration { crystalID = config.getBlock("Crystal ID", 1963, null).getInt(); cloudID = config.getBlock("Cloud ID", 1964, null).getInt(); + + holyCobbleStairsID = config.getBlock("Skystone Cobble Stairs ID", 1965, null).getInt(); + holyBrickStairsID = config.getBlock("Skystone Brick Stairs ID", 1966, null).getInt(); // Get Item ID's shroomPowderID = config.getItem("Shroom Powder ID", 21001, null).getInt(); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPSkystone.java b/src/minecraft/biomesoplenty/items/ItemBOPSkystone.java new file mode 100644 index 000000000..096f4f7df --- /dev/null +++ b/src/minecraft/biomesoplenty/items/ItemBOPSkystone.java @@ -0,0 +1,27 @@ +package biomesoplenty.items; + +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ItemBOPSkystone extends ItemBlock +{ + private static final String[] types = new String[] {"holystone", "holycobble", "holybrick"}; + + public ItemBOPSkystone(int par1) + { + super(par1); + setMaxDamage(0); + setHasSubtypes(true); + } + + @Override + public int getMetadata(int meta) + { + return meta & 15; + } + + @Override + public String getUnlocalizedName(ItemStack itemstack) { + return types[itemstack.getItemDamage() & 15]; + } +} diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/amethystore.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/amethystore.png index a4e424e7d9c2bea6f8fa853efd3ecab9c6802f1e..6024f8f5d117f2c801041f0cc5eb87e1d7e47d9e 100644 GIT binary patch delta 363 zcmV-x0hIpk0>T53JPN-601m$aI0aKAkwz$g0X|7YK~y+TWs$*Zgg_8P_kZ#!`Ba5? ziJlY$FX~0T$XtY6M!W>PC9tr0Z4Hf(rdMWrs;aAd9x=vn3;zCIF^(hO|F=dU&hz}b zfqONQ8h9C|Umw1TF#xoaC9=}zwu;~!(7dX9mSN7VoT002ov JPDHLkV1fj~r%eC= delta 279 zcmV+y0qFk11MUKlJPN=701m(bYSxJfkwz$g0P0CZK~y+TWs$)R!axiJuOCXGSYBKY zSHq&R7%F8dJMaF1|_Ao@(2F zHnM7OaEGi0#1rU+Ho9u;$0#T}-hnZh0a8Q$2eF_5;2aC>mt!0$iJCS~qValynz8p3 zsSGroWWC;TSe$+WEkJyn#2LOTLCaX?OvV#56AsD($VjTmcK|8*LQ+vpDe_MXzpRQv d&a{~G13Y(mxkkF;d;kCd07*qoM6N;tV1iSOdw2i< diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holybrick.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holybrick.png new file mode 100644 index 0000000000000000000000000000000000000000..caaaf13164b6ef44eeb799f85d664d11d6fb23f7 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvUE6x;Tbd_`jWakgG*O#P$CF|A7L5oPmy~6|{QHHg``{m?C!d?MtT_ zg)f+&={+fOxi9$g$(!GK+>5rF9lP=GEE7MxLeZ#ScJS&{1qJ)qGE8Ud_7KU8YAeWsdKA-=4VQb=7UNj5D9tOyTPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0004(NklCF+AHs3GVWQ4m*{Ih~S*xewtkRd=b5+3j|{Ua!;X{3aHL;cPaOzu)gE<@5P! zwK|zhlr-1t)uGSl^I$N*iQ|~>{eFKu9#p&CE+M@zBlKpoQA|I=&*!7?bUKwvCAY%y zc(eos>=pz8WpGgxJ)ch;!g9GxRj@*#U29DD&m&^P827_E?ytyZgEuMV;TY^OW5_IDEb52@Rikk0{nIW0000%Igz4N`PzE#=LYh#IF5tw zyE_NKkW}+LORr&Lm~#MaA_b7+YYvbWb07j-7RTX$Qv*=mFSY{fnvJz?q6F&wbWk=& zsm2)g;shO-zfj)mT%cXm!r1)=+I-Uh{ReZv1v{9J2LNegol1m=YwbNsFa|A~fJ9Z- zJtelY|DOaVN?Z`WA074;9)^=xy#Y)FO+)EY)ITlkOCnUy6}^7}*<-9^+2t4s00000 LNkvXXu0mjf?ps{n delta 209 zcmV;?051Q|0?q=Eg@4f%gD?yOv;RQszzoS49iW$-5h?UOc$O@?&TH$vpBu=};y4bz z@9rD`LsHH2EWL(}Va@@xi4;JNuQ@e`ezS;A3Lqnf00000 LNkvXXu0mjfg7jQh From 1778263c8ad3d02603be76db96b70f16bf913bee Mon Sep 17 00:00:00 2001 From: Amnet Date: Sun, 12 May 2013 15:06:54 +0200 Subject: [PATCH 04/10] Fixed picking up slabs with MMB. Fixed stairs textures. --- .../biomesoplenty/blocks/BlockBOPSlab.java | 25 +++++++------------ .../biomesoplenty/blocks/BlockBOPStairs.java | 2 +- .../configuration/BOPBlocks.java | 4 +++ .../configuration/BOPConfiguration.java | 2 +- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java b/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java index 439c183d3..cca907bd0 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java @@ -139,23 +139,17 @@ public class BlockBOPSlab extends BlockHalfSlab switch (getTypeFromMeta(meta)) { case 0: + case 3: hardness = 1.6F; break; case 1: + case 4: hardness = 1.1F; break; case 2: hardness = 1.0F; - break; - - case 3: - hardness = 1.6F; - break; - - case 4: - hardness = 1.1F; break; } } @@ -174,23 +168,17 @@ public class BlockBOPSlab extends BlockHalfSlab switch (getTypeFromMeta(meta)) { case 0: + case 3: resistance = 7.0F; break; case 1: + case 4: resistance = 7.5F; break; case 2: resistance = 2.0F; - break; - - case 3: - resistance = 7.0F; - break; - - case 4: - resistance = 7.5F; break; } } @@ -198,6 +186,11 @@ public class BlockBOPSlab extends BlockHalfSlab return resistance / 5.0F; } + public int idPicked(World par1World, int par2, int par3, int par4) + { + return !isDoubleSlab ? this.blockID : (this.blockID == Blocks.woodenDoubleSlab1.get().blockID ? Blocks.woodenSingleSlab1.get().blockID : (this.blockID == Blocks.woodenDoubleSlab2.get().blockID ? Blocks.woodenSingleSlab2.get().blockID : Blocks.stoneSingleSlab.get().blockID)); + } + protected ItemStack createStackedBlock(int par1) { return new ItemStack(this.blockID, 2, par1); diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java b/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java index 07d0b85cb..6cc3fc44b 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java @@ -35,7 +35,7 @@ public class BlockBOPStairs extends BlockStairs textures = new Icon[types.length]; for (int i = 0; i < types.length; ++i) - if (i < types.length - 3) + if (i < types.length - 5) textures[i] = iconRegister.registerIcon("BiomesOPlenty:plank_"+types[i]); else textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+types[i]); diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index 3858a382a..fa1dc95bd 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -279,9 +279,13 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,0), "Red Rock Cobblestone Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,1), "Red Rock Bricks Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,2), "Mud Bricks Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,3), "Skystone Cobblestone Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,4), "Skystone Bricks Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,0), "Red Rock Cobblestone Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,1), "Red Rock Bricks Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,2), "Mud Bricks Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,3), "Skystone Cobblestone Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,4), "Skystone Bricks Slab"); LanguageRegistry.addName(Blocks.mudBricksStairs.get(), "Mud Bricks Stairs"); LanguageRegistry.addName(Blocks.originGrass.get(), "Origin Grass"); LanguageRegistry.addName(new ItemStack(Blocks.leaves2.get(),1,0), "Origin Leaves"); diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index 1ad641dfd..7881618ca 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -813,7 +813,7 @@ public class BOPConfiguration { } finally { - config.save(); + if (config.hasChanged()) config.save(); } } } From 45091128053c964a9cc34022e8f04b3ae8b39a2d Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 12 May 2013 09:10:25 -0400 Subject: [PATCH 05/10] Updated the Planned Features list. --- Planned Features.txt | 50 ++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/Planned Features.txt b/Planned Features.txt index 9a4bb2502..7695d5966 100644 --- a/Planned Features.txt +++ b/Planned Features.txt @@ -1,37 +1,51 @@ -ITEMS: - -Dart Blower: Used to shoot darts. Crafted from reeds. Allows for rapid firing of darts, but with half the uses of a bow. - -Dart: Similar to arrows, but dealing less damage. Poisons your hunger for 30 seconds. Crafted from poison, thorns, and reeds. - ---- - BLOCKS: Rock: Small rock that has a random size. Uses the vanilla stone texture. +Pinecone: Pinecone that grows under spruce and fir leaves. No use yet. + +Coconut: Grows on palm trees. Drops 2 coconut halves when broken with an axe. + +Berry Bush: Drops a berry when broken or right clicked. + +Glowshroom: Appears in the Mystic Grove and Fungi Forest, both above and below ground. + --- -PROMISED LAND BIOMES: +ITEMS: -Wonderous Woods: The current Promised Land biome, with lots of trees and shrubs. +Coconut Halves: Coconuts drop 2 when broken with an axe. Restores 2 hunger points each. -Blessed Bog: Tall willow trees over an area with lots of water ponds. +Berry: Dropped from berry bushes. Restores 1/2 a hunger point. -Purified Plain: Only tall grass and flowers. - -Majestic Mountain: No trees, minimal tall grass, and [hopefully] tall mountains. - -Divine Desert: Holy Sand, big/tiny cacti, yucca plants. +Cherry: Dropped from cherry tree leaves when broken or right clicked. --- NETHER BIOMES: -Undergarden: Ivy, nether wart, giant/small mushrooms, hellstem plant. +Undergarden: Bramble, nether wart, giant/small mushrooms, hellstem plant. Deathly Desert: Soulsand, thorns, dead bushes. Lethal Lavafalls: Lots of lavafalls and lava ponds. -Glowpines: A forest with pine trees made of glowstone. \ No newline at end of file +Glowpines: A forest with pine trees made of glowstone hanging from the ceiling, with some scattered on the surface. + +--- + +OCEAN BIOMES: + +Coral Reef: Different types of coral, with reef stone on the ocean floor. + +Kelp Forest: Lots and lots of kelp with varying heights. + +--- + +UNDERGROUND BIOMES (If possible): + +Crystal Caverns: Purple, translucent crystals growing around the cavern. + +Flooded Caverns: Lots of water springs and ponds. + +Overgrown Caverns: Vines hanging from the ceiling, small shrubs, and lots of mushrooms. \ No newline at end of file From 4a858fd7100fa4e13c80a535e402fd3defb0e659 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 12 May 2013 09:26:03 -0400 Subject: [PATCH 06/10] Added crafting recipes for Skystone blocks, and tweaked the textures. --- .../configuration/BOPCrafting.java | 7 +++++++ .../textures/blocks/amethystore.png | Bin 450 -> 456 bytes .../BiomesOPlenty/textures/blocks/holybrick.png | Bin 325 -> 314 bytes .../textures/blocks/holycobble.png | Bin 552 -> 542 bytes .../BiomesOPlenty/textures/blocks/holysand.png | Bin 581 -> 0 bytes .../BiomesOPlenty/textures/blocks/holystone.png | Bin 334 -> 321 bytes 6 files changed, 7 insertions(+) delete mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/holysand.png diff --git a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java index 8aa85fe00..5297e877f 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java +++ b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java @@ -43,6 +43,12 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Blocks.stoneSingleSlab.get(), 6, 2), new Object[] {"RRR", 'R', Blocks.mudBrick.get()}); GameRegistry.addRecipe(new ItemStack(Blocks.mudBricksStairs.get(), 4), new Object[] {" R", " RR", "RRR", 'R', Blocks.mudBrick.get()}); GameRegistry.addRecipe(new ItemStack(Blocks.mudBricksStairs.get(), 4), new Object[] {"R ", "RR ", "RRR", 'R', Blocks.mudBrick.get()}); + GameRegistry.addRecipe(new ItemStack(Blocks.holyCobbleStairs.get(), 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,1)}); + GameRegistry.addRecipe(new ItemStack(Blocks.holyCobbleStairs.get(), 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,1)}); + GameRegistry.addRecipe(new ItemStack(Blocks.holyBricksStairs.get(), 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,2)}); + GameRegistry.addRecipe(new ItemStack(Blocks.holyBricksStairs.get(), 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,2)}); + GameRegistry.addRecipe(new ItemStack(Blocks.stoneSingleSlab.get(), 6, 3), new Object[] {"RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,1)}); + GameRegistry.addRecipe(new ItemStack(Blocks.stoneSingleSlab.get(), 6, 4), new Object[] {"RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,2)}); //Redwood GameRegistry.addShapelessRecipe(new ItemStack(Blocks.planks.get(), 4, 8), new Object[] {new ItemStack(Blocks.logs3.get(),1,0)}); @@ -105,6 +111,7 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Blocks.holyStairs.get(), 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(Blocks.woodenDoubleSlab1.get(),1,4)}); GameRegistry.addRecipe(new ItemStack(Blocks.redRock.get(), 4, 2), new Object[] {"RR", "RR", 'R', new ItemStack(Blocks.redRock.get(),1,0)}); + GameRegistry.addRecipe(new ItemStack(Blocks.holyStone.get(), 4, 2), new Object[] {"RR", "RR", 'R', new ItemStack(Blocks.holyStone.get(),1,0)}); GameRegistry.addRecipe(new ItemStack(Block.cloth, 1, 0), new Object[] {"CCC", "CCC", "CCC", 'C', new ItemStack(Blocks.plants.get(), 1, 7)}); GameRegistry.addRecipe(new ItemStack(Item.coal, 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 1)}); diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/amethystore.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/amethystore.png index 6024f8f5d117f2c801041f0cc5eb87e1d7e47d9e..ec9eca002cec6d10733f68db448a9c1dc096c5b5 100644 GIT binary patch delta 368 zcmV-$0gwK|1IPoAJPN)501mzZ>O!%=kwz(hL`g(JR5(v%lCf%rKoErg_sOH=(X8$5 z1QB9k1PcXi6s&|`tJXrw@E3tU-`*UHkl{RZZ)bLP&&P2b>kWMV1dQXz{{Pen;JU7_ z0AAwZx+*x&bDrnhwvk5A2yNSDS@r^-FJ7i;Qnm+KUDt_Ygni!$eZT**KHi?ovS4O^ z7zWQK&R*AbBp`+WsjM_ji=yBRc|Ki*g*_U31h*^YkZhU;f`pSK5kV?Q;M^*Nk=QiO z^K={XAWm79SWuc(AXT6aGE#NnzV9^ypfn?hO+{RiM5>mi%t*WfFam63G(-sEurn_F z5Y(*6juq&bDak#nsw%v(-|vC;$TR|5eW0YM-0K)W9%P4)vDmcyU_-sKr~p9`4>AC& zz=OH_-QgPvSMi`)H-bP0!hjbIk>04o&xb<~#+w%OOM{>g5zllF$MFaMAY#xuv)8Er O0000P5ZCT!dUkyac=@u&{Y;4ULedS7v*vs;he*F~)EU{{CJujw9dyw?-h&^ZdGk zL%Iw>MGjR}ZQBNnvk|(kE6egle7-m=%ObQF$$6f|F~V^il)m4e^sF(5-2j`#UfmNF(49B~|5BUf1~XB41Q6mWGxeY-m&Y4#EKyC`y2lQz?J8Nkl@ULSg=Ag`ot%B&Z9%lw#u(c_IUUC_P1B2m z(sdoyrfEW)5-)Ka3nB76Pt(*Pj?bOaZw=cmrzaXdrzaW?aqdTB(3``P&vjj~hB%Gm z*!N8RFbs8FZ`%fqd7hP0A$}id+g3`64P1Z@(PddeoT4Zy%d)DfqA0Q~LxD6N5aR!z eb_Sg9JV`EPlZhMMC@!i10000uK5Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wDSxy{L_t(IPwkPx z3WOjOMc@DbQ4moHQ9;WfDvUO>i;*Cd7S-+PLYQ&r1LiK|azx(|>E!JDZVRHdHpbZg z$>}(bX_{Ufl&&Y4#EKyC`y2lQz?I%Nkll zWr|2{B}~KvMS~adfT@XN6s24rPMzPLrCsNHn7+$e-(~GFyWOtW>vcMv-^9W&oXuwP z_xnAid_G^TRwt8*lID87I`sK`9t;LJaUAo#-|vsdgKD?iC8QT-gx+j6is?uA`Fs?f zPN#oTspM8T9*>rwfZc*1pbRdGqUZC8Ls%}CsR~vo6bu1I!P#&)1e(oei^Za2x}kO5q?Kd@gA;8c4)^w#P@quS$P1A-+Lkuh(ll9^>3@H{bUGTY~n}bZ+hU z`|c#ruV6cR;#fC1<(|*(P+fFWRz^T+d^}sVPj&xAY2;?i^U?B%ZX2h7vygE z|8A&MDm)(!Ix6D`KZ#kDRN$YH%uLf6=mr8l1hht3+OvqEh5~Si0rBM>(5lsH)$1~K zLI|7=6hkP(kLh`yo=-jW!{TF1Lx5xnyIvGUf5t$80$z&bH~;_u07*qoM6N<$g6O8) AkN^Mx delta 466 zcmV;@0WJQX1gHd%Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wDSwwqL_t(IPgRoH zio!q?MEn0gMFp3jD6ZfVTpko9>Vqh#A?O%U5LcKvosx#R58*CVcd3rq?RLFhuhZ%L zCKiU_Y&Mg>-|s2q^Z9DEI+;wAG}r6Zq0i^@U@*Xm=pz8WpGgxJ)ch;!g9GxRj@*#U29DD&m&^P8 z27_E?y z611PDb8ElfcPD`+pUGrgUxVH1KaSG)qDc{b^rhX07*qo IM6N<$f~U&d2LJ#7 diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holysand.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holysand.png deleted file mode 100644 index 3feb5c689fca7b27523c3ab67326c66f3b9ca450..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 581 zcmV-L0=oT)P)N2bPDNB8 zb~7$DE-^4L^m3s900F^CL_t(IPgRmvQvyK{g!e~knbVsAJ<-2q8POLla}JLNa?AT+FJ-UBY1-6S<8juOqUP7N{l2l~ zjOuybfG+HH<<>hskNX8pjoFt4RbffcQY2g@ONV*D1{`QMG?TIB(;OVUt`<|^G*HRb zA7*Sm0n~=U$5EfTU2Er0&#=PxeN+Fq5+&z+LWMl15VcU7xBYIR^9lGGpJ`jmdBwH+ z>Dt+lcL+BUGApf*+dT$)b)CQ8@-qI2DM;@&I`22TSfZ4W{x1r&g@L`E5IPJ10e#r& zRx0VZ1|+nckscSE=dPX(iYpmo0D9E3hmL^;xwd+%4W8R8Nykaq8)X9?)QKjI=s|nk zw7e27Bn-Yz20%kEpT4gRUOG9xE{faHvz-D>==@6kDa9VsP2j zHVUt=yPeQu$)|7Rl^O2X$?%_vcgZB>*W#W$02}lO?ewu4ZdjjodN~V31{7}#OLAL^ zIpm8{Vnr{f3(N__GMUl@oUC`mXa`U1+CYBBW#K@?-) T?%5Tk00000NkvXXu0mjfV50e# diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holystone.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holystone.png index 56a37ba3dfd409f549b99da1eac3f067d8570f92..caa4b71f95de0f41668179908557dc473a82ba3e 100644 GIT binary patch delta 56 zcmX@dbdYI+%0xp6u0sqAe1{lCHM|-o23v7N+*FXh;r%6c;?$)g39K_uw@rxs&Hx0S Lu6{1-oD!Mkh>GZx^prwCn`#F9cEzQJIr`Ie?`hfH!F^;nF`!DjK73W>{u#t XGkHzQ&8HHa3_#%N>gTe~DWM4fGm98p From 47e6e9a4b02f91044d921b52588f2b8fd104d54f Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 12 May 2013 12:19:19 -0400 Subject: [PATCH 07/10] Tweaked the Moss item and Celestial Crystal Shard textures. --- .../BiomesOPlenty/textures/blocks/item_moss.png | Bin 392 -> 595 bytes .../textures/items/crystalshard.png | Bin 290 -> 412 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png index 853a10e099fbccebdb83a35e75cad98fee735e06..a373c4f2f7e9bce5933e02f369f1189551351f16 100644 GIT binary patch delta 508 zcmVq#88x>u-b))V|{ez#GAva!c8vWofbH17R z&YXMakj-YJa5zk%P>8HnD@7s^ibkUpkH^X3aFD@ZAiv*FPN$QC!613PUg0bj3)$^| zc9J5a(MYjaOnf!K1-#dSc|L$+sZ@$Q9uGnQZ2zTLfxk%dO(;3=C)n}{c zSs)MyNGEbHZdGkppIkba9SX2jeY4rjW)x}?ule&9Y9~$1pS5J4`#Cuj;14X{Kno7e z9lyiUa9Naet87|0000!+Fgw`p_&8)Dag z>H?O-Ylu_7=YOMA^Z#10`u`1*P5)arIQ};+wgwxn7@~$>vwo7vf7J-B|7wxi|5d^@ z!3JqW>w?8i(k;QR(T+2~ZU{&aq!>hN#^`~udX&z8y%b}x7)T??1t6Ey1j=msDg(}MvpFaQ7oT%{27O*O^<0000T%cmrS>m)?8#-*4-s|Nh%9|JUePOq>BAMUVgf|G(ko z&;Pz#F8-IVpY>n0bpeWI5Ju4i!yrYszyAHd;^D{tKASK6*XmjdwplK>nXmyM1&{uJ z{QtlD$(R2jyKnqgZl3pFr)T+ph5S|w%^-}z0b!6Lke@+;rQg5mzh>u>{~G1J{{;e) z2pa%Wu=d$Eu+8f2i~g&%E&Q)i-1%QRIv1;E5JusE6b0_M3Jxp~Rw``&FB_YWQ!@y| z86ZWVcm_om$lp?#^%iK~y+TrH-);gFp}j37n8w4qO4D zse#NX9gw>P*FsDk?u5ui5SslBV!kL#GDgZBug+a+0BJhU=ltMIIRF3v07*qoM6N<$ Ef}&niiU0rr From 498a5b82bde2aeccd4dcfdaa04e3f60354defeab Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 12 May 2013 14:16:31 -0400 Subject: [PATCH 08/10] Made the giant red/yellow flower generation a lot nicer. --- .../biomes/BiomeDecoratorBOP.java | 5 +- .../worldgen/WorldGenGiantFlowerRed.java | 48 +++++++++++-------- .../worldgen/WorldGenGiantFlowerYellow.java | 48 ++++++++++++------- 3 files changed, 62 insertions(+), 39 deletions(-) diff --git a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java index 922b10e55..3c98d790e 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -1248,13 +1248,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator { for (int var5 = 0; var5 < par1; ++var5) { - int var6 = this.chunk_X + this.randomGenerator.nextInt(16); + int var6 = this.chunk_X + this.randomGenerator.nextInt(8); int var7 = this.randomGenerator.nextInt(par4 - par3) + par3; - int var8 = this.chunk_Z + this.randomGenerator.nextInt(16); + int var8 = this.chunk_Z + this.randomGenerator.nextInt(8); int var999 = this.randomGenerator.nextInt(5); if (var999 == 0) { par2WorldGenerator.generate(this.currentWorld, this.randomGenerator, var6, var7, var8); + par2WorldGenerator.generate(this.currentWorld, this.randomGenerator, var6 + 8, var7, var8); par2WorldGenerator.generate(this.currentWorld, this.randomGenerator, var6, var7, var8 + 8); par2WorldGenerator.generate(this.currentWorld, this.randomGenerator, var6 + 8, var7, var8 + 8); } diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerRed.java b/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerRed.java index 6c8505b30..5a9078346 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerRed.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerRed.java @@ -55,27 +55,37 @@ public class WorldGenGiantFlowerRed extends WorldGenerator var1.setBlock(var3 + 1, var4 + 6, var5, Blocks.petals.get().blockID, 0, 2); var1.setBlock(var3, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 0, 2); var1.setBlock(var3, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 2, var4 + 6, var5, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 2, var4 + 6, var5, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3, var4 + 6, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3, var4 + 6, var5 + 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 1, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 0, 2); var1.setBlock(var3 + 1, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 2, var4 + 6, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 2, var4 + 6, var5 + 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 2, var4 + 6, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 2, var4 + 6, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 1, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 2, var4 + 6, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 2, var4 + 6, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 6, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 6, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 1, var4 + 7, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 1, var4 + 7, var5 + 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 1, var4 + 7, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 1, var4 + 7, var5 + 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 2, var4 + 7, var5 - 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 2, var4 + 7, var5 + 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 2, var4 + 7, var5 - 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 2, var4 + 7, var5 + 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 1, var4 + 7, var5 + 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 1, var4 + 7, var5 - 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 1, var4 + 7, var5 + 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 1, var4 + 7, var5 - 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 2, var4 + 7, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 2, var4 + 7, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 7, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 7, var5 - 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 2, var4 + 7, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 2, var4 + 7, var5 - 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 2, var4 + 7, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 2, var4 + 7, var5 - 2, Blocks.petals.get().blockID, 0, 2); + + var1.setBlock(var3 + 2, var4 + 8, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 2, var4 + 8, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 8, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 8, var5 - 2, Blocks.petals.get().blockID, 0, 2); + + var1.setBlock(var3 + 3, var4 + 9, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 3, var4 + 9, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 9, var5 + 3, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 9, var5 - 3, Blocks.petals.get().blockID, 0, 2); return true; } diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerYellow.java b/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerYellow.java index df76c7a3a..dd8d15abe 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerYellow.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerYellow.java @@ -40,26 +40,38 @@ public class WorldGenGiantFlowerYellow extends WorldGenerator var1.setBlock(var3, var4, var5, Block.dirt.blockID); var1.setBlock(var3, var4 + 1, var5, Blocks.logs3.get().blockID, 3, 2); var1.setBlock(var3, var4 + 2, var5, Blocks.logs3.get().blockID, 3, 2); - - var1.setBlock(var3, var4 + 3, var5, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 1, var4 + 3, var5, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 1, var4 + 3, var5, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3, var4 + 3, var5 - 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3, var4 + 3, var5 + 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 1, var4 + 3, var5 - 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 1, var4 + 3, var5 + 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 1, var4 + 3, var5 - 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 1, var4 + 3, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 3, var5, Blocks.logs3.get().blockID, 3, 2); + var1.setBlock(var3, var4 + 4, var5, Blocks.logs3.get().blockID, 3, 2); + var1.setBlock(var3, var4 + 5, var5, Blocks.logs3.get().blockID, 3, 2); - var1.setBlock(var3 - 1, var4 + 3, var5 - 2, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 1, var4 + 3, var5 + 2, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 1, var4 + 3, var5 - 2, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 1, var4 + 3, var5 + 2, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 1, var4 + 5, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4 + 5, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 5, var5 - 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 5, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 2, var4 + 5, var5 + 2, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 2, var4 + 5, var5 - 2, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 2, var4 + 5, var5 + 2, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 2, var4 + 5, var5 - 2, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 2, var4 + 3, var5 - 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 2, var4 + 3, var5 + 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 2, var4 + 3, var5 - 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 2, var4 + 3, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 6, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 1, var4 + 6, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4 + 6, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 1, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 2, var4 + 6, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 2, var4 + 6, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 6, var5 + 2, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 6, var5 - 2, Blocks.petals.get().blockID, 1, 2); + + var1.setBlock(var3, var4 + 7, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 3, var4 + 7, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 3, var4 + 7, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 7, var5 + 3, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 7, var5 - 3, Blocks.petals.get().blockID, 1, 2); return true; } From f93bad1c62ff4a6fa6340cd81b6073d1f49f2b56 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 12 May 2013 14:58:49 -0400 Subject: [PATCH 09/10] Changed the top/filler layer and sky color of the Badlands. --- src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java b/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java index d1fc3efa5..32dd067a1 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java @@ -17,8 +17,8 @@ public class BiomeGenBadlands extends BiomeGenBase { super(par1); this.spawnableCreatureList.clear(); - this.topBlock = (byte)Block.sandStone.blockID; - this.fillerBlock = (byte)Blocks.hardSand.get().blockID; + this.topBlock = (byte)Blocks.hardSand.get().blockID; + this.fillerBlock = (byte)Block.blockClay.blockID; this.theBiomeDecorator = new BiomeDecoratorBOP(this); this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; this.customBiomeDecorator.treesPerChunk = -999; @@ -37,7 +37,7 @@ public class BiomeGenBadlands extends BiomeGenBase { if (BOPConfiguration.skyColors = true) { - return 13421723; + return 9814727; } else { From 3181acca76f72b14056b33cf0a8c0bd0497512f7 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 12 May 2013 15:14:49 -0400 Subject: [PATCH 10/10] Changed Bamboo Sapling texture to match the new bamboo coloring. --- .../textures/blocks/sapling_bamboo.png | Bin 392 -> 381 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/sapling_bamboo.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/sapling_bamboo.png index 6b446a5883dc9a26a8d3c8e06dbfdd86f547eee8..e342ea25c0c66b254e7c89cd28e81932512c6b30 100644 GIT binary patch delta 296 zcmV+@0oVSB1N{P!B#|)~3c>&Y4#EKyC`y2lQz?J>Nkl!8$h%{AdSmT*?<+VIAaH<*I#x8(+iK96K6=*Qj7n~PuqfR z-*Cn4|JsYr|9h4b=>nK7)4rfVMmOZp)OlLYo(t^|icLa8EHb6&GPX@-Ep02YX30azeH uxugU1KqMK!0ujn39l!z+%Eba07y#3>ksA;dNRvhY0000d zBw?w=|H9L@VB4#%xcx7`==?uvIgu`a*%IDk@gL*@`x1r!UiI2wF_57knjomZ=?zwB zl`s82YL+{gZI~uRoPTBzNM2$6zxb^E|AIrI|JN<9{-1x+nt08QWlCVh-VHkcU*28& z-!at`uDRlp3vmWn=1GAS1~<6=4{me*UvtglzgIuRV3I(_+E8#9IFu@aHTyN|lV%7g z3}Ass7JvmJluJ554@8myED)hw(g7?Gp