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

Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8

Browse source
This commit is contained in:
Aidan C. Brady 2014-08-05 16:23:24 -04:00
parent dd2eb3a0fd 6f9e13a798
commit afd3b52123
41 changed files with 796 additions and 423 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -1,5 +1,5 @@
minecraft_version=1.7.10
forge_version=10.13.0.1180
forge_version=10.13.0.1197
FMP_version=1.1.0.297
CCLIB_version=1.1.1.93
NEI_version=1.0.2.15

2
src/main/java/mekanism/api/MekanismConfig.java
View file

@ -37,6 +37,7 @@ public class MekanismConfig
public static double FROM_IC2;
public static double FROM_BC;
public static double FROM_TE;
public static int laserRange = 100;
}
public static class usage
@ -62,6 +63,7 @@ public class MekanismConfig
public static double seismicVibratorUsage;
public static double pressurizedReactionBaseUsage;
public static double fluidicPlenisherUsage;
public static double laserUsage;
}
public static class generators

12
src/main/java/mekanism/api/reactor/IFusionReactor.java
View file

@ -45,4 +45,16 @@ public interface IFusionReactor
public boolean isBurning();
public void setBurning(boolean burn);
public int getMinInjectionRate(boolean active);
public double getMaxPlasmaTemperature(boolean active);
public double getMaxCasingTemperature(boolean active);
public double getIgnitionTemperature(boolean active);
public double getPassiveGeneration(boolean active, boolean current);
public int getSteamPerTick(boolean current);
}

2
src/main/java/mekanism/client/ClientProxy.java
View file

@ -351,7 +351,7 @@ public class ClientProxy extends CommonProxy
MinecraftForgeClient.registerItemRenderer(MekanismItems.GasMask, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.ScubaTank, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.Balloon, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.FreeRunners, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.FrictionBoots, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.AtomicDisassembler, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.GlowPanel, handler);
MinecraftForgeClient.registerItemRenderer(MekanismItems.Flamethrower, handler);

2
src/main/java/mekanism/client/nei/NEIMekanismConfig.java
View file

@ -107,7 +107,7 @@ public class NEIMekanismConfig implements IConfigureNEI
API.registerNEIGuiHandler(new ElementBoundHandler());
API.hideItem(new ItemStack(MekanismBlocks.BoundingBlock));
API.hideItem(new ItemStack(MekanismItems.Proxy));
API.hideItem(new ItemStack(MekanismItems.ItemProxy));
}
@Override

3
src/main/java/mekanism/common/CommonProxy.java
View file

@ -251,6 +251,8 @@ public class CommonProxy
MekanismAPI.addBoxBlacklist(Blocks.mob_spawner, 0);
}
general.laserRange = Mekanism.configuration.get("general", "LaserRange", 100).getInt(100);
usage.enrichmentChamberUsage = Mekanism.configuration.get("usage", "EnrichmentChamberUsage", 50D).getDouble(50D);
usage.osmiumCompressorUsage = Mekanism.configuration.get("usage", "OsmiumCompressorUsage", 100D).getDouble(100D);
usage.combinerUsage = Mekanism.configuration.get("usage", "CombinerUsage", 50D).getDouble(50D);
@ -272,6 +274,7 @@ public class CommonProxy
usage.seismicVibratorUsage = Mekanism.configuration.get("usage", "SeismicVibratorUsage", 50D).getDouble(50D);
usage.pressurizedReactionBaseUsage = Mekanism.configuration.get("usage", "PressurizedReactionBaseUsage", 5D).getDouble(5D);
usage.fluidicPlenisherUsage = Mekanism.configuration.get("usage", "FluidicPlenisherUsage", 100D).getDouble(100D);
usage.laserUsage = Mekanism.configuration.get("usage", "LaserUsage", 5000D).getDouble(5000D);
if(Mekanism.configuration.hasChanged())
{

11
src/main/java/mekanism/api/lasers/LaserManager.java → src/main/java/mekanism/common/LaserManager.java
View file

@ -1,7 +1,8 @@
package mekanism.api.lasers;
package mekanism.common;
import mekanism.api.Coord4D;
import mekanism.common.Mekanism;
import mekanism.api.MekanismConfig.general;
import mekanism.api.lasers.ILaserReceptor;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
@ -11,12 +12,10 @@ import net.minecraftforge.common.util.ForgeDirection;
public class LaserManager
{
public static int range = 100;
public static void fireLaser(Coord4D from, ForgeDirection direction, double energy, World world)
{
Coord4D rangeFrom = from.getFromSide(direction, 1);
Coord4D to = from.getFromSide(direction, range);
Coord4D to = from.getFromSide(direction, general.laserRange);
MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(rangeFrom.xCoord, rangeFrom.yCoord, rangeFrom.zCoord), Vec3.createVectorHelper(to.xCoord, to.yCoord, to.zCoord));
if(mop != null)
@ -40,7 +39,7 @@ public class LaserManager
public static void fireLaserClient(Coord4D from, ForgeDirection direction, World world)
{
Coord4D rangeFrom = from.getFromSide(direction, 1);
Coord4D to = from.getFromSide(direction, range);
Coord4D to = from.getFromSide(direction, general.laserRange);
MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(rangeFrom.xCoord, rangeFrom.yCoord, rangeFrom.zCoord), Vec3.createVectorHelper(to.xCoord, to.yCoord, to.zCoord));
if(mop != null)

138
src/main/java/mekanism/common/Mekanism.java
View file

@ -44,13 +44,6 @@ import mekanism.common.entity.EntityObsidianTNT;
import mekanism.common.entity.EntityRobit;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.integration.OreDictManager;
import mekanism.common.item.ItemBlockBasic;
import mekanism.common.item.ItemBlockCardboardBox;
import mekanism.common.item.ItemBlockEnergyCube;
import mekanism.common.item.ItemBlockGasTank;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemBlockOre;
import mekanism.common.item.ItemBlockPlastic;
import mekanism.common.multiblock.MultiblockManager;
import mekanism.common.multipart.MultipartMekanism;
import mekanism.common.network.PacketDataRequest.DataRequestMessage;
@ -88,7 +81,6 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.event.world.ChunkDataEvent;
import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
@ -412,7 +404,7 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 8), new Object[] {
"CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.FreeRunners), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.FrictionBoots), new Object[] {
"C C", "A A", "T T", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem()
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.ArmoredJetpack.getEmptyItem(), new Object[] {
@ -534,7 +526,7 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 3), new Object[] {
"R", "R", Character.valueOf('R'), new ItemStack(MekanismItems.Polyethene, 1, 1)
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockHDPE, 4, 15), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, 15), new Object[] {
"SSS", "S S", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2)
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, 15), new Object[] {
@ -543,7 +535,7 @@ public class Mekanism
for(int i = 0; i < EnumColor.DYES.length-1; i++)
{
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockHDPE, 4, i), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, i), new Object[] {
"SSS", "SDS", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, i), new Object[] {
@ -563,31 +555,31 @@ public class Mekanism
new ItemStack(MekanismItems.Balloon, 1, j), "dye" + EnumColor.DYES[i].dyeName
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockHDPE, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.PlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockSlickHDPE, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockSlickHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.SlickPlasticBlock, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockGlowHDPE, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockGlowHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.GlowPlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockReinforcedHDPE, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockReinforcedHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismItems.GlowPanel, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
}));
}
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(MekanismBlocks.BlockGlowHDPE, 3, i), new Object[] {
new ItemStack(MekanismBlocks.BlockHDPE, 1, i), new ItemStack(MekanismBlocks.BlockHDPE, 1, i), new ItemStack(MekanismBlocks.BlockHDPE, 1, i), new ItemStack(Items.glowstone_dust)
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 3, i), new Object[] {
new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(Items.glowstone_dust)
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockReinforcedHDPE, 4, i), new Object[] {
" P ", "POP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockHDPE, 1, i), Character.valueOf('O'), new ItemStack(MekanismItems.Dust, 1, 2)
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), new Object[] {
" P ", "POP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), Character.valueOf('O'), new ItemStack(MekanismItems.Dust, 1, 2)
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockRoadHDPE, 3, i), new Object[] {
"SSS", "PPP", "SSS", Character.valueOf('S'), Blocks.sand, Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockSlickHDPE, 1, i)
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.RoadPlasticBlock, 3, i), new Object[] {
"SSS", "PPP", "SSS", Character.valueOf('S'), Blocks.sand, Character.valueOf('P'), new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, i)
}));
}
@ -626,7 +618,7 @@ public class Mekanism
for(int i = 0; i < EnumColor.DYES.length; i++)
{
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismBlocks.BlockHDPE, 1, i), new ItemStack(MekanismBlocks.BlockSlickHDPE, 1, i));
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, i));
}
//Combiner recipes
@ -767,7 +759,7 @@ public class Mekanism
return 0;
}
});
});
//Fuel Gases
FuelHandler.addGas(GasRegistry.getGas("hydrogen"), 1, general.FROM_H2);
@ -776,89 +768,7 @@ public class Mekanism
RecipeSorter.register("mekanism", MekanismRecipe.class, Category.SHAPED, "");
RecipeSorter.register("bin", BinRecipe.class, Category.SHAPELESS, "");
}
/**
* Adds and registers all items.
*/
public void registerItems()
{
//Fluid Container stuff
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(MekanismItems.BrineBucket), FluidContainerRegistry.EMPTY_BUCKET);
//Registrations
GameRegistry.registerItem(MekanismItems.PartTransmitter, "PartTransmitter");
GameRegistry.registerItem(MekanismItems.ElectricBow, "ElectricBow");
GameRegistry.registerItem(MekanismItems.Dust, "Dust");
GameRegistry.registerItem(MekanismItems.Ingot, "Ingot");
GameRegistry.registerItem(MekanismItems.EnergyTablet, "EnergyTablet");
GameRegistry.registerItem(MekanismItems.SpeedUpgrade, "SpeedUpgrade");
GameRegistry.registerItem(MekanismItems.EnergyUpgrade, "EnergyUpgrade");
GameRegistry.registerItem(MekanismItems.Robit, "Robit");
GameRegistry.registerItem(MekanismItems.AtomicDisassembler, "AtomicDisassembler");
GameRegistry.registerItem(MekanismItems.EnrichedAlloy, "EnrichedAlloy");
GameRegistry.registerItem(MekanismItems.ReinforcedAlloy, "ReinforcedAlloy");
GameRegistry.registerItem(MekanismItems.AtomicAlloy, "AtomicAlloy");
GameRegistry.registerItem(MekanismItems.Proxy, "ItemProxy");
GameRegistry.registerItem(MekanismItems.ControlCircuit, "ControlCircuit");
GameRegistry.registerItem(MekanismItems.EnrichedIron, "EnrichedIron");
GameRegistry.registerItem(MekanismItems.CompressedCarbon, "CompressedCarbon");
GameRegistry.registerItem(MekanismItems.CompressedRedstone, "CompressedRedstone");
GameRegistry.registerItem(MekanismItems.CompressedDiamond, "CompressedDiamond");
GameRegistry.registerItem(MekanismItems.CompressedObsidian, "CompressedObsidian");
GameRegistry.registerItem(MekanismItems.PortableTeleporter, "PortableTeleporter");
GameRegistry.registerItem(MekanismItems.TeleportationCore, "TeleportationCore");
GameRegistry.registerItem(MekanismItems.Clump, "Clump");
GameRegistry.registerItem(MekanismItems.DirtyDust, "DirtyDust");
GameRegistry.registerItem(MekanismItems.Configurator, "Configurator");
GameRegistry.registerItem(MekanismItems.NetworkReader, "NetworkReader");
GameRegistry.registerItem(MekanismItems.WalkieTalkie, "WalkieTalkie");
GameRegistry.registerItem(MekanismItems.Jetpack, "Jetpack");
GameRegistry.registerItem(MekanismItems.Dictionary, "Dictionary");
GameRegistry.registerItem(MekanismItems.GasMask, "GasMask");
GameRegistry.registerItem(MekanismItems.ScubaTank, "ScubaTank");
GameRegistry.registerItem(MekanismItems.Balloon, "Balloon");
GameRegistry.registerItem(MekanismItems.Shard, "Shard");
GameRegistry.registerItem(MekanismItems.ElectrolyticCore, "ElectrolyticCore");
GameRegistry.registerItem(MekanismItems.Sawdust, "Sawdust");
GameRegistry.registerItem(MekanismItems.Salt, "Salt");
GameRegistry.registerItem(MekanismItems.BrineBucket, "BrineBucket");
GameRegistry.registerItem(MekanismItems.Crystal, "Crystal");
GameRegistry.registerItem(MekanismItems.FreeRunners, "FrictionBoots");
GameRegistry.registerItem(MekanismItems.ArmoredJetpack, "ArmoredJetpack");
GameRegistry.registerItem(MekanismItems.FilterCard, "FilterCard");
GameRegistry.registerItem(MekanismItems.SeismicReader, "SeismicReader");
GameRegistry.registerItem(MekanismItems.Substrate, "Substrate");
GameRegistry.registerItem(MekanismItems.Polyethene, "Polyethene");
GameRegistry.registerItem(MekanismItems.BioFuel, "BioFuel");
GameRegistry.registerItem(MekanismItems.GlowPanel, "GlowPanel");
GameRegistry.registerItem(MekanismItems.Flamethrower, "Flamethrower");
}
/**
* Adds and registers all blocks.
*/
public void registerBlocks()
{
//Registrations
GameRegistry.registerBlock(MekanismBlocks.BasicBlock, ItemBlockBasic.class, "BasicBlock");
GameRegistry.registerBlock(MekanismBlocks.BasicBlock2, ItemBlockBasic.class, "BasicBlock2");
GameRegistry.registerBlock(MekanismBlocks.MachineBlock, ItemBlockMachine.class, "MachineBlock");
GameRegistry.registerBlock(MekanismBlocks.MachineBlock2, ItemBlockMachine.class, "MachineBlock2");
GameRegistry.registerBlock(MekanismBlocks.OreBlock, ItemBlockOre.class, "OreBlock");
GameRegistry.registerBlock(MekanismBlocks.EnergyCube, ItemBlockEnergyCube.class, "EnergyCube");
GameRegistry.registerBlock(MekanismBlocks.ObsidianTNT, "ObsidianTNT");
GameRegistry.registerBlock(MekanismBlocks.BoundingBlock, "BoundingBlock");
GameRegistry.registerBlock(MekanismBlocks.GasTank, ItemBlockGasTank.class, "GasTank");
GameRegistry.registerBlock(MekanismBlocks.CardboardBox, ItemBlockCardboardBox.class, "CardboardBox");
GameRegistry.registerBlock(MekanismBlocks.BlockHDPE, ItemBlockPlastic.class, "PlasticBlock");
GameRegistry.registerBlock(MekanismBlocks.BlockSlickHDPE, ItemBlockPlastic.class, "SlickPlasticBlock");
GameRegistry.registerBlock(MekanismBlocks.BlockGlowHDPE, ItemBlockPlastic.class, "GlowPlasticBlock");
GameRegistry.registerBlock(MekanismBlocks.BlockReinforcedHDPE, ItemBlockPlastic.class, "ReinforcedPlasticBlock");
GameRegistry.registerBlock(MekanismBlocks.BlockRoadHDPE, ItemBlockPlastic.class, "RoadPlasticBlock");
GameRegistry.registerBlock(MekanismBlocks.BlockHDPEFence, "PlasticFence");
GameRegistry.registerBlock(MekanismBlocks.SaltBlock, "SaltBlock");
}
/**
* Registers specified items with the Ore Dictionary.
*/
@ -1122,7 +1032,11 @@ public class Mekanism
}
Mekanism.proxy.preInit();
//Register blocks and items
MekanismItems.register();
MekanismBlocks.register();
//Register infuses
InfuseRegistry.registerInfuseType(new InfuseType("CARBON", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 0, 0).setUnlocalizedName("infuse.carbon"));
InfuseRegistry.registerInfuseType(new InfuseType("TIN", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 4, 0).setUnlocalizedName("infuse.tin"));
@ -1181,8 +1095,6 @@ public class Mekanism
}
//Load this module
registerItems();
registerBlocks();
addRecipes();
addEntities();

