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

v5.2.2 Release

Browse source 
*Added Teleporter Frame.
*Made the Purification Chamber accept Oxygen instead of sand.
*Gave the Crusher and Enrichment Chamber more recipes.
*Fix Elite Smelting Factory having glitchy SidedInventory sides.
*Minor tweaks and fixes.
This commit is contained in:
Aidan Brady 2013-01-30 07:53:36 -05:00
parent eaae2b6b07
commit 27eff79971
19 changed files with 186 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bin/minecraft/resources/mekanism/textures/terrain.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 35 KiB

6
src/minecraft/mekanism/common/BlockBasic.java
View file

@ -32,6 +32,7 @@ import net.minecraftforge.common.ForgeChunkManager;
* 5: Steel Block
* 6: Control Panel
* 7: Teleporter
* 8: Teleporter Frame
* @author AidanBrady
*
*/
@ -67,6 +68,8 @@ public class BlockBasic extends Block
return 0;
case 7:
return 25;
case 8:
return 27;
}
return 0;
}
@ -89,6 +92,7 @@ public class BlockBasic extends Block
list.add(new ItemStack(i, 1, 5));
//list.add(new ItemStack(i, 1, 6));
list.add(new ItemStack(i, 1, 7));
list.add(new ItemStack(i, 1, 8));
}
@Override
@ -142,6 +146,8 @@ public class BlockBasic extends Block
return 8;
case 4:
return 15;
case 8:
return 12;
}
return 0;
}

2
src/minecraft/mekanism/common/CommonProxy.java
View file

@ -68,7 +68,7 @@ public class CommonProxy
Mekanism.platinumGenerationEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "PlatinumGenerationEnabled", true).getBoolean(true);
Mekanism.disableBCSteelCrafting = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DisableBCSteelCrafting", false).getBoolean(true);
Mekanism.disableBCBronzeCrafting = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DisableBCBronzeCrafting", false).getBoolean(true);
Mekanism.notifyNewReleases = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "NotifyNewReleases", false).getBoolean(true);
Mekanism.updateNotifications = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "UpdateNotifications", true).getBoolean(true);
Mekanism.configuration.save();
}

3
src/minecraft/mekanism/common/ContainerAdvancedElectricMachine.java
View file

