From d4ec91e7f60f8dcd587ceabefdd152b3de0fe754 Mon Sep 17 00:00:00 2001 From: Zach Piddock Date: Mon, 20 Aug 2012 18:29:31 +0200 Subject: [PATCH 1/3] Fixed up boolean extraItems --- .../obsidian/common/ObsidianIngots.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/common/net/uberkat/obsidian/common/ObsidianIngots.java b/src/common/net/uberkat/obsidian/common/ObsidianIngots.java index 5cac6129c..ce5d17800 100644 --- a/src/common/net/uberkat/obsidian/common/ObsidianIngots.java +++ b/src/common/net/uberkat/obsidian/common/ObsidianIngots.java @@ -197,7 +197,7 @@ public class ObsidianIngots public static Block CoalBlock; //Boolean Values - public static boolean extrasEnabled; + public static boolean extrasEnabled = true; public static boolean oreGenerationEnabled; //Extra data @@ -588,7 +588,7 @@ public class ObsidianIngots LanguageRegistry.addName(ObsidianArrow, "Obsidian Arrow"); LanguageRegistry.addName(ObsidianBow, "Obsidian Bow"); LanguageRegistry.addName(ObsidianTNT, "Obsidian TNT"); - if(extrasEnabled) + if(extrasEnabled == true) { LanguageRegistry.addName(LightningRod, "Lightning Rod"); LanguageRegistry.addName(Stopwatch, "Steve's Stopwatch"); @@ -696,7 +696,7 @@ public class ObsidianIngots //Extras ObsidianArrow.setIconIndex(193); ObsidianBow.setIconIndex(177); - if(extrasEnabled) + if(extrasEnabled == true) { LightningRod.setIconIndex(225); Stopwatch.setIconIndex(224); @@ -754,11 +754,12 @@ public class ObsidianIngots LazuliBoots = (new ItemObsidianArmor(11277, armorLAZULI, RenderingRegistry.addNewArmourRendererPrefix("lazuli"), 3)).setItemName("LazuliBoots"); ObsidianArrow = new ItemObsidian(11278).setItemName("ObsidianArrow").setTabToDisplayOn(CreativeTabs.tabCombat); ObsidianBow = new ItemObsidianBow(11279).setItemName("ObsidianBow"); - if(extrasEnabled) + if(extrasEnabled == true) { LightningRod = new ItemLightningRod(11280).setItemName("LightningRod"); Stopwatch = new ItemStopwatch(11281).setItemName("Stopwatch"); WeatherOrb = new ItemWeatherOrb(11282).setItemName("WeatherOrb"); + EnrichedAlloy = new ItemObsidian(11313).setItemName("EnrichedAlloy").setTabToDisplayOn(CreativeTabs.tabMaterials); } WoodPaxel = new ItemObsidianPaxel(11283, EnumToolMaterial.WOOD).setItemName("WoodPaxel"); StonePaxel = new ItemObsidianPaxel(11284, EnumToolMaterial.STONE).setItemName("StonePaxel"); @@ -790,10 +791,7 @@ public class ObsidianIngots GlowstoneLegs = new ItemObsidianArmor(11310, armorGLOWSTONE, RenderingRegistry.addNewArmourRendererPrefix("glowstone"), 2).setItemName("GlowstoneLegs"); GlowstoneBoots = new ItemObsidianArmor(11311, armorGLOWSTONE, RenderingRegistry.addNewArmourRendererPrefix("glowstone"), 3).setItemName("GlowstoneBoots"); GlowstoneKnife = new ItemObsidianKnife(11312, toolGLOWSTONE).setItemName("GlowstoneKnife"); - if(extrasEnabled) - { - EnrichedAlloy = new ItemObsidian(11313).setItemName("EnrichedAlloy").setTabToDisplayOn(CreativeTabs.tabMaterials); - } + } /** * Adds and registers all blocks. @@ -806,7 +804,7 @@ public class ObsidianIngots PlatinumBlock = new BlockBase(platinumBlockID, 2).setBlockName("PlatinumBlock").setCreativeTab(CreativeTabs.tabBlock); RefinedObsidian = new BlockBase(refinedObsidianID, 0).setBlockName("RefinedObsidian").setCreativeTab(CreativeTabs.tabBlock); ObsidianTNT = new BlockObsidianTNT(obsidianTNTID).setBlockName("ObsidianTNT").setCreativeTab(CreativeTabs.tabBlock); - if(extrasEnabled) + if(extrasEnabled == true) { TheoreticalElementizer = new BlockTheoreticalElementizer(elementizerID).setBlockName("TheoreticalElementizer").setCreativeTab(CreativeTabs.tabBlock); } @@ -823,7 +821,7 @@ public class ObsidianIngots GameRegistry.registerBlock(PlatinumBlock); GameRegistry.registerBlock(RefinedObsidian); GameRegistry.registerBlock(ObsidianTNT); - if(extrasEnabled) + if(extrasEnabled == true) { GameRegistry.registerBlock(TheoreticalElementizer); } From 6bd1dac9f79684af1fbf8c6922c7d207e89a0c7a Mon Sep 17 00:00:00 2001 From: Zach Piddock Date: Mon, 20 Aug 2012 18:32:11 +0200 Subject: [PATCH 2/3] Fixed Up Booleans --- src/common/net/uberkat/obsidian/common/ObsidianIngots.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/net/uberkat/obsidian/common/ObsidianIngots.java b/src/common/net/uberkat/obsidian/common/ObsidianIngots.java index ce5d17800..878aca130 100644 --- a/src/common/net/uberkat/obsidian/common/ObsidianIngots.java +++ b/src/common/net/uberkat/obsidian/common/ObsidianIngots.java @@ -198,7 +198,7 @@ public class ObsidianIngots //Boolean Values public static boolean extrasEnabled = true; - public static boolean oreGenerationEnabled; + public static boolean oreGenerationEnabled = true; //Extra data public static float ObsidianTNTBlastRadius = 12.0F; From 12f384ee508d27c6c0dcac2330709a584780e59c Mon Sep 17 00:00:00 2001 From: Zach Piddock Date: Mon, 20 Aug 2012 18:34:08 +0200 Subject: [PATCH 3/3] Fixed Boolean --- src/common/net/uberkat/obsidian/common/OreHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/net/uberkat/obsidian/common/OreHandler.java b/src/common/net/uberkat/obsidian/common/OreHandler.java index 68e07e972..d6c3a5d17 100644 --- a/src/common/net/uberkat/obsidian/common/OreHandler.java +++ b/src/common/net/uberkat/obsidian/common/OreHandler.java @@ -11,7 +11,7 @@ public class OreHandler implements IWorldGenerator { public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { - if(ObsidianIngots.oreGenerationEnabled) + if(ObsidianIngots.oreGenerationEnabled == true) { for (int i=0;i<1;i++) {