44
src/main/java/mekanism/common/MekanismBlocks.java
View file

@ -11,8 +11,16 @@ import mekanism.common.block.BlockOre;
import mekanism.common.block.BlockPlastic;
import mekanism.common.block.BlockPlasticFence;
import mekanism.common.block.BlockSalt;
import mekanism.common.item.ItemBlockBasic;
import mekanism.common.item.ItemBlockCardboardBox;
import mekanism.common.item.ItemBlockEnergyCube;
import mekanism.common.item.ItemBlockGasTank;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemBlockOre;
import mekanism.common.item.ItemBlockPlastic;
import net.minecraft.block.Block;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder("Mekanism")
@ -28,11 +36,35 @@ public class MekanismBlocks
public static final Block BoundingBlock = (BlockBounding)new BlockBounding().setBlockName("BoundingBlock");
public static final Block GasTank = new BlockGasTank().setBlockName("GasTank");
public static final Block CardboardBox = new BlockCardboardBox().setBlockName("CardboardBox");
public static final Block BlockHDPE = new BlockPlastic().setBlockName("PlasticBlock");
public static final Block BlockSlickHDPE = new BlockPlastic().setBlockName("SlickPlasticBlock");
public static final Block BlockGlowHDPE = new BlockPlastic().setBlockName("GlowPlasticBlock");
public static final Block BlockReinforcedHDPE = new BlockPlastic().setBlockName("ReinforcedPlasticBlock");
public static final Block BlockRoadHDPE = new BlockPlastic().setBlockName("RoadPlasticBlock");
public static final Block BlockHDPEFence = new BlockPlasticFence().setBlockName("PlasticFence");
public static final Block PlasticBlock = new BlockPlastic().setBlockName("PlasticBlock");
public static final Block SlickPlasticBlock = new BlockPlastic().setBlockName("SlickPlasticBlock");
public static final Block GlowPlasticBlock = new BlockPlastic().setBlockName("GlowPlasticBlock");
public static final Block ReinforcedPlasticBlock = new BlockPlastic().setBlockName("ReinforcedPlasticBlock");
public static final Block RoadPlasticBlock = new BlockPlastic().setBlockName("RoadPlasticBlock");
public static final Block PlasticFence = new BlockPlasticFence().setBlockName("PlasticFence");
public static final Block SaltBlock = new BlockSalt().setBlockName("SaltBlock");
/**
* Adds and registers all blocks.
*/
public static void register()
{
GameRegistry.registerBlock(BasicBlock, ItemBlockBasic.class, "BasicBlock");
GameRegistry.registerBlock(BasicBlock2, ItemBlockBasic.class, "BasicBlock2");
GameRegistry.registerBlock(MachineBlock, ItemBlockMachine.class, "MachineBlock");
GameRegistry.registerBlock(MachineBlock2, ItemBlockMachine.class, "MachineBlock2");
GameRegistry.registerBlock(OreBlock, ItemBlockOre.class, "OreBlock");
GameRegistry.registerBlock(EnergyCube, ItemBlockEnergyCube.class, "EnergyCube");
GameRegistry.registerBlock(ObsidianTNT, "ObsidianTNT");
GameRegistry.registerBlock(BoundingBlock, "BoundingBlock");
GameRegistry.registerBlock(GasTank, ItemBlockGasTank.class, "GasTank");
GameRegistry.registerBlock(CardboardBox, ItemBlockCardboardBox.class, "CardboardBox");
GameRegistry.registerBlock(PlasticBlock, ItemBlockPlastic.class, "PlasticBlock");
GameRegistry.registerBlock(SlickPlasticBlock, ItemBlockPlastic.class, "SlickPlasticBlock");
GameRegistry.registerBlock(GlowPlasticBlock, ItemBlockPlastic.class, "GlowPlasticBlock");
GameRegistry.registerBlock(ReinforcedPlasticBlock, ItemBlockPlastic.class, "ReinforcedPlasticBlock");
GameRegistry.registerBlock(RoadPlasticBlock, ItemBlockPlastic.class, "RoadPlasticBlock");
GameRegistry.registerBlock(PlasticFence, "PlasticFence");
GameRegistry.registerBlock(SaltBlock, "SaltBlock");
}
}

69
src/main/java/mekanism/common/MekanismItems.java
View file