@ -1,6 +1,7 @@
package mekanism.common;
import ic2.api.IElectricItem;
import mekanism.api.IStorageTank;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@ -130,7 +131,7 @@ public class ContainerAdvancedElectricMachine extends Container
}
}
}
else if(tileEntity.getFuelTicks(slotStack) > 0)
else if(tileEntity.getFuelTicks(slotStack) > 0 || (tileEntity instanceof TileEntityPurificationChamber && slotStack.getItem() instanceof IStorageTank))
{
if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3)
{

4
src/minecraft/mekanism/common/ItemBlockBasic.java
View file

@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack;
* 5: Steel Block
* 6: Control Panel
* 7: Teleporter
* 8: Teleporter Frame
* @author AidanBrady
*
*/
@ -70,6 +71,9 @@ public class ItemBlockBasic extends ItemBlock
case 7:
name = "Teleporter";
break;
case 8:
name = "TeleporterFrame";
break;
default:
name = "Unknown";
break;

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

@ -49,7 +49,7 @@ import cpw.mods.fml.server.FMLServerHandler;
* @author AidanBrady
*
*/
@Mod(modid = "Mekanism", name = "Mekanism", version = "5.2.0")
@Mod(modid = "Mekanism", name = "Mekanism", version = "5.2.2")
@NetworkMod(channels = {"Mekanism"}, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
public class Mekanism
{
@ -71,7 +71,7 @@ public class Mekanism
public static Configuration configuration;
/** Mekanism version number */
public static Version versionNumber = new Version(5, 2, 0);
public static Version versionNumber = new Version(5, 2, 2);
/** Map of Teleporter info. */
public static Map<Teleporter.Code, ArrayList<Teleporter.Coords>> teleporters = new HashMap<Teleporter.Code, ArrayList<Teleporter.Coords>>();
@ -146,7 +146,7 @@ public class Mekanism
public static boolean platinumGenerationEnabled = true;
public static boolean disableBCBronzeCrafting = true;
public static boolean disableBCSteelCrafting = true;
public static boolean notifyNewReleases = true;
public static boolean updateNotifications = true;
//Extra data
public static float ObsidianTNTBlastRadius = 12.0F;
@ -291,7 +291,7 @@ public class Mekanism
" E ", "CTC", " E ", Character.valueOf('E'), EnergyTablet.getUnchargedItem(), Character.valueOf('C'), "basicCircuit", Character.valueOf('T'), TeleportationCore
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BasicBlock, 1, 7), new Object[] {
"COC", "OTO", "COC", Character.valueOf('C'), "basicCircuit", Character.valueOf('O'), new ItemStack(BasicBlock, 1, 2), Character.valueOf('T'), TeleportationCore
"COC", "OTO", "COC", Character.valueOf('C'), "basicCircuit", Character.valueOf('O'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('T'), TeleportationCore
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(MachineBlock, 1, 9), new Object[] {
"CAC", "ERE", "CAC", Character.valueOf('C'), "basicCircuit", Character.valueOf('A'), AtomicCore, Character.valueOf('E'), EnrichedAlloy, Character.valueOf('R'), new ItemStack(MachineBlock, 1, 0)
@ -299,6 +299,9 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(Configurator), new Object[] {
" L ", "AEA", " S ", Character.valueOf('L'), new ItemStack(Item.dyePowder, 1, 4), Character.valueOf('A'), EnrichedAlloy, Character.valueOf('E'), EnergyTablet.getUnchargedItem(), Character.valueOf('S'), Item.stick
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BasicBlock, 4, 8), new Object[] {
"OOO", "OGO", "OOO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('G'), "ingotRefinedGlowstone"
}));
if(extrasEnabled)
{
@ -322,6 +325,10 @@ public class Mekanism
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreIron), new ItemStack(Dust, 2, 0));
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreGold), new ItemStack(Dust, 2, 1));
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Item.coal, 4), new ItemStack(CompressedCarbon, 8));
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreLapis), new ItemStack(Item.dyePowder, 12, 4));
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreRedstone), new ItemStack(Item.redstone, 12));
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreCoal), new ItemStack(Block.oreCoal));
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreDiamond), new ItemStack(Item.diamond, 2));
//Platinum Compressor Recipes
RecipeHandler.addPlatinumCompressorRecipe(new ItemStack(Item.lightStoneDust), new ItemStack(Ingot, 1, 3));
@ -330,10 +337,13 @@ public class Mekanism
RecipeHandler.addCrusherRecipe(new ItemStack(Item.diamond), new ItemStack(Dust, 1, 4));
RecipeHandler.addCrusherRecipe(new ItemStack(Item.ingotIron), new ItemStack(Dust, 1, 0));
RecipeHandler.addCrusherRecipe(new ItemStack(Item.ingotGold), new ItemStack(Dust, 1, 1));
RecipeHandler.addCrusherRecipe(new ItemStack(Block.gravel), new ItemStack(Item.flint));
RecipeHandler.addCrusherRecipe(new ItemStack(Block.stone), new ItemStack(Block.cobblestone));
RecipeHandler.addCrusherRecipe(new ItemStack(Block.cobblestone), new ItemStack(Block.sand));
//Purification Chamber Recipes
RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.oreIron), new ItemStack(Clump, 1, 0));
RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.oreGold), new ItemStack(Clump, 1, 1));
RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.oreIron), new ItemStack(Clump, 3, 0));
RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.oreGold), new ItemStack(Clump, 3, 1));
//Metallurgic Infuser Recipes
RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfusionType.COAL, 10, new ItemStack(EnrichedIron)), new ItemStack(Dust, 1, 5));
@ -382,6 +392,7 @@ public class Mekanism
LanguageRegistry.instance().addStringLocalization("tile.BasicBlock.SteelBlock.name", "Steel Block");
LanguageRegistry.instance().addStringLocalization("tile.BasicBlock.ControlPanel.name", "Control Panel");
LanguageRegistry.instance().addStringLocalization("tile.BasicBlock.Teleporter.name", "Teleporter");
LanguageRegistry.instance().addStringLocalization("tile.BasicBlock.TeleporterFrame.name", "Teleporter Frame");
//Localization for MachineBlock
LanguageRegistry.instance().addStringLocalization("tile.MachineBlock.EnrichmentChamber.name", "Enrichment Chamber");
@ -655,7 +666,7 @@ public class Mekanism
for(ItemStack ore : OreDictionary.getOres("ingotLead"))
{
RecipeHandler.addCrusherRecipe(ore, OreDictionary.getOres("dustLead").get(0));
RecipeHandler.addCrusherRecipe(ore, MekanismUtils.getStackWithSize(OreDictionary.getOres("dustLead").get(0), 1));
}
} catch(Exception e) {}
@ -667,7 +678,7 @@ public class Mekanism
for(ItemStack ore : OreDictionary.getOres("ingotSilver"))
{
RecipeHandler.addCrusherRecipe(ore, OreDictionary.getOres("dustSilver").get(0));
RecipeHandler.addCrusherRecipe(ore, MekanismUtils.getStackWithSize(OreDictionary.getOres("dustSilver").get(0), 1));
}
} catch(Exception e) {}
@ -702,14 +713,14 @@ public class Mekanism
try {
for(ItemStack ore : OreDictionary.getOres("ingotCopper"))
{
RecipeHandler.addCrusherRecipe(ore, new ItemStack(Dust, 1, 6));
RecipeHandler.addCrusherRecipe(MekanismUtils.getStackWithSize(ore, 1), new ItemStack(Dust, 1, 6));
}
} catch(Exception e) {}
try {
for(ItemStack ore : OreDictionary.getOres("ingotTin"))
{
RecipeHandler.addCrusherRecipe(ore, new ItemStack(Dust, 1, 7));
RecipeHandler.addCrusherRecipe(MekanismUtils.getStackWithSize(ore, 1), new ItemStack(Dust, 1, 7));
}
} catch(Exception e) {}

