tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2 from viper283/master

Browse source 
fix if statements using non-specified booleans
This commit is contained in:
Aidan 2012-08-20 10:11:18 -07:00
commit 40febfd55c
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/common/net/uberkat/obsidian/common/ObsidianIngots.java
View file

@ -197,8 +197,8 @@ public class ObsidianIngots
public static Block CoalBlock; public static Block CoalBlock;
//Boolean Values //Boolean Values
public static boolean extrasEnabled; public static boolean extrasEnabled = true;
public static boolean oreGenerationEnabled; public static boolean oreGenerationEnabled = true;
//Extra data //Extra data
public static float ObsidianTNTBlastRadius = 12.0F; public static float ObsidianTNTBlastRadius = 12.0F;
@ -588,7 +588,7 @@ public class ObsidianIngots
LanguageRegistry.addName(ObsidianArrow, "Obsidian Arrow"); LanguageRegistry.addName(ObsidianArrow, "Obsidian Arrow");
LanguageRegistry.addName(ObsidianBow, "Obsidian Bow"); LanguageRegistry.addName(ObsidianBow, "Obsidian Bow");
LanguageRegistry.addName(ObsidianTNT, "Obsidian TNT"); LanguageRegistry.addName(ObsidianTNT, "Obsidian TNT");
if(extrasEnabled) if(extrasEnabled == true)
{ {
LanguageRegistry.addName(LightningRod, "Lightning Rod"); LanguageRegistry.addName(LightningRod, "Lightning Rod");
LanguageRegistry.addName(Stopwatch, "Steve's Stopwatch"); LanguageRegistry.addName(Stopwatch, "Steve's Stopwatch");
@ -696,7 +696,7 @@ public class ObsidianIngots
//Extras //Extras
ObsidianArrow.setIconIndex(193); ObsidianArrow.setIconIndex(193);
ObsidianBow.setIconIndex(177); ObsidianBow.setIconIndex(177);
if(extrasEnabled) if(extrasEnabled == true)
{ {
LightningRod.setIconIndex(225); LightningRod.setIconIndex(225);
Stopwatch.setIconIndex(224); Stopwatch.setIconIndex(224);
@ -754,11 +754,12 @@ public class ObsidianIngots
LazuliBoots = (new ItemObsidianArmor(11277, armorLAZULI, RenderingRegistry.addNewArmourRendererPrefix("lazuli"), 3)).setItemName("LazuliBoots"); LazuliBoots = (new ItemObsidianArmor(11277, armorLAZULI, RenderingRegistry.addNewArmourRendererPrefix("lazuli"), 3)).setItemName("LazuliBoots");
ObsidianArrow = new ItemObsidian(11278).setItemName("ObsidianArrow").setTabToDisplayOn(CreativeTabs.tabCombat); ObsidianArrow = new ItemObsidian(11278).setItemName("ObsidianArrow").setTabToDisplayOn(CreativeTabs.tabCombat);
ObsidianBow = new ItemObsidianBow(11279).setItemName("ObsidianBow"); ObsidianBow = new ItemObsidianBow(11279).setItemName("ObsidianBow");
if(extrasEnabled) if(extrasEnabled == true)
{ {
LightningRod = new ItemLightningRod(11280).setItemName("LightningRod"); LightningRod = new ItemLightningRod(11280).setItemName("LightningRod");
Stopwatch = new ItemStopwatch(11281).setItemName("Stopwatch"); Stopwatch = new ItemStopwatch(11281).setItemName("Stopwatch");
WeatherOrb = new ItemWeatherOrb(11282).setItemName("WeatherOrb"); WeatherOrb = new ItemWeatherOrb(11282).setItemName("WeatherOrb");
EnrichedAlloy = new ItemObsidian(11313).setItemName("EnrichedAlloy").setTabToDisplayOn(CreativeTabs.tabMaterials);
} }
WoodPaxel = new ItemObsidianPaxel(11283, EnumToolMaterial.WOOD).setItemName("WoodPaxel"); WoodPaxel = new ItemObsidianPaxel(11283, EnumToolMaterial.WOOD).setItemName("WoodPaxel");
StonePaxel = new ItemObsidianPaxel(11284, EnumToolMaterial.STONE).setItemName("StonePaxel"); 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"); GlowstoneLegs = new ItemObsidianArmor(11310, armorGLOWSTONE, RenderingRegistry.addNewArmourRendererPrefix("glowstone"), 2).setItemName("GlowstoneLegs");
GlowstoneBoots = new ItemObsidianArmor(11311, armorGLOWSTONE, RenderingRegistry.addNewArmourRendererPrefix("glowstone"), 3).setItemName("GlowstoneBoots"); GlowstoneBoots = new ItemObsidianArmor(11311, armorGLOWSTONE, RenderingRegistry.addNewArmourRendererPrefix("glowstone"), 3).setItemName("GlowstoneBoots");
GlowstoneKnife = new ItemObsidianKnife(11312, toolGLOWSTONE).setItemName("GlowstoneKnife"); GlowstoneKnife = new ItemObsidianKnife(11312, toolGLOWSTONE).setItemName("GlowstoneKnife");
if(extrasEnabled)
{
EnrichedAlloy = new ItemObsidian(11313).setItemName("EnrichedAlloy").setTabToDisplayOn(CreativeTabs.tabMaterials);
}
} }
/** /**
* Adds and registers all blocks. * Adds and registers all blocks.
@ -806,7 +804,7 @@ public class ObsidianIngots
PlatinumBlock = new BlockBase(platinumBlockID, 2).setBlockName("PlatinumBlock").setCreativeTab(CreativeTabs.tabBlock); PlatinumBlock = new BlockBase(platinumBlockID, 2).setBlockName("PlatinumBlock").setCreativeTab(CreativeTabs.tabBlock);
RefinedObsidian = new BlockBase(refinedObsidianID, 0).setBlockName("RefinedObsidian").setCreativeTab(CreativeTabs.tabBlock); RefinedObsidian = new BlockBase(refinedObsidianID, 0).setBlockName("RefinedObsidian").setCreativeTab(CreativeTabs.tabBlock);
ObsidianTNT = new BlockObsidianTNT(obsidianTNTID).setBlockName("ObsidianTNT").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); TheoreticalElementizer = new BlockTheoreticalElementizer(elementizerID).setBlockName("TheoreticalElementizer").setCreativeTab(CreativeTabs.tabBlock);
} }
@ -823,7 +821,7 @@ public class ObsidianIngots
GameRegistry.registerBlock(PlatinumBlock); GameRegistry.registerBlock(PlatinumBlock);
GameRegistry.registerBlock(RefinedObsidian); GameRegistry.registerBlock(RefinedObsidian);
GameRegistry.registerBlock(ObsidianTNT); GameRegistry.registerBlock(ObsidianTNT);
if(extrasEnabled) if(extrasEnabled == true)
{ {
GameRegistry.registerBlock(TheoreticalElementizer); GameRegistry.registerBlock(TheoreticalElementizer);
} }

2
src/common/net/uberkat/obsidian/common/OreHandler.java
View file

@ -11,7 +11,7 @@ public class OreHandler implements IWorldGenerator
{ {
public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) 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++) for (int i=0;i<1;i++)
{ {