@ -33,12 +33,17 @@ import mekanism.common.multipart.ItemPartTransmitter;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder("Mekanism")
public class MekanismItems
{
//Items
public static final ItemElectricBow ElectricBow = (ItemElectricBow)new ItemElectricBow().setUnlocalizedName("ElectricBow");
public static final Item EnrichedAlloy = new ItemMekanism().setUnlocalizedName("EnrichedAlloy");
public static final Item ReinforcedAlloy = new ItemMekanism().setUnlocalizedName("ReinforcedAlloy");
@ -58,7 +63,7 @@ public class MekanismItems
public static final Item Configurator = new ItemConfigurator().setUnlocalizedName("Configurator");
public static final Item NetworkReader = new ItemNetworkReader().setUnlocalizedName("NetworkReader");
public static final Item WalkieTalkie = new ItemWalkieTalkie().setUnlocalizedName("WalkieTalkie");
public static final Item Proxy = new ItemProxy().setUnlocalizedName("ItemProxy");
public static final Item ItemProxy = new ItemProxy().setUnlocalizedName("ItemProxy");
public static final Item PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter");
public static final Item GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel");
public static final ItemJetpack Jetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("Jetpack");
@ -71,7 +76,7 @@ public class MekanismItems
public static final Item Sawdust = new ItemMekanism().setUnlocalizedName("Sawdust");
public static final Item Salt = new ItemMekanism().setUnlocalizedName("Salt");
public static final Item BrineBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.bucket).setUnlocalizedName("BrineBucket");
public static final Item FreeRunners = new ItemFreeRunners().setUnlocalizedName("FreeRunners");
public static final Item FrictionBoots = new ItemFreeRunners().setUnlocalizedName("FreeRunners");
public static final ItemJetpack ArmoredJetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("ArmoredJetpack");
public static final Item FilterCard = new ItemFilterCard().setUnlocalizedName("FilterCard");
public static final ItemSeismicReader SeismicReader = (ItemSeismicReader)new ItemSeismicReader().setUnlocalizedName("SeismicReader");
@ -87,4 +92,62 @@ public class MekanismItems
public static final Item Shard = new ItemShard();
public static final Item Crystal = new ItemCrystal();
public static final Item ControlCircuit = new ItemControlCircuit();
/**
* Adds and registers all items.
*/
public static void register()
{
GameRegistry.registerItem(PartTransmitter, "PartTransmitter");
GameRegistry.registerItem(ElectricBow, "ElectricBow");
GameRegistry.registerItem(Dust, "Dust");
GameRegistry.registerItem(Ingot, "Ingot");
GameRegistry.registerItem(EnergyTablet, "EnergyTablet");
GameRegistry.registerItem(SpeedUpgrade, "SpeedUpgrade");
GameRegistry.registerItem(EnergyUpgrade, "EnergyUpgrade");
GameRegistry.registerItem(Robit, "Robit");
GameRegistry.registerItem(AtomicDisassembler, "AtomicDisassembler");
GameRegistry.registerItem(EnrichedAlloy, "EnrichedAlloy");
GameRegistry.registerItem(ReinforcedAlloy, "ReinforcedAlloy");
GameRegistry.registerItem(AtomicAlloy, "AtomicAlloy");
GameRegistry.registerItem(ItemProxy, "ItemProxy");
GameRegistry.registerItem(ControlCircuit, "ControlCircuit");
GameRegistry.registerItem(EnrichedIron, "EnrichedIron");
GameRegistry.registerItem(CompressedCarbon, "CompressedCarbon");
GameRegistry.registerItem(CompressedRedstone, "CompressedRedstone");
GameRegistry.registerItem(CompressedDiamond, "CompressedDiamond");
GameRegistry.registerItem(CompressedObsidian, "CompressedObsidian");
GameRegistry.registerItem(PortableTeleporter, "PortableTeleporter");
GameRegistry.registerItem(TeleportationCore, "TeleportationCore");
GameRegistry.registerItem(Clump, "Clump");
GameRegistry.registerItem(DirtyDust, "DirtyDust");
GameRegistry.registerItem(Configurator, "Configurator");
GameRegistry.registerItem(NetworkReader, "NetworkReader");
GameRegistry.registerItem(WalkieTalkie, "WalkieTalkie");
GameRegistry.registerItem(Jetpack, "Jetpack");
GameRegistry.registerItem(Dictionary, "Dictionary");
GameRegistry.registerItem(GasMask, "GasMask");
GameRegistry.registerItem(ScubaTank, "ScubaTank");
GameRegistry.registerItem(Balloon, "Balloon");
GameRegistry.registerItem(Shard, "Shard");
GameRegistry.registerItem(ElectrolyticCore, "ElectrolyticCore");
GameRegistry.registerItem(Sawdust, "Sawdust");
GameRegistry.registerItem(Salt, "Salt");
GameRegistry.registerItem(BrineBucket, "BrineBucket");
GameRegistry.registerItem(Crystal, "Crystal");
GameRegistry.registerItem(FrictionBoots, "FrictionBoots");
GameRegistry.registerItem(ArmoredJetpack, "ArmoredJetpack");
GameRegistry.registerItem(FilterCard, "FilterCard");
GameRegistry.registerItem(SeismicReader, "SeismicReader");
GameRegistry.registerItem(Substrate, "Substrate");
GameRegistry.registerItem(Polyethene, "Polyethene");
GameRegistry.registerItem(BioFuel, "BioFuel");
GameRegistry.registerItem(GlowPanel, "GlowPanel");
GameRegistry.registerItem(Flamethrower, "Flamethrower");
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(BrineBucket), FluidContainerRegistry.EMPTY_BUCKET);
MinecraftForge.EVENT_BUS.register(GasMask);
MinecraftForge.EVENT_BUS.register(FrictionBoots);
}
}

2
src/main/java/mekanism/common/block/BlockGasTank.java
View file

@ -148,7 +148,7 @@ public class BlockGasTank extends BlockContainer
}
@Override
public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z)
public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest)
{
if(!player.capabilities.isCreativeMode && !world.isRemote && canHarvestBlock(player, world.getBlockMetadata(x, y, z)))
{

16
src/main/java/mekanism/common/block/BlockMachine.java
View file

@ -23,6 +23,7 @@ import mekanism.common.IUpgradeTile;
import mekanism.common.ItemAttacher;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.network.PacketElectricChest.ElectricChestMessage;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage;
@ -83,7 +84,9 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import buildcraft.api.tools.IToolWrench;
import cpw.mods.fml.common.ModAPIManager;
@ -633,6 +636,19 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
list.add(stack);
}
}
else if(type == MachineType.PORTABLE_TANK) {
list.add(new ItemStack(item, 1, type.meta));
ItemBlockMachine itemMachine = (ItemBlockMachine)item;
for(Fluid f : FluidRegistry.getRegisteredFluids().values())
{
ItemStack filled = new ItemStack(item, 1, type.meta);
itemMachine.setFluidStack(new FluidStack(f, itemMachine.getCapacity(filled)), filled);
itemMachine.setPrevScale(filled, 1);
list.add(filled);
}
}
else {
list.add(new ItemStack(item, 1, type.meta));
}

16
src/main/java/mekanism/common/block/BlockPlastic.java
View file

