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

v5.5.5 Beta #3

Browse source 
*Fixed generator sound effects.
*Gave the Wind Turbine a sound effect.
*Gave the Wind Turbine a recipe.
*Gave Dynamic Tanks, Glass and Valves recipes.
This commit is contained in:
Aidan Brady 2013-04-28 16:04:16 -04:00
parent 05a8ea03e9
commit 44926c2621
6 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bin/minecraft/mods/mekanism/sound/WindTurbine.ogg Normal file
View file

Binary file not shown.

2
src/minecraft/mekanism/client/SoundHandler.java
View file

@ -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;

9
src/minecraft/mekanism/common/Mekanism.java
View file

@ -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[] {

3
src/minecraft/mekanism/generators/common/MekanismGenerators.java
View file

@ -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));

2
src/minecraft/mekanism/generators/common/TileEntityGenerator.java
View file

@ -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);
}

4
src/minecraft/mekanism/generators/common/TileEntityWindTurbine.java
View file

@ -33,8 +33,12 @@ public class TileEntityWindTurbine extends TileEntityGenerator implements IBound
{
if(canOperate())
{
setActive(true);
setEnergy(electricityStored + (GENERATION_RATE*getMultiplier()));
}
else {
setActive(false);
}
}
}