2
src/minecraft/mekanism/common/MekanismUtils.java
View file

@ -37,7 +37,7 @@ public final class MekanismUtils
*/
public static void checkForUpdates(EntityPlayer entityplayer)
{
if(Mekanism.notifyNewReleases)
if(Mekanism.updateNotifications)
{
if(!Mekanism.latestVersionNumber.equals("Error retrieving data."))
{

49
src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java
View file

@ -121,28 +121,7 @@ public abstract class TileEntityAdvancedElectricMachine extends TileEntityBasicM
}
}
if(inventory[1] != null)
{
int fuelTicks = getFuelTicks(inventory[1]);
int energyNeeded = MAX_SECONDARY_ENERGY - secondaryEnergyStored;
if(fuelTicks > 0 && fuelTicks <= energyNeeded)
{
if(fuelTicks <= energyNeeded)
{
setSecondaryEnergy(secondaryEnergyStored + fuelTicks);
}
else if(fuelTicks > energyNeeded)
{
setSecondaryEnergy(secondaryEnergyStored + energyNeeded);
}
--inventory[1].stackSize;
if(inventory[1].stackSize == 0)
{
inventory[1] = null;
}
}
}
handleSecondaryFuel();
if(inventory[4] != null && inventory[4].getItem() instanceof IMachineUpgrade)
{
@ -204,6 +183,32 @@ public abstract class TileEntityAdvancedElectricMachine extends TileEntityBasicM
}
}
}
public void handleSecondaryFuel()
{
if(inventory[1] != null)
{
int fuelTicks = getFuelTicks(inventory[1]);
int energyNeeded = MAX_SECONDARY_ENERGY - secondaryEnergyStored;
if(fuelTicks > 0 && fuelTicks <= energyNeeded)
{
if(fuelTicks <= energyNeeded)
{
setSecondaryEnergy(secondaryEnergyStored + fuelTicks);
}
else if(fuelTicks > energyNeeded)
{
setSecondaryEnergy(secondaryEnergyStored + energyNeeded);
}
--inventory[1].stackSize;
if(inventory[1].stackSize == 0)
{
inventory[1] = null;
}
}
}
}
@Override
public void operate()

4
src/minecraft/mekanism/common/TileEntityEliteSmeltingFactory.java
View file

@ -12,8 +12,8 @@ public class TileEntityEliteSmeltingFactory extends TileEntitySmeltingFactory
sideOutputs.add(new SideData(EnumColor.GREY, 0, 0));
sideOutputs.add(new SideData(EnumColor.ORANGE, 0, 1));
sideOutputs.add(new SideData(EnumColor.DARK_GREEN, 1, 1));
sideOutputs.add(new SideData(EnumColor.DARK_RED, 2, 3));
sideOutputs.add(new SideData(EnumColor.DARK_BLUE, 5, 3));
sideOutputs.add(new SideData(EnumColor.DARK_RED, 2, 7));
sideOutputs.add(new SideData(EnumColor.DARK_BLUE, 9, 7));
sideConfig = new byte[] {4, 3, 0, 0, 2, 1};
}

93
src/minecraft/mekanism/common/TileEntityPurificationChamber.java
View file