@ -27,7 +27,7 @@ public class BlockPlastic extends Block
setHardness(5F);
setResistance(10F);
setCreativeTab(Mekanism.tabMekanism);
if(this == MekanismBlocks.BlockSlickHDPE)
if(this == MekanismBlocks.SlickPlasticBlock)
{
slipperiness = 0.98F;
}
@ -37,23 +37,23 @@ public class BlockPlastic extends Block
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register)
{
if(this == MekanismBlocks.BlockHDPE)
if(this == MekanismBlocks.PlasticBlock)
{
blockIcon = register.registerIcon("mekanism:PlasticBlock");
}
else if(this == MekanismBlocks.BlockSlickHDPE)
else if(this == MekanismBlocks.SlickPlasticBlock)
{
blockIcon = register.registerIcon("mekanism:SlickPlasticBlock");
}
else if(this == MekanismBlocks.BlockGlowHDPE)
else if(this == MekanismBlocks.GlowPlasticBlock)
{
blockIcon = register.registerIcon("mekanism:GlowPlasticBlock");
}
else if(this == MekanismBlocks.BlockReinforcedHDPE)
else if(this == MekanismBlocks.ReinforcedPlasticBlock)
{
blockIcon = register.registerIcon("mekanism:ReinforcedPlasticBlock");
}
else if(this == MekanismBlocks.BlockRoadHDPE)
else if(this == MekanismBlocks.RoadPlasticBlock)
{
blockIcon = register.registerIcon("mekanism:RoadPlasticBlock");
}
@ -62,7 +62,7 @@ public class BlockPlastic extends Block
@Override
public void onEntityWalking(World world, int x, int y, int z, Entity e)
{
if(this == MekanismBlocks.BlockRoadHDPE)
if(this == MekanismBlocks.RoadPlasticBlock)
{
double boost = 1.6;
@ -105,7 +105,7 @@ public class BlockPlastic extends Block
@Override
public int getLightValue(IBlockAccess world, int x, int y, int z)
{
if(this == MekanismBlocks.BlockGlowHDPE)
if(this == MekanismBlocks.GlowPlasticBlock)
{
return 10;
}

12
src/main/java/mekanism/common/inventory/container/ContainerFactory.java
View file

@ -33,14 +33,14 @@ public class ContainerFactory extends Container
{
int xAxis = 55 + (i*38);
addSlotToContainer(new Slot(tentity, 4+i, xAxis, 13));
addSlotToContainer(new Slot(tentity, 5+i, xAxis, 13));
}
for(int i = 0; i < tileEntity.tier.processes; i++)
{
int xAxis = 55 + (i*38);
addSlotToContainer(new SlotOutput(tentity, tileEntity.tier.processes+4+i, xAxis, 57));
addSlotToContainer(new SlotOutput(tentity, tileEntity.tier.processes+5+i, xAxis, 57));
}
}
else if(tileEntity.tier == FactoryTier.ADVANCED)
@ -49,14 +49,14 @@ public class ContainerFactory extends Container
{
int xAxis = 35 + (i*26);
addSlotToContainer(new Slot(tentity, 4+i, xAxis, 13));
addSlotToContainer(new Slot(tentity, 5+i, xAxis, 13));
}
for(int i = 0; i < tileEntity.tier.processes; i++)
{
int xAxis = 35 + (i*26);
addSlotToContainer(new SlotOutput(tentity, tileEntity.tier.processes+4+i, xAxis, 57));
addSlotToContainer(new SlotOutput(tentity, tileEntity.tier.processes+5+i, xAxis, 57));
}
}
else if(tileEntity.tier == FactoryTier.ELITE)
@ -65,14 +65,14 @@ public class ContainerFactory extends Container
{
int xAxis = 29 + (i*19);
addSlotToContainer(new Slot(tentity, 4+i, xAxis, 13));
addSlotToContainer(new Slot(tentity, 5+i, xAxis, 13));
}
for(int i = 0; i < tileEntity.tier.processes; i++)
{
int xAxis = 29 + (i*19);
addSlotToContainer(new SlotOutput(tentity, tileEntity.tier.processes+4+i, xAxis, 57));
addSlotToContainer(new SlotOutput(tentity, tileEntity.tier.processes+5+i, xAxis, 57));
}
}

2
src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
View file

@ -213,7 +213,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE
@Override
public void setEnergy(ItemStack itemStack, double amount)
{
if(EnergyCubeTier.values()[getTier(itemStack)] == EnergyCubeTier.CREATIVE && amount != Integer.MAX_VALUE)
if(getEnergyCubeTier(itemStack) == EnergyCubeTier.CREATIVE && amount != Integer.MAX_VALUE)
{
return;
}

5
src/main/java/mekanism/common/item/ItemBlockMachine.java
View file

@ -173,9 +173,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
if(hasTank(itemstack))
{
if(getFluidStack(itemstack) != null)
FluidStack fluidStack = getFluidStack(itemstack);
if(fluidStack != null)
{
list.add(EnumColor.PINK + FluidRegistry.getFluidName(getFluidStack(itemstack)) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB");
list.add(EnumColor.PINK + fluidStack.getFluid().getLocalizedName(fluidStack) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB");
}
}

1
src/main/java/mekanism/common/item/ItemFlamethrower.java
View file

@ -21,6 +21,7 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem
public ItemFlamethrower()
{
super();
setMaxStackSize(1);
setMaxDamage(100);
setNoRepair();

1
src/main/java/mekanism/common/item/ItemFreeRunners.java
View file

@ -52,7 +52,6 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci
setMaxDamage(100);
setNoRepair();
setCreativeTab(Mekanism.tabMekanism);
MinecraftForge.EVENT_BUS.register(this);
}
@Override

1
src/main/java/mekanism/common/item/ItemGasMask.java
View file

@ -23,7 +23,6 @@ public class ItemGasMask extends ItemArmor
{
super(EnumHelper.addArmorMaterial("GASMASK", 0, new int[] {0, 0, 0, 0}, 0), 0, 0);
setCreativeTab(Mekanism.tabMekanism);
MinecraftForge.EVENT_BUS.register(this);
}
@Override

1
src/main/java/mekanism/common/item/ItemUpgrade.java
View file

@ -20,6 +20,7 @@ public class ItemUpgrade extends ItemMekanism implements IUpgradeItem
public ItemUpgrade(Upgrade type)
{
super();
upgrade = type;
setMaxStackSize(type.getMax());
}

2
src/main/java/mekanism/common/recipe/BinRecipe.java
View file

@ -164,7 +164,7 @@ public class BinRecipe implements IRecipe
if(testRemain != null && testRemain.stackSize > 0)
{
ItemStack proxy = new ItemStack(MekanismItems.Proxy);
ItemStack proxy = new ItemStack(MekanismItems.ItemProxy);
((ItemProxy)proxy.getItem()).setSavedItem(proxy, testRemain.copy());
event.craftMatrix.setInventorySlotContents(other, proxy);
}

13
src/main/java/mekanism/common/tile/TileEntityLaser.java
View file

@ -5,7 +5,8 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import mekanism.api.Coord4D;
import mekanism.api.lasers.LaserManager;
import mekanism.api.MekanismConfig.usage;
import mekanism.common.LaserManager;
import mekanism.common.Mekanism;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import net.minecraft.item.ItemStack;
@ -13,13 +14,11 @@ import net.minecraftforge.common.util.ForgeDirection;
public class TileEntityLaser extends TileEntityElectricBlock
{
public static final double LASER_ENERGY = 5000;
public boolean on;
public TileEntityLaser()
{
super("Laser", 2*LASER_ENERGY);
super("Laser", 2* usage.laserUsage);
inventory = new ItemStack[0];
}
@ -37,7 +36,7 @@ public class TileEntityLaser extends TileEntityElectricBlock
}
else
{
if(getEnergy() >= LASER_ENERGY)
if(getEnergy() >= usage.laserUsage)
{
if(!on)
{
@ -45,8 +44,8 @@ public class TileEntityLaser extends TileEntityElectricBlock
Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(50D));
}
LaserManager.fireLaser(Coord4D.get(this), ForgeDirection.getOrientation(facing), LASER_ENERGY, worldObj);
setEnergy(getEnergy() - LASER_ENERGY);
LaserManager.fireLaser(Coord4D.get(this), ForgeDirection.getOrientation(facing), usage.laserUsage, worldObj);
setEnergy(getEnergy() - usage.laserUsage);
}
else if(on)
{

3
src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
View file

@ -4,12 +4,11 @@ import java.util.ArrayList;
import mekanism.api.Coord4D;
import mekanism.api.lasers.ILaserReceptor;
import mekanism.api.lasers.LaserManager;
import mekanism.common.LaserManager;
import mekanism.common.Mekanism;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import io.netty.buffer.ByteBuf;

3
src/main/java/mekanism/generators/client/GeneratorsClientProxy.java
View file

@ -7,6 +7,7 @@ import mekanism.generators.client.gui.GuiNeutronCapture;
import mekanism.generators.client.gui.GuiReactorController;
import mekanism.generators.client.gui.GuiReactorFuel;
import mekanism.generators.client.gui.GuiReactorHeat;
import mekanism.generators.client.gui.GuiReactorStats;
import mekanism.generators.client.gui.GuiSolarGenerator;
import mekanism.generators.client.gui.GuiWindTurbine;
import mekanism.generators.client.render.RenderAdvancedSolarGenerator;
@ -85,6 +86,8 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy
case 12:
return new GuiReactorFuel(player.inventory, (TileEntityReactorController)tileEntity);
case 13:
return new GuiReactorStats(player.inventory, (TileEntityReactorController)tileEntity);
case 14:
return new GuiNeutronCapture(player.inventory, (TileEntityReactorNeutronCapture)tileEntity);
}

32
src/main/java/mekanism/generators/client/gui/GuiReactorController.java
View file

@ -3,16 +3,12 @@ package mekanism.generators.client.gui;
import java.util.ArrayList;
import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.util.ListUtils;
import mekanism.client.gui.GuiEnergyInfo;
import mekanism.client.gui.GuiEnergyInfo.IInfoHandler;
import mekanism.client.gui.GuiMekanism;
import mekanism.client.gui.GuiSlot;
import mekanism.client.gui.GuiSlot.SlotType;
import mekanism.client.sound.SoundHandler;
import mekanism.common.Mekanism;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.inventory.container.ContainerReactorController;
@ -32,19 +28,23 @@ public class GuiReactorController extends GuiMekanism
{
super(new ContainerReactorController(inventory, tentity));
tileEntity = tentity;
guiElements.add(new GuiEnergyInfo(new IInfoHandler()
if(tileEntity.isFormed())
{
@Override
public List<String> getInfo()
guiElements.add(new GuiEnergyInfo(new IInfoHandler()
{
return ListUtils.asList(
"Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
"Max Output: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t");
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 79, 38));
guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
@Override
public List<String> getInfo()
{
return tileEntity.isFormed() ? ListUtils.asList(
"Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
"Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList();
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 79, 38));
guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
guiElements.add(new GuiStatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
}
}
@Override
@ -52,7 +52,7 @@ public class GuiReactorController extends GuiMekanism
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
fontRendererObj.drawString(tileEntity.getInventoryName(), 6, 6, 0x404040);
fontRendererObj.drawString(tileEntity.getInventoryName(), 46, 6, 0x404040);
if(tileEntity.getActive())
{

39
src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java
View file

@ -15,15 +15,21 @@ import mekanism.client.gui.GuiMekanism;
import mekanism.client.gui.GuiProgress;
import mekanism.client.gui.GuiProgress.IProgressInfoHandler;
import mekanism.client.gui.GuiProgress.ProgressBar;
import mekanism.client.sound.SoundHandler;
import mekanism.common.Mekanism;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.inventory.container.ContainerNull;
import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.MekanismGenerators;
import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage;
import mekanism.generators.common.tile.reactor.TileEntityReactorController;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import org.lwjgl.input.Keyboard;
@ -45,9 +51,9 @@ public class GuiReactorFuel extends GuiMekanism
@Override
public List<String> getInfo()
{
return ListUtils.asList(
return tileEntity.isFormed() ? ListUtils.asList(
"Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
"Max Output: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t");
"Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList();
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
guiElements.add(new GuiGasGauge(new IGasInfoHandler()
@ -91,6 +97,7 @@ public class GuiReactorFuel extends GuiMekanism
}
}, ProgressBar.SMALL_LEFT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 99, 75));
guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
guiElements.add(new GuiStatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
}
@Override
@ -98,8 +105,8 @@ public class GuiReactorFuel extends GuiMekanism
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
fontRendererObj.drawString(tileEntity.getInventoryName(), 6, 6, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.injectionRate") + ": " + (tileEntity.getReactor()==null?"None":tileEntity.getReactor().getInjectionRate()), 55, 35, 0x404040);
fontRendererObj.drawString(tileEntity.getInventoryName(), 46, 6, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.injectionRate") + ": " + (tileEntity.getReactor() == null ? "None" : tileEntity.getReactor().getInjectionRate()), 55, 35, 0x404040);
}
@Override
@ -111,6 +118,17 @@ public class GuiReactorFuel extends GuiMekanism
int guiHeight = (height - ySize) / 2;
drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize);
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20)
{
drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 0, 14, 14);
}
else {
drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 14, 14, 14);
}
super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY);
injectionRateField.drawTextBox();
@ -130,6 +148,19 @@ public class GuiReactorFuel extends GuiMekanism
super.mouseClicked(mouseX, mouseY, button);
injectionRateField.mouseClicked(mouseX, mouseY, button);
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
if(button == 0)
{
if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20)
{
SoundHandler.playSound("gui.button.press");
MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 10));
}
}
}
@Override

46
src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java
View file

@ -1,7 +1,9 @@
package mekanism.generators.client.gui;
import java.util.ArrayList;
import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.util.ListUtils;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.client.gui.GuiEnergyGauge;
@ -17,9 +19,12 @@ import mekanism.client.gui.GuiNumberGauge.INumberInfoHandler;
import mekanism.client.gui.GuiProgress;
import mekanism.client.gui.GuiProgress.IProgressInfoHandler;
import mekanism.client.gui.GuiProgress.ProgressBar;
import mekanism.client.sound.SoundHandler;
import mekanism.common.inventory.container.ContainerNull;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.MekanismGenerators;
import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage;
import mekanism.generators.common.tile.reactor.TileEntityReactorController;
import net.minecraft.block.BlockStaticLiquid;
@ -44,9 +49,9 @@ public class GuiReactorHeat extends GuiMekanism
@Override
public List<String> getInfo()
{
return ListUtils.asList(
return tileEntity.isFormed() ? ListUtils.asList(
"Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
"Max Output: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t");
"Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList();
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
guiElements.add(new GuiNumberGauge(new INumberInfoHandler()
@ -72,7 +77,7 @@ public class GuiReactorHeat extends GuiMekanism
@Override
public String getText(double level)
{
return "Plasma: " + (int)(level+23) + "C";
return "Plasma: " + (int)level + "C";
}
}, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 7, 50));
guiElements.add(new GuiProgress(new IProgressInfoHandler()
@ -106,7 +111,7 @@ public class GuiReactorHeat extends GuiMekanism
@Override
public String getText(double level)
{
return "Case: " + (int)(level+23) + "C";
return "Case: " + (int)level + "C";
}
}, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 61, 50));
guiElements.add(new GuiProgress(new IProgressInfoHandler()
@ -150,6 +155,7 @@ public class GuiReactorHeat extends GuiMekanism
}
}, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 115, 46));
guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
guiElements.add(new GuiStatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
}
@Override
@ -157,7 +163,7 @@ public class GuiReactorHeat extends GuiMekanism
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
fontRendererObj.drawString(tileEntity.getInventoryName(), 6, 6, 0x404040);
fontRendererObj.drawString(tileEntity.getInventoryName(), 46, 6, 0x404040);
}
@Override
@ -169,6 +175,36 @@ public class GuiReactorHeat extends GuiMekanism
int guiHeight = (height - ySize) / 2;
drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize);
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20)
{
drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 0, 14, 14);
}
else {
drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 14, 14, 14);
}
super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY);
}
@Override
public void mouseClicked(int mouseX, int mouseY, int button)
{
super.mouseClicked(mouseX, mouseY, button);
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
if(button == 0)
{
if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20)
{
SoundHandler.playSound("gui.button.press");
MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 10));
}
}
}
}

