diff --git a/bin/minecraft/mods/mekanism/sound/WindTurbine.ogg b/bin/minecraft/mods/mekanism/sound/WindTurbine.ogg new file mode 100644 index 000000000..ca842d222 Binary files /dev/null and b/bin/minecraft/mods/mekanism/sound/WindTurbine.ogg differ diff --git a/src/minecraft/mekanism/client/SoundHandler.java b/src/minecraft/mekanism/client/SoundHandler.java index 607dc75b6..54fa0fa1f 100644 --- a/src/minecraft/mekanism/client/SoundHandler.java +++ b/src/minecraft/mekanism/client/SoundHandler.java @@ -83,7 +83,7 @@ public class SoundHandler soundsToRemove.add(sound); continue; } - else if(((IHasSound)sound.tileEntity).getSoundPath() != sound.soundPath) + else if(!((IHasSound)sound.tileEntity).getSoundPath().equals(sound.soundPath)) { soundsToRemove.add(sound); continue; diff --git a/src/minecraft/mekanism/common/Mekanism.java b/src/minecraft/mekanism/common/Mekanism.java index b9cac8660..258c9d246 100644 --- a/src/minecraft/mekanism/common/Mekanism.java +++ b/src/minecraft/mekanism/common/Mekanism.java @@ -327,6 +327,15 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(Transmitter, 8, 2), new Object[] { "O O", Character.valueOf('O'), "ingotOsmium" })); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BasicBlock, 4, 9), new Object[] { + " O ", "OSO", " O ", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), Block.cobblestone + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BasicBlock, 4, 10), new Object[] { + " O ", "OGO", " O ", Character.valueOf('O'), "ingotOsmium", Character.valueOf('G'), Block.glass + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BasicBlock, 1, 11), new Object[] { + " O ", "OCO", " O ", Character.valueOf('O'), "ingotOsmium", Character.valueOf('C'), ControlCircuit + })); //Factory Recipes CraftingManager.getInstance().getRecipeList().add(new FactoryRecipe(MekanismUtils.getFactory(FactoryTier.BASIC, RecipeType.SMELTING), new Object[] { diff --git a/src/minecraft/mekanism/generators/common/MekanismGenerators.java b/src/minecraft/mekanism/generators/common/MekanismGenerators.java index 93000261e..426694a05 100644 --- a/src/minecraft/mekanism/generators/common/MekanismGenerators.java +++ b/src/minecraft/mekanism/generators/common/MekanismGenerators.java @@ -100,6 +100,9 @@ public class MekanismGenerators implements IModule CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SolarPanel), new Object[] { "GGG", "RAR", "PPP", Character.valueOf('G'), Block.thinGlass, Character.valueOf('R'), Item.redstone, Character.valueOf('A'), Mekanism.EnrichedAlloy, Character.valueOf('P'), "ingotOsmium" })); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(Generator, 1, 6), new Object[] { + " O ", "OTO", "ECE", Character.valueOf('O'), "ingotOsmium", Character.valueOf('T'), new ItemStack(Mekanism.BasicBlock, 1, 8), Character.valueOf('E'), Mekanism.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), Mekanism.ControlCircuit + })); //BioFuel Crusher Recipes RecipeHandler.addCrusherRecipe(new ItemStack(Block.sapling), new ItemStack(BioFuel, 2)); diff --git a/src/minecraft/mekanism/generators/common/TileEntityGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityGenerator.java index 63c0fe47f..6a9ad815b 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityGenerator.java @@ -78,7 +78,7 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem if(worldObj.isRemote) { - if(!(this instanceof TileEntitySolarGenerator) && !(this instanceof TileEntityWindTurbine)) + if(!(this instanceof TileEntitySolarGenerator)) { Mekanism.proxy.registerSound(this); } diff --git a/src/minecraft/mekanism/generators/common/TileEntityWindTurbine.java b/src/minecraft/mekanism/generators/common/TileEntityWindTurbine.java index 5c4968832..4b636739e 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityWindTurbine.java +++ b/src/minecraft/mekanism/generators/common/TileEntityWindTurbine.java @@ -33,8 +33,12 @@ public class TileEntityWindTurbine extends TileEntityGenerator implements IBound { if(canOperate()) { + setActive(true); setEnergy(electricityStored + (GENERATION_RATE*getMultiplier())); } + else { + setActive(false); + } } }