@ -5,11 +5,19 @@ import java.util.HashMap;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
import mekanism.api.EnumGas;
import mekanism.api.IGasAcceptor;
import mekanism.api.IGasStorage;
import mekanism.api.IStorageTank;
import mekanism.common.RecipeHandler.Recipe;
public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMachine
public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMachine implements IGasAcceptor, IGasStorage
{
public int oxygenStored;
public TileEntityPurificationChamber()
{
super("PurificationChamber.ogg", "Purification Chamber", "/resources/mekanism/gui/GuiPurificationChamber.png", 16, 1, 200, 12000, 1200);
@ -24,8 +32,89 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac
@Override
public int getFuelTicks(ItemStack itemstack)
{
if(itemstack.isItemEqual(new ItemStack(Block.sand))) return 10;
if(itemstack.isItemEqual(new ItemStack(Item.flint))) return 300;
return 0;
}
@Override
public int getGas(EnumGas type)
{
if(type == EnumGas.OXYGEN)
{
return secondaryEnergyStored;
}
return 0;
}
@Override
public void setGas(EnumGas type, int amount)
{
if(type == EnumGas.OXYGEN)
{
setSecondaryEnergy(amount);
}
}
@Override
public int transferGasToAcceptor(int amount, EnumGas type)
{
if(type == EnumGas.OXYGEN)
{
int rejects = 0;
int neededGas = MAX_SECONDARY_ENERGY-secondaryEnergyStored;
if(amount <= neededGas)
{
secondaryEnergyStored += amount;
}
else if(amount > neededGas)
{
secondaryEnergyStored += neededGas;
rejects = amount-neededGas;
}
return rejects;
}
return 0;
}
@Override
public boolean canReceiveGas(ForgeDirection side, EnumGas type)
{
return type == EnumGas.OXYGEN;
}
@Override
public void handleSecondaryFuel()
{
if(inventory[1] != null && secondaryEnergyStored < MAX_SECONDARY_ENERGY)
{
if(inventory[1].getItem() instanceof IStorageTank)
{
if(((IStorageTank)inventory[1].getItem()).getGasType(inventory[1]) == EnumGas.OXYGEN)
{
IStorageTank item = (IStorageTank)inventory[1].getItem();
if(item.canProvideGas(inventory[1], EnumGas.OXYGEN))
{
int received = 0;
int gasNeeded = (MAX_SECONDARY_ENERGY - secondaryEnergyStored)/2;
if(item.getRate() <= gasNeeded)
{
received = item.removeGas(inventory[1], EnumGas.OXYGEN, item.getRate());
}
else if(item.getRate() > gasNeeded)
{
received = item.removeGas(inventory[1], EnumGas.OXYGEN, gasNeeded);
}
setGas(EnumGas.OXYGEN, secondaryEnergyStored + received*2);
}
}
}
}
super.handleSecondaryFuel();
}
}

2
src/minecraft/mekanism/common/TileEntityTeleporter.java
View file

@ -332,7 +332,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IEn
public boolean isFrame(int x, int y, int z)
{
return worldObj.getBlockId(x, y, z) == Mekanism.basicBlockID && worldObj.getBlockMetadata(x, y, z) == 2;
return worldObj.getBlockId(x, y, z) == Mekanism.basicBlockID && worldObj.getBlockMetadata(x, y, z) == 8;
}
public int getScaledEnergyLevel(int i)

6
src/minecraft/mekanism/generators/client/ModelBioGenerator.java
View file

@ -129,12 +129,6 @@ public class ModelBioGenerator extends ModelBase
PLUG_PANEL.setTextureSize(128, 128);
PLUG_PANEL.mirror = true;
setRotation(PLUG_PANEL, 0F, 0F, 0F);
/*PISTON_HEAD_MOVES = new ModelRenderer(this, 8, 50);
PISTON_HEAD_MOVES.addBox(0F, 0F, 0F, 4, 2, 4);
PISTON_HEAD_MOVES.setRotationPoint(-2F, 13F, -7F);
PISTON_HEAD_MOVES.setTextureSize(128, 128);
PISTON_HEAD_MOVES.mirror = true;
setRotation(PISTON_HEAD_MOVES, 0F, 0F, 0F);*/
PISTON_ARM_MOVES = new ModelRenderer(this, 8, 57);
PISTON_ARM_MOVES.addBox(0F, 0F, 0F, 2, 2, 2);
PISTON_ARM_MOVES.setRotationPoint(-1F, 11F, -6F);

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

@ -19,7 +19,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "5.2.0", dependencies = "required-after:Mekanism")
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "5.2.2", dependencies = "required-after:Mekanism")
@NetworkMod(clientSideRequired = true, serverSideRequired = false)
public class MekanismGenerators
{

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

@ -44,7 +44,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank
public TileEntityBioGenerator()
{
super("Bio-Generator", 160000, 600);
super("Bio-Generator", 160000, 128);
inventory = new ItemStack[2];
}

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

@ -225,7 +225,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
if(oxygenStored < MAX_GAS && hydrogenStored < MAX_GAS && waterSlot.liquidStored-2 >= 0 && electricityStored-4 > 0)
{
waterSlot.setLiquid(waterSlot.liquidStored - 10);
waterSlot.setLiquid(waterSlot.liquidStored - 2);
setJoules(electricityStored - 16);
setGas(EnumGas.OXYGEN, oxygenStored + 1);
setGas(EnumGas.HYDROGEN, hydrogenStored + 2);

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

@ -126,7 +126,7 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem
{
double outputWatts = Math.min(outputNetwork.getRequest().getWatts(), getJoules());
if(getJoules() > 0 && outputWatts > 0)
if(getJoules() > 0 && outputWatts > 0 && getJoules()-outputWatts >= 0)
{
outputNetwork.startProducing(this, outputWatts / getVoltage(), getVoltage());
setJoules(electricityStored - outputWatts);

24
src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java
View file

@ -36,7 +36,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan
public LiquidSlot fuelSlot = new LiquidSlot(24000, Mekanism.hooks.BuildCraftFuelID);
/** The amount of electricity this machine can produce with a unit of fuel. */
public final int GENERATION = 100;
public final int GENERATION = 80;
public TileEntityHeatGenerator()
{
@ -85,17 +85,17 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan
{
fuelSlot.liquidStored += fuel;
--inventory[0].stackSize;
if(prevStack.isItemEqual(new ItemStack(Item.bucketLava)))
{
inventory[0] = new ItemStack(Item.bucketEmpty);
}
}
if(inventory[0].stackSize == 0)
{
inventory[0] = null;
}
if(prevStack.isItemEqual(new ItemStack(Item.bucketLava)))
{
inventory[0] = new ItemStack(Item.bucketEmpty);
}
}
}
@ -146,17 +146,17 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan
int boost = 0;
if(worldObj.getBlockId(xCoord+1, yCoord, zCoord) == 10 || worldObj.getBlockId(xCoord+1, yCoord, zCoord) == 11)
boost+=10;
boost+=5;
if(worldObj.getBlockId(xCoord-1, yCoord, zCoord) == 10 || worldObj.getBlockId(xCoord-1, yCoord, zCoord) == 11)
boost+=10;
boost+=5;
if(worldObj.getBlockId(xCoord, yCoord+1, zCoord) == 10 || worldObj.getBlockId(xCoord, yCoord+1, zCoord) == 11)
boost+=10;
boost+=5;
if(worldObj.getBlockId(xCoord, yCoord-1, zCoord) == 10 || worldObj.getBlockId(xCoord, yCoord-1, zCoord) == 11)
boost+=10;
boost+=5;
if(worldObj.getBlockId(xCoord, yCoord, zCoord+1) == 10 || worldObj.getBlockId(xCoord, yCoord, zCoord+1) == 11)
boost+=10;
boost+=5;
if(worldObj.getBlockId(xCoord, yCoord, zCoord-1) == 10 || worldObj.getBlockId(xCoord, yCoord, zCoord-1) == 11)
boost+=10;
boost+=5;
return boost;
}

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

@ -92,7 +92,7 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements
setActive(true);
}
hydrogenStored-=10;
hydrogenStored-=2;
setJoules(electricityStored + 1000);
}
else {

26
src/minecraft/mekanism/tools/common/MekanismTools.java
View file

@ -26,7 +26,7 @@ import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "5.2.0", dependencies = "required-after:Mekanism")
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "5.2.2", dependencies = "required-after:Mekanism")
@NetworkMod(clientSideRequired = true, serverSideRequired = false)
public class MekanismTools
{
@ -40,8 +40,8 @@ public class MekanismTools
public static EnumToolMaterial toolLAZULI2 = EnumHelper.addToolMaterial("LAZULI2", 2, 250, 6F, 4, 50);
public static EnumToolMaterial toolPLATINUM = EnumHelper.addToolMaterial("PLATINUM", 2, 500, 10F, 4, 30);
public static EnumToolMaterial toolPLATINUM2 = EnumHelper.addToolMaterial("PLATINUM2", 3, 700, 12F, 5, 40);
public static EnumToolMaterial toolBRONZE = EnumHelper.addToolMaterial("BRONZE", 3, 1000, 16F, 6, 100);
public static EnumToolMaterial toolBRONZE2 = EnumHelper.addToolMaterial("BRONZE2", 3, 1400, 22F, 10, 100);
public static EnumToolMaterial toolBRONZE = EnumHelper.addToolMaterial("BRONZE", 2, 800, 14F, 6, 100);
public static EnumToolMaterial toolBRONZE2 = EnumHelper.addToolMaterial("BRONZE2", 3, 1100, 16F, 10, 100);
public static EnumToolMaterial toolGLOWSTONE = EnumHelper.addToolMaterial("GLOWSTONE", 2, 300, 14F, 5, 80);
public static EnumToolMaterial toolGLOWSTONE2 = EnumHelper.addToolMaterial("GLOWSTONE2", 2, 450, 18F, 5, 100);
public static EnumToolMaterial toolSTEEL = EnumHelper.addToolMaterial("STEEL", 3, 850, 14F, 4, 100);
@ -51,7 +51,7 @@ public class MekanismTools
public static EnumArmorMaterial armorOBSIDIAN = EnumHelper.addArmorMaterial("OBSIDIAN", 50, new int[]{5, 12, 8, 5}, 50);
public static EnumArmorMaterial armorLAZULI = EnumHelper.addArmorMaterial("LAZULI", 13, new int[]{2, 5, 4, 2}, 50);
public static EnumArmorMaterial armorPLATINUM = EnumHelper.addArmorMaterial("PLATINUM", 30, new int[]{3, 9, 7, 3}, 50);
public static EnumArmorMaterial armorBRONZE = EnumHelper.addArmorMaterial("BRONZE", 42, new int[]{4, 10, 8, 4}, 50);
public static EnumArmorMaterial armorBRONZE = EnumHelper.addArmorMaterial("BRONZE", 35, new int[]{3, 8, 6, 2}, 50);
public static EnumArmorMaterial armorGLOWSTONE = EnumHelper.addArmorMaterial("GLOWSTONE", 18, new int[]{3, 7, 6, 3}, 50);
public static EnumArmorMaterial armorSTEEL = EnumHelper.addArmorMaterial("STEEL", 40, new int[] {4, 10, 8, 4}, 50);
@ -172,34 +172,34 @@ public class MekanismTools
//Obsidian
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianHelmet, 1), new Object[] {
"***", "* *", Character.valueOf('*'), "ingotObsidian"
"***", "* *", Character.valueOf('*'), "ingotRefinedObsidian"
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianBody, 1), new Object[] {
"* *", "***", "***", Character.valueOf('*'), "ingotObsidian"
"* *", "***", "***", Character.valueOf('*'), "ingotRefinedObsidian"
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianLegs, 1), new Object[] {
"***", "* *", "* *", Character.valueOf('*'), "ingotObsidian"
"***", "* *", "* *", Character.valueOf('*'), "ingotRefinedObsidian"
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianBoots, 1), new Object[] {
"* *", "* *", Character.valueOf('*'), "ingotObsidian"
"* *", "* *", Character.valueOf('*'), "ingotRefinedObsidian"
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianPaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), ObsidianAxe, Character.valueOf('Y'), ObsidianPickaxe, Character.valueOf('Z'), ObsidianSpade, Character.valueOf('T'), Item.stick
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianPickaxe, 1), new Object[] {
"XXX", " T ", " T ", Character.valueOf('X'), "ingotObsidian", Character.valueOf('T'), Item.stick
"XXX", " T ", " T ", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Item.stick
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianAxe, 1), new Object[] {
"XX", "XT", " T", Character.valueOf('X'), "ingotObsidian", Character.valueOf('T'), Item.stick
"XX", "XT", " T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Item.stick
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianSpade, 1), new Object[] {
"X", "T", "T", Character.valueOf('X'), "ingotObsidian", Character.valueOf('T'), Item.stick
"X", "T", "T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Item.stick
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianHoe, 1), new Object[] {
"XX", " T", " T", Character.valueOf('X'), "ingotObsidian", Character.valueOf('T'), Item.stick
"XX", " T", " T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Item.stick
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianSword, 1), new Object[] {
"X", "X", "T", Character.valueOf('X'), "ingotObsidian", Character.valueOf('T'), Item.stick
"X", "X", "T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Item.stick
}));
//Glowstone