115
src/main/java/mekanism/generators/client/gui/GuiReactorStats.java Normal file
View file

@ -0,0 +1,115 @@
package mekanism.generators.client.gui;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.util.ListUtils;
import mekanism.client.gui.GuiEnergyInfo;
import mekanism.client.gui.GuiEnergyInfo.IInfoHandler;
import mekanism.client.gui.GuiMekanism;
import mekanism.client.sound.SoundHandler;
import mekanism.common.inventory.container.ContainerNull;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.MekanismGenerators;
import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage;
import mekanism.generators.common.tile.reactor.TileEntityReactorController;
import net.minecraft.entity.player.InventoryPlayer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GuiReactorStats extends GuiMekanism
{
public TileEntityReactorController tileEntity;
public static NumberFormat nf = NumberFormat.getIntegerInstance();
public GuiReactorStats(InventoryPlayer inventory, final TileEntityReactorController tentity)
{
super(new ContainerNull(inventory.player, tentity));
tileEntity = tentity;
guiElements.add(new GuiEnergyInfo(new IInfoHandler()
{
@Override
public List<String> getInfo()
{
return tileEntity.isFormed() ? ListUtils.asList(
"Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
"Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList();
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
}
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
fontRendererObj.drawString(tileEntity.getInventoryName(), 46, 6, 0x404040);
if(tileEntity.isFormed())
{
fontRendererObj.drawString(MekanismUtils.localize("gui.passive"), 6, 26, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(false)), 16, 36, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.ignition") + ": " + (nf.format(tileEntity.getReactor().getIgnitionTemperature(false))), 16, 46, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.maxPlasma") + ": " + (nf.format(tileEntity.getReactor().getMaxPlasmaTemperature(false))), 16, 56, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.maxCasing") + ": " + (nf.format(tileEntity.getReactor().getMaxCasingTemperature(false))), 16, 66, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.passiveGeneration") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, false))+"/t", 16, 76, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.active"), 6, 96, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(true)), 16, 106, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.ignition") + ": " + (nf.format(tileEntity.getReactor().getIgnitionTemperature(true))), 16, 116, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.maxPlasma") + ": " + (nf.format(tileEntity.getReactor().getMaxPlasmaTemperature(true))), 16, 126, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.maxCasing") + ": " + (nf.format(tileEntity.getReactor().getMaxCasingTemperature(true))), 16, 136, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.passiveGeneration") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(true, false))+"/t", 16, 146, 0x404040);
fontRendererObj.drawString(MekanismUtils.localize("gui.steamProduction") + ": " + nf.format(tileEntity.getReactor().getSteamPerTick(false)) + "mB/t", 16, 156, 0x404040);
}
}
@Override
protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY)
{
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"));
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
int guiWidth = (width - xSize) / 2;
int guiHeight = (height - ySize) / 2;
drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize);
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20)
{
drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 0, 14, 14);
}
else {
drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 14, 14, 14);
}
super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY);
}
@Override
public void mouseClicked(int mouseX, int mouseY, int button)
{
super.mouseClicked(mouseX, mouseY, button);
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
if(button == 0)
{
if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20)
{
SoundHandler.playSound("gui.button.press");
MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 10));
}
}
}}

84
src/main/java/mekanism/generators/client/gui/GuiStatTab.java Normal file
View file

@ -0,0 +1,84 @@
package mekanism.generators.client.gui;
import mekanism.api.Coord4D;
import mekanism.client.gui.GuiElement;
import mekanism.client.gui.IGuiWrapper;
import mekanism.client.sound.SoundHandler;
import mekanism.common.Mekanism;
import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.MekanismGenerators;
import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import codechicken.lib.vec.Rectangle4i;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class GuiStatTab extends GuiElement
{
TileEntity tileEntity;
public GuiStatTab(IGuiWrapper gui, TileEntity tile, ResourceLocation def)
{
super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiStatsTab.png"), gui, def);
tileEntity = tile;
}
@Override
public Rectangle4i getBounds(int guiWidth, int guiHeight)
{
return new Rectangle4i(guiWidth - 26, guiHeight + 62, 26, 26);
}
@Override
public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight)
{
mc.renderEngine.bindTexture(RESOURCE);
guiObj.drawTexturedRect(guiWidth - 26, guiHeight + 62, 0, 0, 26, 26);
if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84)
{
guiObj.drawTexturedRect(guiWidth - 21, guiHeight + 66, 26, 0, 18, 18);
}
else {
guiObj.drawTexturedRect(guiWidth - 21, guiHeight + 66, 26, 18, 18, 18);
}
mc.renderEngine.bindTexture(defaultLocation);
}
@Override
public void renderForeground(int xAxis, int yAxis)
{
mc.renderEngine.bindTexture(RESOURCE);
if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84)
{
displayTooltip(MekanismUtils.localize("gui.stats"), xAxis, yAxis);
}
mc.renderEngine.bindTexture(defaultLocation);
}
@Override
public void preMouseClicked(int xAxis, int yAxis, int button) {}
@Override
public void mouseClicked(int xAxis, int yAxis, int button)
{
if(button == 0)
{
if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84)
{
MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 13));
SoundHandler.playSound("gui.button.press");
}
}
}
}

43
src/main/java/mekanism/generators/common/FusionReactor.java
View file

@ -465,4 +465,47 @@ public class FusionReactor implements IFusionReactor
{
burning = burn;
}
@Override
public int getMinInjectionRate(boolean active)
{
double k = active ? caseWaterConductivity : 0;
double aMin = burnTemperature * burnRatio * plasmaCaseConductivity * (k+caseAirConductivity) / (energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) - plasmaCaseConductivity * (k + caseAirConductivity));
return (int)(2 * Math.ceil(aMin/2D));
}
@Override
public double getMaxPlasmaTemperature(boolean active)
{
double k = active ? caseWaterConductivity : 0;
return injectionRate * energyPerFuel/plasmaCaseConductivity * (plasmaCaseConductivity+k+caseAirConductivity) / (k+caseAirConductivity);
}
@Override
public double getMaxCasingTemperature(boolean active)
{
double k = active ? caseWaterConductivity : 0;
return injectionRate * energyPerFuel / (k+caseAirConductivity);
}
@Override
public double getIgnitionTemperature(boolean active)
{
double k = active ? caseWaterConductivity : 0;
return burnTemperature * energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) / (energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) - plasmaCaseConductivity * (k + caseAirConductivity));
}
public double getPassiveGeneration(boolean active, boolean current)
{
double temperature = current ? caseTemperature : getMaxCasingTemperature(active);
return thermocoupleEfficiency * caseAirConductivity * temperature;
}
public int getSteamPerTick(boolean current)
{
double temperature = current ? caseTemperature : getMaxCasingTemperature(true);
return (int)(steamTransferEfficiency * caseWaterConductivity * temperature / enthalpyOfVaporization);
}
}

11
src/main/java/mekanism/generators/common/GeneratorsBlocks.java
View file

@ -2,15 +2,24 @@ package mekanism.generators.common;
import mekanism.generators.common.block.BlockGenerator;
import mekanism.generators.common.block.BlockReactor;
import mekanism.generators.common.item.ItemBlockGenerator;
import mekanism.generators.common.item.ItemBlockReactor;
import net.minecraft.block.Block;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder("MekanismGenerators")
public class GeneratorsBlocks
{
//Blocks
public static final Block Generator = new BlockGenerator().setBlockName("Generator");
public static final Block Reactor = new BlockReactor().setBlockName("Reactor");
public static final Block ReactorGlass = new BlockReactor().setBlockName("ReactorGlass");
public static void register()
{
GameRegistry.registerBlock(Generator, ItemBlockGenerator.class, "Generator");
GameRegistry.registerBlock(Reactor, ItemBlockReactor.class, "Reactor");
GameRegistry.registerBlock(ReactorGlass, ItemBlockReactor.class, "ReactorGlass");
}
}

3
src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
View file

@ -127,8 +127,9 @@ public class GeneratorsCommonProxy
return new ContainerReactorController(player.inventory, (TileEntityReactorController)tileEntity);
case 11:
case 12:
return new ContainerNull(player, (TileEntityReactorController)tileEntity);
case 13:
return new ContainerNull(player, (TileEntityReactorController)tileEntity);
case 14:
return new ContainerNeutronCapture(player.inventory, (TileEntityReactorNeutronCapture)tileEntity);
}

9
src/main/java/mekanism/generators/common/GeneratorsItems.java
View file

@ -3,11 +3,16 @@ package mekanism.generators.common;
import mekanism.common.item.ItemMekanism;
import net.minecraft.item.Item;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder("MekanismGenerators")
public class GeneratorsItems
{
//Items
public static final Item SolarPanel = new ItemMekanism().setUnlocalizedName("SolarPanel");;
public static final Item SolarPanel = new ItemMekanism().setUnlocalizedName("SolarPanel");
public static void register()
{
GameRegistry.registerItem(SolarPanel, "SolarPanel");
}
}

78
src/main/java/mekanism/generators/common/MekanismGenerators.java
View file

@ -14,12 +14,7 @@ import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
import mekanism.common.Version;
import mekanism.common.item.ItemMekanism;
import mekanism.common.recipe.MekanismRecipe;
import mekanism.generators.common.block.BlockGenerator;
import mekanism.generators.common.block.BlockReactor;
import mekanism.generators.common.item.ItemBlockGenerator;
import mekanism.generators.common.item.ItemBlockReactor;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@ -38,9 +33,9 @@ import cpw.mods.fml.common.ModAPIManager;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "8.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory")
public class MekanismGenerators implements IModule
@ -57,6 +52,37 @@ public class MekanismGenerators implements IModule
/** MekanismGenerators version number */
public static Version versionNumber = new Version(8, 0, 0);
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
GeneratorsBlocks.register();
GeneratorsItems.register();
}
@EventHandler
public void init(FMLInitializationEvent event)
{
//Add this module to the core list
Mekanism.modulesLoaded.add(this);
packetHandler.initialize();
//Set up the GUI handler
NetworkRegistry.INSTANCE.registerGuiHandler(this, new GeneratorsGuiHandler());
FMLCommonHandler.instance().bus().register(this);
//Load the proxy
proxy.loadConfiguration();
proxy.registerRegularTileEntities();
proxy.registerSpecialTileEntities();
proxy.registerRenderInformation();
addRecipes();
//Finalization
Mekanism.logger.info("Loaded MekanismGenerators module.");
}
@EventHandler
public void postInit(FMLPostInitializationEvent event)
{
@ -75,34 +101,7 @@ public class MekanismGenerators implements IModule
IronEngineFuel.addFuel("ethene", (float) (240 * general.TO_BC), 40 * FluidContainerRegistry.BUCKET_VOLUME);
}
}
@EventHandler
public void init(FMLInitializationEvent event)
{
//Add this module to the core list
Mekanism.modulesLoaded.add(this);
packetHandler.initialize();
//Set up the GUI handler
NetworkRegistry.INSTANCE.registerGuiHandler(this, new GeneratorsGuiHandler());
FMLCommonHandler.instance().bus().register(this);
//Load the proxy
proxy.loadConfiguration();
proxy.registerRegularTileEntities();
proxy.registerSpecialTileEntities();
proxy.registerRenderInformation();
//Load this module
registerBlocks();
addItems();
addRecipes();
//Finalization
Mekanism.logger.info("Loaded MekanismGenerators module.");
}
public void addRecipes()
{
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 0), new Object[] {
@ -130,19 +129,6 @@ public class MekanismGenerators implements IModule
FuelHandler.addGas(GasRegistry.getGas("ethene"), 40, general.FROM_H2 + generators.bioGeneration * 80); //1mB hydrogen + 2*bioFuel/tick*200ticks/100mB * 20x efficiency bonus
}
public void registerBlocks()
{
GameRegistry.registerBlock(GeneratorsBlocks.Generator, ItemBlockGenerator.class, "Generator");
GameRegistry.registerBlock(GeneratorsBlocks.Reactor, ItemBlockReactor.class, "Reactor");
GameRegistry.registerBlock(GeneratorsBlocks.ReactorGlass, ItemBlockReactor.class, "ReactorGlass");
}
public void addItems()
{
//Registrations
GameRegistry.registerItem(GeneratorsItems.SolarPanel, "SolarPanel");
}
@Override
public Version getVersion()

4
src/main/java/mekanism/generators/common/block/BlockReactor.java
View file

@ -74,7 +74,7 @@ public class BlockReactor extends BlockContainer
{
if(meta == 0)
{
return icons[0][side == 6 ? 0 : 2];
return icons[0][side == 1 ? 0 : 2];
}
else {
return icons[meta][0];
@ -284,7 +284,7 @@ public class BlockReactor extends BlockContainer
{
CONTROLLER(GeneratorsBlocks.Reactor, 0, "ReactorController", 10, TileEntityReactorController.class),
FRAME(GeneratorsBlocks.Reactor, 1, "ReactorFrame", -1, TileEntityReactorFrame.class),
NEUTRON_CAPTURE(GeneratorsBlocks.Reactor, 2, "ReactorNeutronCapturePlate", 13, TileEntityReactorNeutronCapture.class),
NEUTRON_CAPTURE(GeneratorsBlocks.Reactor, 2, "ReactorNeutronCapturePlate", 14, TileEntityReactorNeutronCapture.class),
PORT(GeneratorsBlocks.Reactor, 3, "ReactorInOutPort", -1, TileEntityReactorPort.class),
GLASS(GeneratorsBlocks.ReactorGlass, 0, "ReactorGlass", -1, TileEntityReactorGlass.class),
LASER_FOCUS_MATRIX(GeneratorsBlocks.ReactorGlass, 1, "ReactorLaserFocusMatrix", -1, TileEntityReactorLaserFocusMatrix.class);

291
src/main/java/mekanism/tools/common/MekanismTools.java
View file

@ -27,8 +27,8 @@ import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.registry.GameRegistry;
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "8.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
public class MekanismTools implements IModule
@ -64,6 +64,12 @@ public class MekanismTools implements IModule
public static ArmorMaterial armorGLOWSTONE;
public static ArmorMaterial armorSTEEL;
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
addItems();
}
@EventHandler
public void init(FMLInitializationEvent event)
{
@ -78,7 +84,6 @@ public class MekanismTools implements IModule
proxy.loadConfiguration();
//Load this module
addItems();
addRecipes();
//Finalization
@ -89,211 +94,211 @@ public class MekanismTools implements IModule
{
//Crafting Recipes
//Base
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.WoodPaxel, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.WoodPaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), Items.wooden_axe, Character.valueOf('Y'), Items.wooden_pickaxe, Character.valueOf('Z'), Items.wooden_shovel, Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.StonePaxel, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.StonePaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), Items.stone_axe, Character.valueOf('Y'), Items.stone_pickaxe, Character.valueOf('Z'), Items.stone_shovel, Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.IronPaxel, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.IronPaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), Items.iron_axe, Character.valueOf('Y'), Items.iron_pickaxe, Character.valueOf('Z'), Items.iron_shovel, Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.DiamondPaxel, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.DiamondPaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), Items.diamond_axe, Character.valueOf('Y'), Items.diamond_pickaxe, Character.valueOf('Z'), Items.diamond_shovel, Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GoldPaxel, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.GoldPaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), Items.golden_axe, Character.valueOf('Y'), Items.golden_pickaxe, Character.valueOf('Z'), Items.golden_shovel, Character.valueOf('T'), Items.stick
}));
//Obsidian
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianHelmet, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.ObsidianHelmet, 1), new Object[] {
"***", "* *", Character.valueOf('*'), "ingotRefinedObsidian"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianChestplate, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.ObsidianChestplate, 1), new Object[] {
"* *", "***", "***", Character.valueOf('*'), "ingotRefinedObsidian"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianLeggings, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.ObsidianLeggings, 1), new Object[] {
"***", "* *", "* *", Character.valueOf('*'), "ingotRefinedObsidian"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianBoots, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.ObsidianBoots, 1), new Object[] {
"* *", "* *", Character.valueOf('*'), "ingotRefinedObsidian"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianPaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), MekanismToolsItems.ObsidianAxe, Character.valueOf('Y'), MekanismToolsItems.ObsidianPickaxe, Character.valueOf('Z'), MekanismToolsItems.ObsidianShovel, Character.valueOf('T'), Items.stick
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.ObsidianPaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), ToolsItems.ObsidianAxe, Character.valueOf('Y'), ToolsItems.ObsidianPickaxe, Character.valueOf('Z'), ToolsItems.ObsidianShovel, Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianPickaxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.ObsidianPickaxe, 1), new Object[] {
"XXX", " T ", " T ", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianAxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.ObsidianAxe, 1), new Object[] {
"XX", "XT", " T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianShovel, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.ObsidianShovel, 1), new Object[] {
"X", "T", "T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianHoe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.ObsidianHoe, 1), new Object[] {
"XX", " T", " T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianSword, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.ObsidianSword, 1), new Object[] {
"X", "X", "T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Items.stick
}));
//Glowstone
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstonePaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), MekanismToolsItems.GlowstoneAxe, Character.valueOf('Y'), MekanismToolsItems.GlowstonePickaxe, Character.valueOf('Z'), MekanismToolsItems.GlowstoneShovel, Character.valueOf('T'), Items.stick
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.GlowstonePaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), ToolsItems.GlowstoneAxe, Character.valueOf('Y'), ToolsItems.GlowstonePickaxe, Character.valueOf('Z'), ToolsItems.GlowstoneShovel, Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstonePickaxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.GlowstonePickaxe, 1), new Object[] {
"XXX", " T ", " T ", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneAxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.GlowstoneAxe, 1), new Object[] {
"XX", "XT", " T", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneShovel, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.GlowstoneShovel, 1), new Object[] {
"X", "T", "T", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneHoe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.GlowstoneHoe, 1), new Object[] {
"XX", " T", " T", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneSword, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.GlowstoneSword, 1), new Object[] {
"X", "X", "T", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneHelmet, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.GlowstoneHelmet, 1), new Object[] {
"***", "* *", Character.valueOf('*'), "ingotRefinedGlowstone"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneChestplate, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.GlowstoneChestplate, 1), new Object[] {
"* *", "***", "***", Character.valueOf('*'), "ingotRefinedGlowstone"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneLeggings, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.GlowstoneLeggings, 1), new Object[] {
"***", "* *", "* *", Character.valueOf('*'), "ingotRefinedGlowstone"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneBoots, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.GlowstoneBoots, 1), new Object[] {
"* *", "* *", Character.valueOf('*'), "ingotRefinedGlowstone"
}));
//Lazuli
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliHelmet, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.LazuliHelmet, 1), new Object[] {
"***", "* *", Character.valueOf('*'), new ItemStack(Items.dye, 1, 4)
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliChestplate, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.LazuliChestplate, 1), new Object[] {
"* *", "***", "***", Character.valueOf('*'), new ItemStack(Items.dye, 1, 4)
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliLeggings, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.LazuliLeggings, 1), new Object[] {
"***", "* *", "* *", Character.valueOf('*'), new ItemStack(Items.dye, 1, 4)
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliBoots, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.LazuliBoots, 1), new Object[] {
"* *", "* *", Character.valueOf('*'), new ItemStack(Items.dye, 1, 4)
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliPaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), MekanismToolsItems.LazuliAxe, Character.valueOf('Y'), MekanismToolsItems.LazuliPickaxe, Character.valueOf('Z'), MekanismToolsItems.LazuliShovel, Character.valueOf('T'), Items.stick
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.LazuliPaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), ToolsItems.LazuliAxe, Character.valueOf('Y'), ToolsItems.LazuliPickaxe, Character.valueOf('Z'), ToolsItems.LazuliShovel, Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliPickaxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.LazuliPickaxe, 1), new Object[] {
"XXX", " T ", " T ", Character.valueOf('X'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliAxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.LazuliAxe, 1), new Object[] {
"XX", "XT", " T", Character.valueOf('X'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliShovel, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.LazuliShovel, 1), new Object[] {
"X", "T", "T", Character.valueOf('X'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliHoe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.LazuliHoe, 1), new Object[] {
"XX", " T", " T", Character.valueOf('X'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliSword, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.LazuliSword, 1), new Object[] {
"X", "X", "T", Character.valueOf('X'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), Items.stick
}));
//Osmium
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumPaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), MekanismToolsItems.OsmiumAxe, Character.valueOf('Y'), MekanismToolsItems.OsmiumPickaxe, Character.valueOf('Z'), MekanismToolsItems.OsmiumShovel, Character.valueOf('T'), Items.stick
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.OsmiumPaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), ToolsItems.OsmiumAxe, Character.valueOf('Y'), ToolsItems.OsmiumPickaxe, Character.valueOf('Z'), ToolsItems.OsmiumShovel, Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumPickaxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.OsmiumPickaxe, 1), new Object[] {
"XXX", " T ", " T ", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumAxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.OsmiumAxe, 1), new Object[] {
"XX", "XT", " T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumShovel, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.OsmiumShovel, 1), new Object[] {
"X", "T", "T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumHoe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.OsmiumHoe, 1), new Object[] {
"XX", " T", " T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumSword, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.OsmiumSword, 1), new Object[] {
"X", "X", "T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumHelmet, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.OsmiumHelmet, 1), new Object[] {
"***", "* *", Character.valueOf('*'), "ingotOsmium"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumChestplate, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.OsmiumChestplate, 1), new Object[] {
"* *", "***", "***", Character.valueOf('*'), "ingotOsmium"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumLeggings, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.OsmiumLeggings, 1), new Object[] {
"***", "* *", "* *", Character.valueOf('*'), "ingotOsmium"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumBoots, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.OsmiumBoots, 1), new Object[] {
"* *", "* *", Character.valueOf('*'), "ingotOsmium"
}));
//Bronze
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzePaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), MekanismToolsItems.BronzeAxe, Character.valueOf('Y'), MekanismToolsItems.BronzePickaxe, Character.valueOf('Z'), MekanismToolsItems.BronzeShovel, Character.valueOf('T'), Items.stick
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.BronzePaxel, 1), new Object[] {
"XYZ", " T ", " T ", Character.valueOf('X'), ToolsItems.BronzeAxe, Character.valueOf('Y'), ToolsItems.BronzePickaxe, Character.valueOf('Z'), ToolsItems.BronzeShovel, Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzePickaxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.BronzePickaxe, 1), new Object[] {
"XXX", " T ", " T ", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeAxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.BronzeAxe, 1), new Object[] {
"XX", "XT", " T", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeShovel, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.BronzeShovel, 1), new Object[] {
"X", "T", "T", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeHoe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.BronzeHoe, 1), new Object[] {
"XX", " T", " T", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeSword, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.BronzeSword, 1), new Object[] {
"X", "X", "T", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Items.stick
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeHelmet, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.BronzeHelmet, 1), new Object[] {
"***", "* *", Character.valueOf('*'), "ingotBronze"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeChestplate, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.BronzeChestplate, 1), new Object[] {
"* *", "***", "***", Character.valueOf('*'), "ingotBronze"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeLeggings, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.BronzeLeggings, 1), new Object[] {
"***", "* *", "* *", Character.valueOf('*'), "ingotBronze"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeBoots, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.BronzeBoots, 1), new Object[] {
"* *", "* *", Character.valueOf('*'), "ingotBronze"
}));
//Steel
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelPaxel, 1), new Object[] {
"XYZ", " I ", " I ", Character.valueOf('X'), MekanismToolsItems.SteelAxe, Character.valueOf('Y'), MekanismToolsItems.SteelPickaxe, Character.valueOf('Z'), MekanismToolsItems.SteelShovel, Character.valueOf('I'), Items.iron_ingot
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.SteelPaxel, 1), new Object[] {
"XYZ", " I ", " I ", Character.valueOf('X'), ToolsItems.SteelAxe, Character.valueOf('Y'), ToolsItems.SteelPickaxe, Character.valueOf('Z'), ToolsItems.SteelShovel, Character.valueOf('I'), Items.iron_ingot
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelPickaxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.SteelPickaxe, 1), new Object[] {
"XXX", " I ", " I ", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelAxe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.SteelAxe, 1), new Object[] {
"XX", "XI", " I", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelShovel, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.SteelShovel, 1), new Object[] {
"X", "I", "I", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelHoe, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.SteelHoe, 1), new Object[] {
"XX", " I", " I", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelSword, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.SteelSword, 1), new Object[] {
"X", "X", "I", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelHelmet, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.SteelHelmet, 1), new Object[] {
"***", "I I", Character.valueOf('*'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelChestplate, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.SteelChestplate, 1), new Object[] {
"I I", "*I*", "***", Character.valueOf('*'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelLeggings, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.SteelLeggings, 1), new Object[] {
"I*I", "* *", "* *", Character.valueOf('*'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelBoots, 1), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ToolsItems.SteelBoots, 1), new Object[] {
"I *", "* I", Character.valueOf('*'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot
}));
}
@ -453,90 +458,14 @@ public class MekanismTools implements IModule
}
, Mekanism.configuration.get("tools.armor-balance.steel", "enchantability", 10).getInt()
);
Mekanism.configuration.save();
if(Mekanism.configuration.hasChanged())
{
Mekanism.configuration.save();
}
MekanismToolsItems.initializeItems();
MekanismToolsItems.setHarvestLevels();
//Registrations
//Base
GameRegistry.registerItem(MekanismToolsItems.WoodPaxel, "WoodPaxel");
GameRegistry.registerItem(MekanismToolsItems.StonePaxel, "StonePaxel");
GameRegistry.registerItem(MekanismToolsItems.IronPaxel, "IronPaxel");
GameRegistry.registerItem(MekanismToolsItems.DiamondPaxel, "DiamondPaxel");
GameRegistry.registerItem(MekanismToolsItems.GoldPaxel, "GoldPaxel");
//Obsidian
GameRegistry.registerItem(MekanismToolsItems.ObsidianHelmet, "ObsidianHelmet");
GameRegistry.registerItem(MekanismToolsItems.ObsidianChestplate, "ObsidianChestplate");
GameRegistry.registerItem(MekanismToolsItems.ObsidianLeggings, "ObsidianLeggings");
GameRegistry.registerItem(MekanismToolsItems.ObsidianBoots, "ObsidianBoots");
GameRegistry.registerItem(MekanismToolsItems.ObsidianPaxel, "ObsidianPaxel");
GameRegistry.registerItem(MekanismToolsItems.ObsidianPickaxe, "ObsidianPickaxe");
GameRegistry.registerItem(MekanismToolsItems.ObsidianAxe, "ObsidianAxe");
GameRegistry.registerItem(MekanismToolsItems.ObsidianShovel, "ObsidianShovel");
GameRegistry.registerItem(MekanismToolsItems.ObsidianHoe, "ObsidianHoe");
GameRegistry.registerItem(MekanismToolsItems.ObsidianSword, "ObsidianSword");
//Lazuli
GameRegistry.registerItem(MekanismToolsItems.LazuliHelmet, "LapisLazuliHelmet");
GameRegistry.registerItem(MekanismToolsItems.LazuliChestplate, "LapisLazuliChestplate");
GameRegistry.registerItem(MekanismToolsItems.LazuliLeggings, "LapisLazuliLeggings");
GameRegistry.registerItem(MekanismToolsItems.LazuliBoots, "LapisLazuliBoots");
GameRegistry.registerItem(MekanismToolsItems.LazuliPaxel, "LapisLazuliPaxel");
GameRegistry.registerItem(MekanismToolsItems.LazuliPickaxe, "LapisLazuliPickaxe");
GameRegistry.registerItem(MekanismToolsItems.LazuliAxe, "LapisLazuliAxe");
GameRegistry.registerItem(MekanismToolsItems.LazuliShovel, "LapisLazuliShovel");
GameRegistry.registerItem(MekanismToolsItems.LazuliHoe, "LapisLazuliHoe");
GameRegistry.registerItem(MekanismToolsItems.LazuliSword, "LapisLazuliSword");
//Osmium
GameRegistry.registerItem(MekanismToolsItems.OsmiumHelmet, "OsmiumHelmet");
GameRegistry.registerItem(MekanismToolsItems.OsmiumChestplate, "OsmiumChestplate");
GameRegistry.registerItem(MekanismToolsItems.OsmiumLeggings, "OsmiumLeggings");
GameRegistry.registerItem(MekanismToolsItems.OsmiumBoots, "OsmiumBoots");
GameRegistry.registerItem(MekanismToolsItems.OsmiumPaxel, "OsmiumPaxel");
GameRegistry.registerItem(MekanismToolsItems.OsmiumPickaxe, "OsmiumPickaxe");
GameRegistry.registerItem(MekanismToolsItems.OsmiumAxe, "OsmiumAxe");
GameRegistry.registerItem(MekanismToolsItems.OsmiumShovel, "OsmiumShovel");
GameRegistry.registerItem(MekanismToolsItems.OsmiumHoe, "OsmiumHoe");
GameRegistry.registerItem(MekanismToolsItems.OsmiumSword, "OsmiumSword");
//Redstone
GameRegistry.registerItem(MekanismToolsItems.BronzeHelmet, "BronzeHelmet");
GameRegistry.registerItem(MekanismToolsItems.BronzeChestplate, "BronzeChestplate");
GameRegistry.registerItem(MekanismToolsItems.BronzeLeggings, "BronzeLeggings");
GameRegistry.registerItem(MekanismToolsItems.BronzeBoots, "BronzeBoots");
GameRegistry.registerItem(MekanismToolsItems.BronzePaxel, "BronzePaxel");
GameRegistry.registerItem(MekanismToolsItems.BronzePickaxe, "BronzePickaxe");
GameRegistry.registerItem(MekanismToolsItems.BronzeAxe, "BronzeAxe");
GameRegistry.registerItem(MekanismToolsItems.BronzeShovel, "BronzeShovel");
GameRegistry.registerItem(MekanismToolsItems.BronzeHoe, "BronzeHoe");
GameRegistry.registerItem(MekanismToolsItems.BronzeSword, "BronzeSword");
//Glowstone
GameRegistry.registerItem(MekanismToolsItems.GlowstonePaxel, "GlowstonePaxel");
GameRegistry.registerItem(MekanismToolsItems.GlowstonePickaxe, "GlowstonePickaxe");
GameRegistry.registerItem(MekanismToolsItems.GlowstoneAxe, "GlowstoneAxe");
GameRegistry.registerItem(MekanismToolsItems.GlowstoneShovel, "GlowstoneShovel");
GameRegistry.registerItem(MekanismToolsItems.GlowstoneHoe, "GlowstoneHoe");
GameRegistry.registerItem(MekanismToolsItems.GlowstoneSword, "GlowstoneSword");
GameRegistry.registerItem(MekanismToolsItems.GlowstoneHelmet, "GlowstoneHelmet");
GameRegistry.registerItem(MekanismToolsItems.GlowstoneChestplate, "GlowstoneChestplate");
GameRegistry.registerItem(MekanismToolsItems.GlowstoneLeggings, "GlowstoneLeggings");
GameRegistry.registerItem(MekanismToolsItems.GlowstoneBoots, "GlowstoneBoots");
//Steel
GameRegistry.registerItem(MekanismToolsItems.SteelPaxel, "SteelPaxel");
GameRegistry.registerItem(MekanismToolsItems.SteelPickaxe, "SteelPickaxe");
GameRegistry.registerItem(MekanismToolsItems.SteelAxe, "SteelAxe");
GameRegistry.registerItem(MekanismToolsItems.SteelShovel, "SteelShovel");
GameRegistry.registerItem(MekanismToolsItems.SteelHoe, "SteelHoe");
GameRegistry.registerItem(MekanismToolsItems.SteelSword, "SteelSword");
GameRegistry.registerItem(MekanismToolsItems.SteelHelmet, "SteelHelmet");
GameRegistry.registerItem(MekanismToolsItems.SteelChestplate, "SteelChestplate");
GameRegistry.registerItem(MekanismToolsItems.SteelLeggings, "SteelLeggings");
GameRegistry.registerItem(MekanismToolsItems.SteelBoots, "SteelBoots");
ToolsItems.initializeItems();
ToolsItems.setHarvestLevels();
ToolsItems.register();
}
@SubscribeEvent
@ -557,43 +486,43 @@ public class MekanismTools implements IModule
if(armorType == 0)
{
if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(MekanismToolsItems.GlowstoneSword));
if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(MekanismToolsItems.GlowstoneHelmet));
if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(MekanismToolsItems.GlowstoneChestplate));
if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(MekanismToolsItems.GlowstoneLeggings));
if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(MekanismToolsItems.GlowstoneBoots));
if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(ToolsItems.GlowstoneSword));
if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(ToolsItems.GlowstoneHelmet));
if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(ToolsItems.GlowstoneChestplate));
if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(ToolsItems.GlowstoneLeggings));
if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(ToolsItems.GlowstoneBoots));
}
else if(armorType == 1)
{
if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(MekanismToolsItems.LazuliSword));
if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(MekanismToolsItems.LazuliHelmet));
if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(MekanismToolsItems.LazuliChestplate));
if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(MekanismToolsItems.LazuliLeggings));
if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(MekanismToolsItems.LazuliBoots));
if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(ToolsItems.LazuliSword));
if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(ToolsItems.LazuliHelmet));
if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(ToolsItems.LazuliChestplate));
if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(ToolsItems.LazuliLeggings));
if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(ToolsItems.LazuliBoots));
}
else if(armorType == 2)
{
if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(MekanismToolsItems.OsmiumSword));
if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(MekanismToolsItems.OsmiumHelmet));
if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(MekanismToolsItems.OsmiumChestplate));
if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(MekanismToolsItems.OsmiumLeggings));
if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(MekanismToolsItems.OsmiumBoots));
if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(ToolsItems.OsmiumSword));
if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(ToolsItems.OsmiumHelmet));
if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(ToolsItems.OsmiumChestplate));
if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(ToolsItems.OsmiumLeggings));
if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(ToolsItems.OsmiumBoots));
}
else if(armorType == 3)
{
if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(MekanismToolsItems.SteelSword));
if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(MekanismToolsItems.SteelHelmet));
if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(MekanismToolsItems.SteelChestplate));
if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(MekanismToolsItems.SteelLeggings));
if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(MekanismToolsItems.SteelBoots));
if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(ToolsItems.SteelSword));
if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(ToolsItems.SteelHelmet));
if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(ToolsItems.SteelChestplate));
if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(ToolsItems.SteelLeggings));
if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(ToolsItems.SteelBoots));
}
else if(armorType == 4)
{
if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(MekanismToolsItems.BronzeSword));
if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(MekanismToolsItems.BronzeHelmet));
if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(MekanismToolsItems.BronzeChestplate));
if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(MekanismToolsItems.BronzeLeggings));
if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(MekanismToolsItems.BronzeBoots));
if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(ToolsItems.BronzeSword));
if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(ToolsItems.BronzeHelmet));
if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(ToolsItems.BronzeChestplate));
if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(ToolsItems.BronzeLeggings));
if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(ToolsItems.BronzeBoots));
}
}
}

85
src/main/java/mekanism/tools/common/MekanismToolsItems.java → src/main/java/mekanism/tools/common/ToolsItems.java
View file

@ -11,10 +11,11 @@ import mekanism.tools.item.ItemMekanismSword;
import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder("MekanismTools")
public class MekanismToolsItems
public class ToolsItems
{
//Vanilla Material Paxels
public static Item WoodPaxel;
@ -209,4 +210,86 @@ public class MekanismToolsItems
item.setHarvestLevel("axe", material.getHarvestLevel());
item.setHarvestLevel("shovel", material.getHarvestLevel());
}
public static void register()
{
//Base
GameRegistry.registerItem(WoodPaxel, "WoodPaxel");
GameRegistry.registerItem(StonePaxel, "StonePaxel");
GameRegistry.registerItem(IronPaxel, "IronPaxel");
GameRegistry.registerItem(DiamondPaxel, "DiamondPaxel");
GameRegistry.registerItem(GoldPaxel, "GoldPaxel");
//Obsidian
GameRegistry.registerItem(ObsidianHelmet, "ObsidianHelmet");
GameRegistry.registerItem(ObsidianChestplate, "ObsidianChestplate");
GameRegistry.registerItem(ObsidianLeggings, "ObsidianLeggings");
GameRegistry.registerItem(ObsidianBoots, "ObsidianBoots");
GameRegistry.registerItem(ObsidianPaxel, "ObsidianPaxel");
GameRegistry.registerItem(ObsidianPickaxe, "ObsidianPickaxe");
GameRegistry.registerItem(ObsidianAxe, "ObsidianAxe");
GameRegistry.registerItem(ObsidianShovel, "ObsidianShovel");
GameRegistry.registerItem(ObsidianHoe, "ObsidianHoe");
GameRegistry.registerItem(ObsidianSword, "ObsidianSword");
//Lazuli
GameRegistry.registerItem(LazuliHelmet, "LapisLazuliHelmet");
GameRegistry.registerItem(LazuliChestplate, "LapisLazuliChestplate");
GameRegistry.registerItem(LazuliLeggings, "LapisLazuliLeggings");
GameRegistry.registerItem(LazuliBoots, "LapisLazuliBoots");
GameRegistry.registerItem(LazuliPaxel, "LapisLazuliPaxel");
GameRegistry.registerItem(LazuliPickaxe, "LapisLazuliPickaxe");
GameRegistry.registerItem(LazuliAxe, "LapisLazuliAxe");
GameRegistry.registerItem(LazuliShovel, "LapisLazuliShovel");
GameRegistry.registerItem(LazuliHoe, "LapisLazuliHoe");
GameRegistry.registerItem(LazuliSword, "LapisLazuliSword");
//Osmium
GameRegistry.registerItem(OsmiumHelmet, "OsmiumHelmet");
GameRegistry.registerItem(OsmiumChestplate, "OsmiumChestplate");
GameRegistry.registerItem(OsmiumLeggings, "OsmiumLeggings");
GameRegistry.registerItem(OsmiumBoots, "OsmiumBoots");
GameRegistry.registerItem(OsmiumPaxel, "OsmiumPaxel");
GameRegistry.registerItem(OsmiumPickaxe, "OsmiumPickaxe");
GameRegistry.registerItem(OsmiumAxe, "OsmiumAxe");
GameRegistry.registerItem(OsmiumShovel, "OsmiumShovel");
GameRegistry.registerItem(OsmiumHoe, "OsmiumHoe");
GameRegistry.registerItem(OsmiumSword, "OsmiumSword");
//Bronze
GameRegistry.registerItem(BronzeHelmet, "BronzeHelmet");
GameRegistry.registerItem(BronzeChestplate, "BronzeChestplate");
GameRegistry.registerItem(BronzeLeggings, "BronzeLeggings");
GameRegistry.registerItem(BronzeBoots, "BronzeBoots");
GameRegistry.registerItem(BronzePaxel, "BronzePaxel");
GameRegistry.registerItem(BronzePickaxe, "BronzePickaxe");
GameRegistry.registerItem(BronzeAxe, "BronzeAxe");
GameRegistry.registerItem(BronzeShovel, "BronzeShovel");
GameRegistry.registerItem(BronzeHoe, "BronzeHoe");
GameRegistry.registerItem(BronzeSword, "BronzeSword");
//Glowstone
GameRegistry.registerItem(GlowstonePaxel, "GlowstonePaxel");
GameRegistry.registerItem(GlowstonePickaxe, "GlowstonePickaxe");
GameRegistry.registerItem(GlowstoneAxe, "GlowstoneAxe");
GameRegistry.registerItem(GlowstoneShovel, "GlowstoneShovel");
GameRegistry.registerItem(GlowstoneHoe, "GlowstoneHoe");
GameRegistry.registerItem(GlowstoneSword, "GlowstoneSword");
GameRegistry.registerItem(GlowstoneHelmet, "GlowstoneHelmet");
GameRegistry.registerItem(GlowstoneChestplate, "GlowstoneChestplate");
GameRegistry.registerItem(GlowstoneLeggings, "GlowstoneLeggings");
GameRegistry.registerItem(GlowstoneBoots, "GlowstoneBoots");
//Steel
GameRegistry.registerItem(SteelPaxel, "SteelPaxel");
GameRegistry.registerItem(SteelPickaxe, "SteelPickaxe");
GameRegistry.registerItem(SteelAxe, "SteelAxe");
GameRegistry.registerItem(SteelShovel, "SteelShovel");
GameRegistry.registerItem(SteelHoe, "SteelHoe");
GameRegistry.registerItem(SteelSword, "SteelSword");
GameRegistry.registerItem(SteelHelmet, "SteelHelmet");
GameRegistry.registerItem(SteelChestplate, "SteelChestplate");
GameRegistry.registerItem(SteelLeggings, "SteelLeggings");
GameRegistry.registerItem(SteelBoots, "SteelBoots");
}
}

6
src/main/java/mekanism/tools/item/ItemMekanismArmor.java
View file

@ -8,7 +8,7 @@ import mekanism.common.MekanismItems;
import mekanism.common.util.MekanismUtils;
import mekanism.api.util.StackUtils;
import mekanism.tools.common.MekanismTools;
import mekanism.tools.common.MekanismToolsItems;
import mekanism.tools.common.ToolsItems;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.renderer.texture.IIconRegister;
@ -88,8 +88,8 @@ public class ItemMekanismArmor extends ItemArmor
@SideOnly(Side.CLIENT)
public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
{
if(itemStack.getItem() == MekanismToolsItems.GlowstoneHelmet || itemStack.getItem() == MekanismToolsItems.GlowstoneChestplate ||
itemStack.getItem() == MekanismToolsItems.GlowstoneLeggings || itemStack.getItem() == MekanismToolsItems.GlowstoneBoots)
if(itemStack.getItem() == ToolsItems.GlowstoneHelmet || itemStack.getItem() == ToolsItems.GlowstoneChestplate ||
itemStack.getItem() == ToolsItems.GlowstoneLeggings || itemStack.getItem() == ToolsItems.GlowstoneBoots)
{
return ModelCustomArmor.getGlow(armorSlot);
}

BIN
src/main/resources/assets/mekanism/gui/GuiTall.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
src/main/resources/assets/mekanism/gui/elements/GuiStatsTab.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

10
src/main/resources/assets/mekanism/lang/en_US.lang
View file

@ -681,6 +681,16 @@ gui.solarGenerator.sun=Sun
gui.bioGenerator.bioFuel=BioFuel
gui.electrolyticSeparator.dump=Dump
gui.passive=Passive
gui.active=Active
gui.minInject=Min. Inject Rate
gui.ignition=Ignition Temp
gui.maxPlasma=Max. Plasma Temp
gui.maxCasing=Max. Casing Temp
gui.passiveGeneration=Passive Generation
gui.steamProduction=Steam Production
//*****//
//TOOLS//
//*****//