Auto formatted, and cleaned imports

This commit is contained in:
Modmuss50 2015-04-15 16:23:12 +01:00
parent c001231216
commit 8e7d6b011e
64 changed files with 2268 additions and 2587 deletions

View file

@ -1,7 +1,10 @@
package techreborn; package techreborn;
import java.io.File; import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import techreborn.client.GuiHandler; import techreborn.client.GuiHandler;
import techreborn.compat.CompatManager; import techreborn.compat.CompatManager;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
@ -12,11 +15,8 @@ import techreborn.lib.ModInfo;
import techreborn.packets.PacketHandler; import techreborn.packets.PacketHandler;
import techreborn.util.LogHelper; import techreborn.util.LogHelper;
import techreborn.world.TROreGen; import techreborn.world.TROreGen;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.event.FMLInitializationEvent; import java.io.File;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS) @Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS)
public class Core { public class Core {

View file

@ -12,8 +12,7 @@ public class RollingMachineRecipie {
public RollingMachineRecipie(ItemStack inputItem1, ItemStack inputItem2, ItemStack inputItem3, ItemStack inputItem4, public RollingMachineRecipie(ItemStack inputItem1, ItemStack inputItem2, ItemStack inputItem3, ItemStack inputItem4,
ItemStack inputItem5, ItemStack inputItem6, ItemStack inputItem7, ItemStack inputItem8, ItemStack inputItem9, ItemStack inputItem5, ItemStack inputItem6, ItemStack inputItem7, ItemStack inputItem8, ItemStack inputItem9,
ItemStack output1, int tickTime) ItemStack output1, int tickTime) {
{
this.inputItem1 = inputItem1; this.inputItem1 = inputItem1;
this.inputItem2 = inputItem2; this.inputItem2 = inputItem2;
this.inputItem3 = inputItem3; this.inputItem3 = inputItem3;
@ -55,8 +54,7 @@ public class RollingMachineRecipie {
; ;
} }
public RollingMachineRecipie(RollingMachineRecipie rollingmachineRecipie) public RollingMachineRecipie(RollingMachineRecipie rollingmachineRecipie) {
{
this.inputItem1 = rollingmachineRecipie.getInputItem1(); this.inputItem1 = rollingmachineRecipie.getInputItem1();
this.inputItem2 = rollingmachineRecipie.getInputItem2(); this.inputItem2 = rollingmachineRecipie.getInputItem2();
this.inputItem3 = rollingmachineRecipie.getInputItem3(); this.inputItem3 = rollingmachineRecipie.getInputItem3();
@ -71,50 +69,47 @@ public class RollingMachineRecipie {
this.tickTime = rollingmachineRecipie.getTickTime(); this.tickTime = rollingmachineRecipie.getTickTime();
} }
public ItemStack getInputItem1() public ItemStack getInputItem1() {
{
return inputItem1; return inputItem1;
} }
public ItemStack getInputItem2()
{ public ItemStack getInputItem2() {
return inputItem2; return inputItem2;
} }
public ItemStack getInputItem3()
{ public ItemStack getInputItem3() {
return inputItem3; return inputItem3;
} }
public ItemStack getInputItem4()
{ public ItemStack getInputItem4() {
return inputItem4; return inputItem4;
} }
public ItemStack getInputItem5()
{ public ItemStack getInputItem5() {
return inputItem5; return inputItem5;
} }
public ItemStack getInputItem6()
{ public ItemStack getInputItem6() {
return inputItem6; return inputItem6;
} }
public ItemStack getInputItem7()
{ public ItemStack getInputItem7() {
return inputItem7; return inputItem7;
} }
public ItemStack getInputItem8()
{ public ItemStack getInputItem8() {
return inputItem8; return inputItem8;
} }
public ItemStack getInputItem9()
{ public ItemStack getInputItem9() {
return inputItem9; return inputItem9;
} }
public ItemStack getOutput1() public ItemStack getOutput1() {
{
return output1; return output1;
} }
public int getTickTime() public int getTickTime() {
{
return tickTime; return tickTime;
} }

View file

@ -1,9 +1,9 @@
package techreborn.api; package techreborn.api;
import java.util.ArrayList;
import techreborn.util.ItemUtils; import techreborn.util.ItemUtils;
import java.util.ArrayList;
public final class TechRebornAPI { public final class TechRebornAPI {
public static ArrayList<CentrifugeRecipie> centrifugeRecipies = new ArrayList<CentrifugeRecipie>(); public static ArrayList<CentrifugeRecipie> centrifugeRecipies = new ArrayList<CentrifugeRecipie>();
@ -44,10 +44,8 @@ public final class TechRebornAPI {
} }
class RegisteredItemRecipe extends Exception class RegisteredItemRecipe extends Exception {
{ public RegisteredItemRecipe(String message) {
public RegisteredItemRecipe(String message)
{
super(message); super(message);
} }
} }

View file

@ -1,5 +1,3 @@
@API(apiVersion = "@MODVERSION@", owner = "techreborn", provides = "techrebornAPI") package techreborn.api;
@API(apiVersion = "@MODVERSION@", owner = "techreborn", provides = "techrebornAPI")
package techreborn.api;
import cpw.mods.fml.common.API; import cpw.mods.fml.common.API;

View file

@ -1,8 +1,7 @@
package techreborn.blocks; package techreborn.blocks;
import java.util.List; import cpw.mods.fml.relauncher.Side;
import java.util.Random; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -13,9 +12,9 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModItems;
import cpw.mods.fml.relauncher.Side; import java.util.List;
import cpw.mods.fml.relauncher.SideOnly; import java.util.Random;
public class BlockOre extends Block { public class BlockOre extends Block {
@ -27,8 +26,7 @@ public class BlockOre extends Block{
private IIcon[] textures; private IIcon[] textures;
public BlockOre(Material material) public BlockOre(Material material) {
{
super(material); super(material);
setBlockName("techreborn.ore"); setBlockName("techreborn.ore");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -36,49 +34,41 @@ public class BlockOre extends Block{
} }
@Override @Override
public Item getItemDropped(int meta, Random random, int fortune) public Item getItemDropped(int meta, Random random, int fortune) {
{
return Item.getItemFromBlock(this); return Item.getItemFromBlock(this);
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) {
{ for (int meta = 0; meta < types.length; meta++) {
for (int meta = 0; meta < types.length; meta++)
{
list.add(new ItemStack(item, 1, meta)); list.add(new ItemStack(item, 1, meta));
} }
} }
@Override @Override
public int damageDropped(int metaData) public int damageDropped(int metaData) {
{
//TODO RubyOre Returns Rubys //TODO RubyOre Returns Rubys
return metaData; return metaData;
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) public void registerBlockIcons(IIconRegister iconRegister) {
{
this.textures = new IIcon[types.length]; this.textures = new IIcon[types.length];
for (int i = 0; i < types.length; i++) for (int i = 0; i < types.length; i++) {
{
textures[i] = iconRegister.registerIcon("techreborn:" + "ore/ore" + types[i]); textures[i] = iconRegister.registerIcon("techreborn:" + "ore/ore" + types[i]);
} }
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int metaData) public IIcon getIcon(int side, int metaData) {
{
metaData = MathHelper.clamp_int(metaData, 0, types.length - 1); metaData = MathHelper.clamp_int(metaData, 0, types.length - 1);
if (ForgeDirection.getOrientation(side) == ForgeDirection.UP if (ForgeDirection.getOrientation(side) == ForgeDirection.UP
|| ForgeDirection.getOrientation(side) == ForgeDirection.DOWN) || ForgeDirection.getOrientation(side) == ForgeDirection.DOWN) {
{
return textures[metaData]; return textures[metaData];
} else { } else {
return textures[metaData]; return textures[metaData];

View file

@ -1,5 +1,7 @@
package techreborn.blocks; package techreborn.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -10,8 +12,6 @@ import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.client.GuiHandler; import techreborn.client.GuiHandler;
import techreborn.tiles.TileQuantumChest; import techreborn.tiles.TileQuantumChest;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockQuantumChest extends BlockContainer { public class BlockQuantumChest extends BlockContainer {

View file

@ -1,5 +1,7 @@
package techreborn.blocks; package techreborn.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -10,8 +12,6 @@ import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.client.GuiHandler; import techreborn.client.GuiHandler;
import techreborn.tiles.TileQuantumTank; import techreborn.tiles.TileQuantumTank;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockQuantumTank extends BlockContainer { public class BlockQuantumTank extends BlockContainer {

View file

@ -2,11 +2,6 @@ package techreborn.blocks;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileRollingMachine;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -14,6 +9,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileRollingMachine;
public class BlockRollingMachine extends BlockContainer { public class BlockRollingMachine extends BlockContainer {
@ -22,8 +21,7 @@ public class BlockRollingMachine extends BlockContainer{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private IIcon other; private IIcon other;
public BlockRollingMachine(Material material) public BlockRollingMachine(Material material) {
{
super(material.piston); super(material.piston);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setBlockName("techreborn.rollingmachine"); setBlockName("techreborn.rollingmachine");
@ -31,8 +29,7 @@ public class BlockRollingMachine extends BlockContainer{
} }
@Override @Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
{
return new TileRollingMachine(); return new TileRollingMachine();
} }
@ -45,16 +42,14 @@ public class BlockRollingMachine extends BlockContainer{
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister icon) public void registerBlockIcons(IIconRegister icon) {
{
top = icon.registerIcon("techreborn:machine/rollingmachine_top"); top = icon.registerIcon("techreborn:machine/rollingmachine_top");
other = icon.registerIcon("techreborn:machine/rollingmachine_side"); other = icon.registerIcon("techreborn:machine/rollingmachine_side");
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public IIcon getIcon(int currentSide, int meta) public IIcon getIcon(int currentSide, int meta) {
{
if (currentSide == 1) { if (currentSide == 1) {
return top; return top;
} else { } else {

View file

@ -1,8 +1,7 @@
package techreborn.blocks; package techreborn.blocks;
import java.util.List; import cpw.mods.fml.relauncher.Side;
import java.util.Random; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -13,8 +12,9 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import java.util.List;
import java.util.Random;
public class BlockStorage extends Block { public class BlockStorage extends Block {
@ -26,8 +26,7 @@ public class BlockStorage extends Block{
private IIcon[] textures; private IIcon[] textures;
public BlockStorage(Material material) public BlockStorage(Material material) {
{
super(material); super(material);
setBlockName("techreborn.storage"); setBlockName("techreborn.storage");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -35,48 +34,40 @@ public class BlockStorage extends Block{
} }
@Override @Override
public Item getItemDropped(int par1, Random random, int par2) public Item getItemDropped(int par1, Random random, int par2) {
{
return Item.getItemFromBlock(this); return Item.getItemFromBlock(this);
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) {
{ for (int meta = 0; meta < types.length; meta++) {
for (int meta = 0; meta < types.length; meta++)
{
list.add(new ItemStack(item, 1, meta)); list.add(new ItemStack(item, 1, meta));
} }
} }
@Override @Override
public int damageDropped(int metaData) public int damageDropped(int metaData) {
{
return metaData; return metaData;
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) public void registerBlockIcons(IIconRegister iconRegister) {
{
this.textures = new IIcon[types.length]; this.textures = new IIcon[types.length];
for (int i = 0; i < types.length; i++) for (int i = 0; i < types.length; i++) {
{
textures[i] = iconRegister.registerIcon("techreborn:" + "storage/storage" + types[i]); textures[i] = iconRegister.registerIcon("techreborn:" + "storage/storage" + types[i]);
} }
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int metaData) public IIcon getIcon(int side, int metaData) {
{
metaData = MathHelper.clamp_int(metaData, 0, types.length - 1); metaData = MathHelper.clamp_int(metaData, 0, types.length - 1);
if (ForgeDirection.getOrientation(side) == ForgeDirection.UP if (ForgeDirection.getOrientation(side) == ForgeDirection.UP
|| ForgeDirection.getOrientation(side) == ForgeDirection.DOWN) || ForgeDirection.getOrientation(side) == ForgeDirection.DOWN) {
{
return textures[metaData]; return textures[metaData];
} else { } else {
return textures[metaData]; return textures[metaData];

View file

@ -1,7 +1,7 @@
package techreborn.blocks; package techreborn.blocks;
import java.util.Random; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -14,8 +14,8 @@ import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.client.GuiHandler; import techreborn.client.GuiHandler;
import techreborn.tiles.TileThermalGenerator; import techreborn.tiles.TileThermalGenerator;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import java.util.Random;
public class BlockThermalGenerator extends BlockContainer { public class BlockThermalGenerator extends BlockContainer {

View file

@ -1,24 +1,12 @@
package techreborn.client; package techreborn.client;
import cpw.mods.fml.common.network.IGuiHandler;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.client.container.ContainerCentrifuge; import techreborn.client.container.*;
import techreborn.client.container.ContainerQuantumChest; import techreborn.client.gui.*;
import techreborn.client.container.ContainerQuantumTank; import techreborn.tiles.*;
import techreborn.client.container.ContainerRollingMachine;
import techreborn.client.container.ContainerThermalGenerator;
import techreborn.client.gui.GuiCentrifuge;
import techreborn.client.gui.GuiQuantumChest;
import techreborn.client.gui.GuiQuantumTank;
import techreborn.client.gui.GuiRollingMachine;
import techreborn.client.gui.GuiThermalGenerator;
import techreborn.tiles.TileCentrifuge;
import techreborn.tiles.TileQuantumChest;
import techreborn.tiles.TileQuantumTank;
import techreborn.tiles.TileRollingMachine;
import techreborn.tiles.TileThermalGenerator;
import cpw.mods.fml.common.network.IGuiHandler;
public class GuiHandler implements IGuiHandler { public class GuiHandler implements IGuiHandler {

View file

@ -21,16 +21,13 @@ public class ContainerQuantumTank extends TechRebornContainer {
int i; int i;
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i) {
{ for (int j = 0; j < 9; ++j) {
for (int j = 0; j < 9; ++j)
{
this.addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); this.addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
} }
} }
for (i = 0; i < 9; ++i) for (i = 0; i < 9; ++i) {
{
this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142)); this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142));
} }
} }

View file

@ -1,10 +1,9 @@
package techreborn.client.container; package techreborn.client.container;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileCentrifuge;
import techreborn.tiles.TileRollingMachine;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileRollingMachine;
public class ContainerRollingMachine extends TechRebornContainer { public class ContainerRollingMachine extends TechRebornContainer {

View file

@ -21,16 +21,13 @@ public class ContainerThermalGenerator extends TechRebornContainer {
int i; int i;
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i) {
{ for (int j = 0; j < 9; ++j) {
for (int j = 0; j < 9; ++j)
{
this.addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); this.addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
} }
} }
for (i = 0; i < 9; ++i) for (i = 0; i < 9; ++i) {
{
this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142)); this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142));
} }
} }

View file

@ -28,8 +28,7 @@ public class GuiCentrifuge extends GuiContainer {
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
} }
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
{
this.fontRendererObj.drawString("Centrifuge", 110, 6, 4210752); this.fontRendererObj.drawString("Centrifuge", 110, 6, 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString(centrifuge.tickTime + " " + centrifuge.isRunning, 110, this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString(centrifuge.tickTime + " " + centrifuge.isRunning, 110, this.ySize - 96 + 2, 4210752);

View file

@ -29,8 +29,7 @@ public class GuiQuantumChest extends GuiContainer {
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
} }
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
{
this.fontRendererObj.drawString("Quantum Chest", 8, 6, 4210752); this.fontRendererObj.drawString("Quantum Chest", 8, 6, 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString("Amount", 10, 20, 16448255); this.fontRendererObj.drawString("Amount", 10, 20, 16448255);

View file

@ -28,8 +28,7 @@ public class GuiQuantumTank extends GuiContainer {
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
} }
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
{
this.fontRendererObj.drawString("Quantum Tank", 8, 6, 4210752); this.fontRendererObj.drawString("Quantum Tank", 8, 6, 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255);

View file

@ -1,20 +1,17 @@
package techreborn.client.gui; package techreborn.client.gui;
import techreborn.client.container.ContainerCentrifuge;
import techreborn.client.container.ContainerRollingMachine;
import techreborn.tiles.TileCentrifuge;
import techreborn.tiles.TileRollingMachine;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import techreborn.client.container.ContainerRollingMachine;
import techreborn.tiles.TileRollingMachine;
public class GuiRollingMachine extends GuiContainer { public class GuiRollingMachine extends GuiContainer {
private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/rollingmachine.png"); private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/rollingmachine.png");
TileRollingMachine rollingMachine; TileRollingMachine rollingMachine;
public GuiRollingMachine(EntityPlayer player, TileRollingMachine tileRollingmachine) public GuiRollingMachine(EntityPlayer player, TileRollingMachine tileRollingmachine) {
{
super(new ContainerRollingMachine(tileRollingmachine, player)); super(new ContainerRollingMachine(tileRollingmachine, player));
this.xSize = 176; this.xSize = 176;
this.ySize = 167; this.ySize = 167;
@ -22,8 +19,7 @@ public class GuiRollingMachine extends GuiContainer{
} }
@Override @Override
protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
{
this.mc.getTextureManager().bindTexture(texture); this.mc.getTextureManager().bindTexture(texture);
int k = (this.width - this.xSize) / 2; int k = (this.width - this.xSize) / 2;
int l = (this.height - this.ySize) / 2; int l = (this.height - this.ySize) / 2;

View file

@ -28,8 +28,7 @@ public class GuiThermalGenerator extends GuiContainer {
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
} }
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
{
this.fontRendererObj.drawString("Thermal Generator", 8, 6, 4210752); this.fontRendererObj.drawString("Thermal Generator", 8, 6, 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255);

View file

@ -1,8 +1,8 @@
package techreborn.compat; package techreborn.compat;
import techreborn.compat.waila.CompatModuleWaila;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInitializationEvent;
import techreborn.compat.waila.CompatModuleWaila;
public class CompatManager { public class CompatManager {

View file

@ -1,26 +1,23 @@
package techreborn.compat.nei; package techreborn.compat.nei;
import techreborn.lib.ModInfo;
import codechicken.nei.api.API; import codechicken.nei.api.API;
import codechicken.nei.api.IConfigureNEI; import codechicken.nei.api.IConfigureNEI;
import techreborn.lib.ModInfo;
public class NEIConfig implements IConfigureNEI { public class NEIConfig implements IConfigureNEI {
@Override @Override
public String getName() public String getName() {
{
return ModInfo.MOD_ID; return ModInfo.MOD_ID;
} }
@Override @Override
public String getVersion() public String getVersion() {
{
return ModInfo.MOD_VERSION; return ModInfo.MOD_VERSION;
} }
@Override @Override
public void loadConfig() public void loadConfig() {
{
CentrifugeRecipeHandler centrifugeRecipeHandler = new CentrifugeRecipeHandler(); CentrifugeRecipeHandler centrifugeRecipeHandler = new CentrifugeRecipeHandler();
API.registerRecipeHandler(centrifugeRecipeHandler); API.registerRecipeHandler(centrifugeRecipeHandler);

View file

@ -1,9 +1,9 @@
package techreborn.compat.waila; package techreborn.compat.waila;
import mcp.mobius.waila.api.IWailaRegistrar;
import techreborn.tiles.TileMachineBase;
import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms;
import mcp.mobius.waila.api.IWailaRegistrar;
import techreborn.tiles.TileMachineBase;
public class CompatModuleWaila { public class CompatModuleWaila {

View file

@ -1,8 +1,5 @@
package techreborn.compat.waila; package techreborn.compat.waila;
import java.util.ArrayList;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaDataProvider;
@ -13,6 +10,9 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.tiles.TileMachineBase; import techreborn.tiles.TileMachineBase;
import java.util.ArrayList;
import java.util.List;
public class WailaProviderMachines implements IWailaDataProvider { public class WailaProviderMachines implements IWailaDataProvider {
private List<String> info = new ArrayList<String>(); private List<String> info = new ArrayList<String>();

View file

@ -1,9 +1,9 @@
package techreborn.config; package techreborn.config;
import java.io.File;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import java.io.File;
public class ConfigTechReborn { public class ConfigTechReborn {
private static ConfigTechReborn instance = null; private static ConfigTechReborn instance = null;
public static String CATEGORY_WORLD = "world"; public static String CATEGORY_WORLD = "world";
@ -52,13 +52,9 @@ public class ConfigTechReborn {
public static boolean ExpensiveSolar; public static boolean ExpensiveSolar;
public static Configuration config; public static Configuration config;
private ConfigTechReborn(File configFile) private ConfigTechReborn(File configFile) {
{
config = new Configuration(configFile); config = new Configuration(configFile);
config.load(); config.load();
@ -68,8 +64,7 @@ public class ConfigTechReborn {
} }
public static ConfigTechReborn initialize(File configFile) public static ConfigTechReborn initialize(File configFile) {
{
if (instance == null) if (instance == null)
instance = new ConfigTechReborn(configFile); instance = new ConfigTechReborn(configFile);
@ -80,8 +75,7 @@ public class ConfigTechReborn {
return instance; return instance;
} }
public static ConfigTechReborn instance() public static ConfigTechReborn instance() {
{
if (instance == null) { if (instance == null) {
throw new IllegalStateException( throw new IllegalStateException(
@ -90,8 +84,7 @@ public class ConfigTechReborn {
return instance; return instance;
} }
public static void Configs() public static void Configs() {
{
GalenaOreTrue = config.get(CATEGORY_WORLD, GalenaOreTrue = config.get(CATEGORY_WORLD,
"Allow GalenaOre", true, "Allow GalenaOre", true,
"Allow GalenaOre to be generated in your world.") "Allow GalenaOre to be generated in your world.")

View file

@ -1,27 +1,25 @@
package techreborn.config; package techreborn.config;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.common.config.ConfigElement;
import net.minecraftforge.common.config.Configuration;
import cpw.mods.fml.client.config.DummyConfigElement; import cpw.mods.fml.client.config.DummyConfigElement;
import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.GuiConfig;
import cpw.mods.fml.client.config.GuiConfigEntries; import cpw.mods.fml.client.config.GuiConfigEntries;
import cpw.mods.fml.client.config.GuiConfigEntries.CategoryEntry; import cpw.mods.fml.client.config.GuiConfigEntries.CategoryEntry;
import cpw.mods.fml.client.config.IConfigElement; import cpw.mods.fml.client.config.IConfigElement;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.common.config.ConfigElement;
import net.minecraftforge.common.config.Configuration;
import java.util.ArrayList;
import java.util.List;
public class TechRebornConfigGui extends GuiConfig { public class TechRebornConfigGui extends GuiConfig {
public TechRebornConfigGui(GuiScreen top) public TechRebornConfigGui(GuiScreen top) {
{
super(top, getConfigCategories(), "TechReborn", false, false, super(top, getConfigCategories(), "TechReborn", false, false,
GuiConfig.getAbridgedConfigPath(ConfigTechReborn.config GuiConfig.getAbridgedConfigPath(ConfigTechReborn.config
.toString())); .toString()));
} }
private static List<IConfigElement> getConfigCategories() private static List<IConfigElement> getConfigCategories() {
{
List<IConfigElement> list = new ArrayList<IConfigElement>(); List<IConfigElement> list = new ArrayList<IConfigElement>();
list.add(new DummyConfigElement.DummyCategoryElement("General", list.add(new DummyConfigElement.DummyCategoryElement("General",
"tr.configgui.category.trGeneral", TRGeneral.class)); "tr.configgui.category.trGeneral", TRGeneral.class));
@ -37,14 +35,12 @@ public class TechRebornConfigGui extends GuiConfig{
public static class TRGeneral extends CategoryEntry { public static class TRGeneral extends CategoryEntry {
public TRGeneral(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) public TRGeneral(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) {
{
super(owningScreen, owningEntryList, configElement); super(owningScreen, owningEntryList, configElement);
} }
@Override @Override
protected GuiScreen buildChildScreen() protected GuiScreen buildChildScreen() {
{
return new GuiConfig(this.owningScreen, return new GuiConfig(this.owningScreen,
(new ConfigElement(ConfigTechReborn.config (new ConfigElement(ConfigTechReborn.config
.getCategory(Configuration.CATEGORY_GENERAL))) .getCategory(Configuration.CATEGORY_GENERAL)))
@ -58,14 +54,12 @@ public class TechRebornConfigGui extends GuiConfig{
// World // World
public static class TRWORLD extends CategoryEntry { public static class TRWORLD extends CategoryEntry {
public TRWORLD(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) public TRWORLD(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) {
{
super(owningScreen, owningEntryList, configElement); super(owningScreen, owningEntryList, configElement);
} }
@Override @Override
protected GuiScreen buildChildScreen() protected GuiScreen buildChildScreen() {
{
return new GuiConfig(this.owningScreen, return new GuiConfig(this.owningScreen,
(new ConfigElement(ConfigTechReborn.config (new ConfigElement(ConfigTechReborn.config
.getCategory(ConfigTechReborn.CATEGORY_WORLD))) .getCategory(ConfigTechReborn.CATEGORY_WORLD)))
@ -82,14 +76,12 @@ public class TechRebornConfigGui extends GuiConfig{
// Power // Power
public static class TRPOWER extends CategoryEntry { public static class TRPOWER extends CategoryEntry {
public TRPOWER(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) public TRPOWER(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) {
{
super(owningScreen, owningEntryList, configElement); super(owningScreen, owningEntryList, configElement);
} }
@Override @Override
protected GuiScreen buildChildScreen() protected GuiScreen buildChildScreen() {
{
return new GuiConfig(this.owningScreen, return new GuiConfig(this.owningScreen,
(new ConfigElement(ConfigTechReborn.config (new ConfigElement(ConfigTechReborn.config
.getCategory(ConfigTechReborn.CATEGORY_POWER))) .getCategory(ConfigTechReborn.CATEGORY_POWER)))
@ -106,14 +98,12 @@ public class TechRebornConfigGui extends GuiConfig{
// Crafting // Crafting
public static class TRCRAFTING extends CategoryEntry { public static class TRCRAFTING extends CategoryEntry {
public TRCRAFTING(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) public TRCRAFTING(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) {
{
super(owningScreen, owningEntryList, configElement); super(owningScreen, owningEntryList, configElement);
} }
@Override @Override
protected GuiScreen buildChildScreen() protected GuiScreen buildChildScreen() {
{
return new GuiConfig(this.owningScreen, return new GuiConfig(this.owningScreen,
(new ConfigElement(ConfigTechReborn.config (new ConfigElement(ConfigTechReborn.config
.getCategory(ConfigTechReborn.CATEGORY_CRAFTING))) .getCategory(ConfigTechReborn.CATEGORY_CRAFTING)))

View file

@ -1,34 +1,30 @@
package techreborn.config; package techreborn.config;
import cpw.mods.fml.client.IModGuiFactory;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import java.util.Set; import java.util.Set;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import cpw.mods.fml.client.IModGuiFactory;
public class TechRebornGUIFactory implements IModGuiFactory { public class TechRebornGUIFactory implements IModGuiFactory {
@Override @Override
public void initialize(Minecraft minecraftInstance) public void initialize(Minecraft minecraftInstance) {
{
} }
@Override @Override
public Class<? extends GuiScreen> mainConfigGuiClass() public Class<? extends GuiScreen> mainConfigGuiClass() {
{
return TechRebornConfigGui.class; return TechRebornConfigGui.class;
} }
@Override @Override
public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
{
return null; return null;
} }
@Override @Override
public RuntimeOptionGuiHandler getHandlerFor( public RuntimeOptionGuiHandler getHandlerFor(
RuntimeOptionCategoryElement element) RuntimeOptionCategoryElement element) {
{
return null; return null;
} }

View file

@ -1,5 +1,6 @@
package techreborn.init; package techreborn.init;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -10,13 +11,8 @@ import techreborn.itemblocks.ItemBlockOre;
import techreborn.itemblocks.ItemBlockQuantumChest; import techreborn.itemblocks.ItemBlockQuantumChest;
import techreborn.itemblocks.ItemBlockQuantumTank; import techreborn.itemblocks.ItemBlockQuantumTank;
import techreborn.itemblocks.ItemBlockStorage; import techreborn.itemblocks.ItemBlockStorage;
import techreborn.tiles.TileCentrifuge; import techreborn.tiles.*;
import techreborn.tiles.TileQuantumChest;
import techreborn.tiles.TileQuantumTank;
import techreborn.tiles.TileRollingMachine;
import techreborn.tiles.TileThermalGenerator;
import techreborn.util.LogHelper; import techreborn.util.LogHelper;
import cpw.mods.fml.common.registry.GameRegistry;
public class ModBlocks { public class ModBlocks {
@ -29,8 +25,7 @@ public class ModBlocks {
public static Block ore; public static Block ore;
public static Block storage; public static Block storage;
public static void init() public static void init() {
{
thermalGenerator = new BlockThermalGenerator().setBlockName("techreborn.thermalGenerator").setBlockTextureName("techreborn:ThermalGenerator_other").setCreativeTab(TechRebornCreativeTab.instance); thermalGenerator = new BlockThermalGenerator().setBlockName("techreborn.thermalGenerator").setBlockTextureName("techreborn:ThermalGenerator_other").setCreativeTab(TechRebornCreativeTab.instance);
GameRegistry.registerBlock(thermalGenerator, "techreborn.thermalGenerator"); GameRegistry.registerBlock(thermalGenerator, "techreborn.thermalGenerator");
GameRegistry.registerTileEntity(TileThermalGenerator.class, "TileThermalGenerator"); GameRegistry.registerTileEntity(TileThermalGenerator.class, "TileThermalGenerator");
@ -63,8 +58,7 @@ public class ModBlocks {
registerOreDict(); registerOreDict();
} }
public static void registerOreDict() public static void registerOreDict() {
{
OreDictionary.registerOre("oreGalena", new ItemStack(ore, 1, 0)); OreDictionary.registerOre("oreGalena", new ItemStack(ore, 1, 0));
OreDictionary.registerOre("oreIridium", new ItemStack(ore, 1, 1)); OreDictionary.registerOre("oreIridium", new ItemStack(ore, 1, 1));
OreDictionary.registerOre("oreRuby", new ItemStack(ore, 1, 2)); OreDictionary.registerOre("oreRuby", new ItemStack(ore, 1, 2));

View file

@ -1,11 +1,10 @@
package techreborn.init; package techreborn.init;
import org.apache.logging.log4j.message.MapMessage.MapFormat; import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import techreborn.items.ItemDusts; import techreborn.items.ItemDusts;
import techreborn.items.ItemGems; import techreborn.items.ItemGems;
@ -18,7 +17,6 @@ import techreborn.items.tools.ItemAdvancedDrill;
import techreborn.items.tools.ItemOmniTool; import techreborn.items.tools.ItemOmniTool;
import techreborn.items.tools.ItemRockCutter; import techreborn.items.tools.ItemRockCutter;
import techreborn.util.LogHelper; import techreborn.util.LogHelper;
import cpw.mods.fml.common.registry.GameRegistry;
public class ModItems { public class ModItems {
@ -33,8 +31,7 @@ public class ModItems {
public static Item omniTool; public static Item omniTool;
public static Item advancedDrill; public static Item advancedDrill;
public static void init() public static void init() {
{
dusts = new ItemDusts(); dusts = new ItemDusts();
GameRegistry.registerItem(dusts, "dust"); GameRegistry.registerItem(dusts, "dust");
ingots = new ItemIngots(); ingots = new ItemIngots();
@ -61,8 +58,7 @@ public class ModItems {
registerOreDict(); registerOreDict();
} }
public static void registerOreDict() public static void registerOreDict() {
{
//Dusts //Dusts
OreDictionary.registerOre("dustAlmandine", new ItemStack(dusts, 1, 0)); OreDictionary.registerOre("dustAlmandine", new ItemStack(dusts, 1, 0));
OreDictionary.registerOre("dustAluminium", new ItemStack(dusts, 1, 1)); OreDictionary.registerOre("dustAluminium", new ItemStack(dusts, 1, 1));

View file

@ -16,8 +16,7 @@ import techreborn.util.RecipeRemover;
public class ModRecipes { public class ModRecipes {
public static ConfigTechReborn config; public static ConfigTechReborn config;
public static void init() public static void init() {
{
removeIc2Recipes(); removeIc2Recipes();
addShaplessRecipes(); addShaplessRecipes();
addShappedRecipes(); addShappedRecipes();
@ -25,8 +24,7 @@ public class ModRecipes {
addMachineRecipes(); addMachineRecipes();
} }
public static void removeIc2Recipes() public static void removeIc2Recipes() {
{
if (config.ExpensiveMacerator) ; if (config.ExpensiveMacerator) ;
RecipeRemover.removeAnyRecipe(IC2Items.getItem("macerator")); RecipeRemover.removeAnyRecipe(IC2Items.getItem("macerator"));
if (config.ExpensiveDrill) ; if (config.ExpensiveDrill) ;
@ -39,8 +37,7 @@ public class ModRecipes {
LogHelper.info("IC2 Recipes Removed"); LogHelper.info("IC2 Recipes Removed");
} }
public static void addShappedRecipes() public static void addShappedRecipes() {
{
//IC2 Recipes //IC2 Recipes
if (config.ExpensiveMacerator) ; if (config.ExpensiveMacerator) ;
@ -202,8 +199,7 @@ public class ModRecipes {
LogHelper.info("Shapped Recipes Added"); LogHelper.info("Shapped Recipes Added");
} }
public static void addShaplessRecipes() public static void addShaplessRecipes() {
{
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 4), "blockSilver"); CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 4), "blockSilver");
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 5), "blockAluminium"); CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 5), "blockAluminium");
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 6), "blockTitanium"); CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 6), "blockTitanium");
@ -226,8 +222,7 @@ public class ModRecipes {
LogHelper.info("Shapless Recipes Added"); LogHelper.info("Shapless Recipes Added");
} }
public static void addSmeltingRecipes() public static void addSmeltingRecipes() {
{
GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 27), new ItemStack(Items.iron_ingot), 1F); GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 27), new ItemStack(Items.iron_ingot), 1F);
GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 23), new ItemStack(Items.gold_ingot), 1F); GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 23), new ItemStack(Items.gold_ingot), 1F);
GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 14), IC2Items.getItem("copperIngot"), 1F); GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 14), IC2Items.getItem("copperIngot"), 1F);
@ -239,8 +234,7 @@ public class ModRecipes {
LogHelper.info("Smelting Recipes Added"); LogHelper.info("Smelting Recipes Added");
} }
public static void addMachineRecipes() public static void addMachineRecipes() {
{
TechRebornAPI.registerCentrifugeRecipe(new CentrifugeRecipie(Items.apple, 4, Items.beef, Items.baked_potato, null, null, 120, 4)); TechRebornAPI.registerCentrifugeRecipe(new CentrifugeRecipie(Items.apple, 4, Items.beef, Items.baked_potato, null, null, 120, 4));
TechRebornAPI.registerCentrifugeRecipe(new CentrifugeRecipie(Items.nether_star, 1, Items.diamond, Items.emerald, Items.bed, Items.cake, 500, 8)); TechRebornAPI.registerCentrifugeRecipe(new CentrifugeRecipie(Items.nether_star, 1, Items.diamond, Items.emerald, Items.bed, Items.cake, 500, 8));
TechRebornAPI.registerRollingMachineRecipe(new RollingMachineRecipie(new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.furnace), 4)); TechRebornAPI.registerRollingMachineRecipe(new RollingMachineRecipie(new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.furnace), 4));

View file

@ -7,8 +7,7 @@ import techreborn.init.ModBlocks;
public class ItemBlockOre extends ItemMultiTexture { public class ItemBlockOre extends ItemMultiTexture {
public ItemBlockOre(Block block) public ItemBlockOre(Block block) {
{
super(ModBlocks.ore, ModBlocks.ore, BlockOre.types); super(ModBlocks.ore, ModBlocks.ore, BlockOre.types);
} }

View file

@ -1,7 +1,7 @@
package techreborn.itemblocks; package techreborn.itemblocks;
import java.util.List; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.tiles.TileQuantumChest; import techreborn.tiles.TileQuantumChest;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import java.util.List;
public class ItemBlockQuantumChest extends ItemBlock { public class ItemBlockQuantumChest extends ItemBlock {
@ -31,8 +31,7 @@ public class ItemBlockQuantumChest extends ItemBlock {
@Override @Override
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) {
{
if (!world.setBlock(x, y, z, ModBlocks.quantumChest, metadata, 3)) { if (!world.setBlock(x, y, z, ModBlocks.quantumChest, metadata, 3)) {
return false; return false;
} }

View file

@ -15,8 +15,7 @@ public class ItemBlockQuantumTank extends ItemBlock {
} }
@Override @Override
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) {
{
if (!world.setBlock(x, y, z, ModBlocks.quantumTank, metadata, 3)) { if (!world.setBlock(x, y, z, ModBlocks.quantumTank, metadata, 3)) {
return false; return false;
} }

View file

@ -2,14 +2,12 @@ package techreborn.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemMultiTexture; import net.minecraft.item.ItemMultiTexture;
import techreborn.blocks.BlockOre;
import techreborn.blocks.BlockStorage; import techreborn.blocks.BlockStorage;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
public class ItemBlockStorage extends ItemMultiTexture { public class ItemBlockStorage extends ItemMultiTexture {
public ItemBlockStorage(Block block) public ItemBlockStorage(Block block) {
{
super(ModBlocks.storage, ModBlocks.storage, BlockStorage.types); super(ModBlocks.storage, ModBlocks.storage, BlockStorage.types);
} }

View file

@ -1,7 +1,5 @@
package techreborn.items; package techreborn.items;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumRarity;
@ -10,8 +8,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
public class ItemDusts extends ItemTR import java.util.List;
{
public class ItemDusts extends ItemTR {
public static final String[] types = new String[] public static final String[] types = new String[]
{ {
"Almandine", "Aluminium", "Andradite", "Ashes", "Basalt", "Bauxite", "Brass", "Bronze", "Almandine", "Aluminium", "Andradite", "Ashes", "Basalt", "Bauxite", "Brass", "Bronze",
@ -25,8 +24,7 @@ public class ItemDusts extends ItemTR
private IIcon[] textures; private IIcon[] textures;
public ItemDusts() public ItemDusts() {
{
setUnlocalizedName("techreborn.dust"); setUnlocalizedName("techreborn.dust");
setHasSubtypes(true); setHasSubtypes(true);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -34,22 +32,18 @@ public class ItemDusts extends ItemTR
@Override @Override
// Registers Textures For All Dusts // Registers Textures For All Dusts
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister) {
{
textures = new IIcon[types.length]; textures = new IIcon[types.length];
for (int i = 0; i < types.length; ++i) for (int i = 0; i < types.length; ++i) {
{
textures[i] = iconRegister.registerIcon("techreborn:" + "dust/" + types[i] + "Dust"); textures[i] = iconRegister.registerIcon("techreborn:" + "dust/" + types[i] + "Dust");
} }
} }
@Override @Override
// Adds Texture what match's meta data // Adds Texture what match's meta data
public IIcon getIconFromDamage(int meta) public IIcon getIconFromDamage(int meta) {
{ if (meta < 0 || meta >= textures.length) {
if (meta < 0 || meta >= textures.length)
{
meta = 0; meta = 0;
} }
@ -58,11 +52,9 @@ public class ItemDusts extends ItemTR
@Override @Override
// gets Unlocalized Name depending on meta data // gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack) public String getUnlocalizedName(ItemStack itemStack) {
{
int meta = itemStack.getItemDamage(); int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length) if (meta < 0 || meta >= types.length) {
{
meta = 0; meta = 0;
} }
@ -70,17 +62,14 @@ public class ItemDusts extends ItemTR
} }
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, List list) public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
{ for (int meta = 0; meta < types.length; ++meta) {
for (int meta = 0; meta < types.length; ++meta)
{
list.add(new ItemStack(item, 1, meta)); list.add(new ItemStack(item, 1, meta));
} }
} }
@Override @Override
public EnumRarity getRarity(ItemStack itemstack) public EnumRarity getRarity(ItemStack itemstack) {
{
return EnumRarity.uncommon; return EnumRarity.uncommon;
} }

View file

@ -1,7 +1,5 @@
package techreborn.items; package techreborn.items;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumRarity;
@ -10,6 +8,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import java.util.List;
public class ItemGems extends Item { public class ItemGems extends Item {
public static final String[] types = new String[] public static final String[] types = new String[]
{ {
@ -18,8 +18,7 @@ public class ItemGems extends Item{
private IIcon[] textures; private IIcon[] textures;
public ItemGems() public ItemGems() {
{
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.gem"); setUnlocalizedName("techreborn.gem");
setHasSubtypes(true); setHasSubtypes(true);
@ -27,22 +26,18 @@ public class ItemGems extends Item{
@Override @Override
// Registers Textures For All Dusts // Registers Textures For All Dusts
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister) {
{
textures = new IIcon[types.length]; textures = new IIcon[types.length];
for (int i = 0; i < types.length; ++i) for (int i = 0; i < types.length; ++i) {
{
textures[i] = iconRegister.registerIcon("techreborn:" + "gem/" + types[i]); textures[i] = iconRegister.registerIcon("techreborn:" + "gem/" + types[i]);
} }
} }
@Override @Override
// Adds Texture what match's meta data // Adds Texture what match's meta data
public IIcon getIconFromDamage(int meta) public IIcon getIconFromDamage(int meta) {
{ if (meta < 0 || meta >= textures.length) {
if (meta < 0 || meta >= textures.length)
{
meta = 0; meta = 0;
} }
@ -51,11 +46,9 @@ public class ItemGems extends Item{
@Override @Override
// gets Unlocalized Name depending on meta data // gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack) public String getUnlocalizedName(ItemStack itemStack) {
{
int meta = itemStack.getItemDamage(); int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length) if (meta < 0 || meta >= types.length) {
{
meta = 0; meta = 0;
} }
@ -63,17 +56,14 @@ public class ItemGems extends Item{
} }
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, List list) public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
{ for (int meta = 0; meta < types.length; ++meta) {
for (int meta = 0; meta < types.length; ++meta)
{
list.add(new ItemStack(item, 1, meta)); list.add(new ItemStack(item, 1, meta));
} }
} }
@Override @Override
public EnumRarity getRarity(ItemStack itemstack) public EnumRarity getRarity(ItemStack itemstack) {
{
return EnumRarity.uncommon; return EnumRarity.uncommon;
} }

View file

@ -1,7 +1,5 @@
package techreborn.items; package techreborn.items;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumRarity;
@ -10,6 +8,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import java.util.List;
public class ItemIngots extends Item { public class ItemIngots extends Item {
public static final String[] types = new String[] public static final String[] types = new String[]
{ {
@ -20,8 +20,7 @@ public class ItemIngots extends Item{
private IIcon[] textures; private IIcon[] textures;
public ItemIngots() public ItemIngots() {
{
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setHasSubtypes(true); setHasSubtypes(true);
setUnlocalizedName("techreborn.ingot"); setUnlocalizedName("techreborn.ingot");
@ -29,22 +28,18 @@ public class ItemIngots extends Item{
@Override @Override
// Registers Textures For All Dusts // Registers Textures For All Dusts
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister) {
{
textures = new IIcon[types.length]; textures = new IIcon[types.length];
for (int i = 0; i < types.length; ++i) for (int i = 0; i < types.length; ++i) {
{
textures[i] = iconRegister.registerIcon("techreborn:" + "ingot/" + types[i] + "Ingot"); textures[i] = iconRegister.registerIcon("techreborn:" + "ingot/" + types[i] + "Ingot");
} }
} }
@Override @Override
// Adds Texture what match's meta data // Adds Texture what match's meta data
public IIcon getIconFromDamage(int meta) public IIcon getIconFromDamage(int meta) {
{ if (meta < 0 || meta >= textures.length) {
if (meta < 0 || meta >= textures.length)
{
meta = 0; meta = 0;
} }
@ -53,11 +48,9 @@ public class ItemIngots extends Item{
@Override @Override
// gets Unlocalized Name depending on meta data // gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack) public String getUnlocalizedName(ItemStack itemStack) {
{
int meta = itemStack.getItemDamage(); int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length) if (meta < 0 || meta >= types.length) {
{
meta = 0; meta = 0;
} }
@ -65,17 +58,14 @@ public class ItemIngots extends Item{
} }
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, List list) public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
{ for (int meta = 0; meta < types.length; ++meta) {
for (int meta = 0; meta < types.length; ++meta)
{
list.add(new ItemStack(item, 1, meta)); list.add(new ItemStack(item, 1, meta));
} }
} }
@Override @Override
public EnumRarity getRarity(ItemStack itemstack) public EnumRarity getRarity(ItemStack itemstack) {
{
return EnumRarity.uncommon; return EnumRarity.uncommon;
} }

View file

@ -1,7 +1,5 @@
package techreborn.items; package techreborn.items;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumRarity;
@ -10,6 +8,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import java.util.List;
public class ItemParts extends Item { public class ItemParts extends Item {
public static final String[] types = new String[] public static final String[] types = new String[]
{ {
@ -20,8 +20,8 @@ public class ItemParts extends Item{
}; };
private IIcon[] textures; private IIcon[] textures;
public ItemParts()
{ public ItemParts() {
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setHasSubtypes(true); setHasSubtypes(true);
setUnlocalizedName("techreborn.part"); setUnlocalizedName("techreborn.part");
@ -29,22 +29,18 @@ public class ItemParts extends Item{
@Override @Override
// Registers Textures For All Dusts // Registers Textures For All Dusts
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister) {
{
textures = new IIcon[types.length]; textures = new IIcon[types.length];
for (int i = 0; i < types.length; ++i) for (int i = 0; i < types.length; ++i) {
{
textures[i] = iconRegister.registerIcon("techreborn:" + "part/" + types[i]); textures[i] = iconRegister.registerIcon("techreborn:" + "part/" + types[i]);
} }
} }
@Override @Override
// Adds Texture what match's meta data // Adds Texture what match's meta data
public IIcon getIconFromDamage(int meta) public IIcon getIconFromDamage(int meta) {
{ if (meta < 0 || meta >= textures.length) {
if (meta < 0 || meta >= textures.length)
{
meta = 0; meta = 0;
} }
@ -53,11 +49,9 @@ public class ItemParts extends Item{
@Override @Override
// gets Unlocalized Name depending on meta data // gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack) public String getUnlocalizedName(ItemStack itemStack) {
{
int meta = itemStack.getItemDamage(); int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length) if (meta < 0 || meta >= types.length) {
{
meta = 0; meta = 0;
} }
@ -65,17 +59,14 @@ public class ItemParts extends Item{
} }
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, List list) public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
{ for (int meta = 0; meta < types.length; ++meta) {
for (int meta = 0; meta < types.length; ++meta)
{
list.add(new ItemStack(item, 1, meta)); list.add(new ItemStack(item, 1, meta));
} }
} }
@Override @Override
public EnumRarity getRarity(ItemStack itemstack) public EnumRarity getRarity(ItemStack itemstack) {
{
return EnumRarity.rare; return EnumRarity.rare;
} }

View file

@ -7,15 +7,13 @@ import techreborn.lib.ModInfo;
public class ItemTR extends Item { public class ItemTR extends Item {
public ItemTR() public ItemTR() {
{
setNoRepair(); setNoRepair();
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
@Override @Override
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister) {
{
itemIcon = iconRegister.registerIcon(ModInfo.MOD_ID + ":" + getUnlocalizedName().toLowerCase().substring(5)); itemIcon = iconRegister.registerIcon(ModInfo.MOD_ID + ":" + getUnlocalizedName().toLowerCase().substring(5));
} }

View file

@ -1,11 +1,9 @@
package techreborn.items.armor; package techreborn.items.armor;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem; import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItem;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
@ -19,8 +17,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.ISpecialArmor;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import java.util.List;
public class ItemGravityChest extends ItemArmor implements IElectricItem, ISpecialArmor { public class ItemGravityChest extends ItemArmor implements IElectricItem, ISpecialArmor {
@ -30,8 +28,7 @@ public class ItemGravityChest extends ItemArmor implements IElectricItem, ISpeci
public double transferLimit = 1000; public double transferLimit = 1000;
public int energyPerDamage = 100; public int energyPerDamage = 100;
public ItemGravityChest(ArmorMaterial material, int par3, int par4) public ItemGravityChest(ArmorMaterial material, int par3, int par4) {
{
super(material, par3, par4); super(material, par3, par4);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.gravity"); setUnlocalizedName("techreborn.gravity");
@ -42,41 +39,34 @@ public class ItemGravityChest extends ItemArmor implements IElectricItem, ISpeci
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister) {
{
this.itemIcon = iconRegister.registerIcon("techreborn:" + "items/gravity"); this.itemIcon = iconRegister.registerIcon("techreborn:" + "items/gravity");
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
{
return "techreborn:" + "textures/models/gravity.png"; return "techreborn:" + "textures/models/gravity.png";
} }
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
{
ItemStack itemStack = new ItemStack(this, 1); ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this) if (getChargedItem(itemStack) == this) {
{
ItemStack charged = new ItemStack(this, 1); ItemStack charged = new ItemStack(this, 1);
ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false);
itemList.add(charged); itemList.add(charged);
} }
if (getEmptyItem(itemStack) == this) if (getEmptyItem(itemStack) == this) {
{
itemList.add(new ItemStack(this, 1, getMaxDamage())); itemList.add(new ItemStack(this, 1, getMaxDamage()));
} }
} }
@Override @Override
public void onArmorTick(World world, EntityPlayer player, ItemStack stack) public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
{
if (world.isRemote) ; if (world.isRemote) ;
if (ElectricItem.manager.canUse(stack, cost)) if (ElectricItem.manager.canUse(stack, cost)) {
{
player.capabilities.allowFlying = true; player.capabilities.allowFlying = true;
if (player.fallDistance > 0.0F) if (player.fallDistance > 0.0F)
@ -93,51 +83,42 @@ public class ItemGravityChest extends ItemArmor implements IElectricItem, ISpeci
} }
@Override @Override
public boolean canProvideEnergy(ItemStack itemStack) public boolean canProvideEnergy(ItemStack itemStack) {
{
return true; return true;
} }
@Override @Override
public Item getChargedItem(ItemStack itemStack) public Item getChargedItem(ItemStack itemStack) {
{
return this; return this;
} }
@Override @Override
public Item getEmptyItem(ItemStack itemStack) public Item getEmptyItem(ItemStack itemStack) {
{
return this; return this;
} }
@Override @Override
public double getMaxCharge(ItemStack itemStack) public double getMaxCharge(ItemStack itemStack) {
{
return maxCharge; return maxCharge;
} }
@Override @Override
public int getTier(ItemStack itemStack) public int getTier(ItemStack itemStack) {
{
return tier; return tier;
} }
@Override @Override
public double getTransferLimit(ItemStack itemStack) public double getTransferLimit(ItemStack itemStack) {
{
return transferLimit; return transferLimit;
} }
public int getEnergyPerDamage() public int getEnergyPerDamage() {
{
return energyPerDamage; return energyPerDamage;
} }
@Override @Override
public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) {
{ if (source.isUnblockable()) {
if (source.isUnblockable())
{
return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 3); return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 3);
} else { } else {
double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio();
@ -148,10 +129,8 @@ public class ItemGravityChest extends ItemArmor implements IElectricItem, ISpeci
} }
@Override @Override
public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
{ if (ElectricItem.manager.getCharge(armor) >= getEnergyPerDamage()) {
if (ElectricItem.manager.getCharge(armor) >= getEnergyPerDamage())
{
return (int) Math.round(20D * getBaseAbsorptionRatio() * getDamageAbsorptionRatio()); return (int) Math.round(20D * getBaseAbsorptionRatio() * getDamageAbsorptionRatio());
} else { } else {
return 0; return 0;
@ -159,18 +138,15 @@ public class ItemGravityChest extends ItemArmor implements IElectricItem, ISpeci
} }
@Override @Override
public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
{
ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false, false); ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false, false);
} }
public double getDamageAbsorptionRatio() public double getDamageAbsorptionRatio() {
{
return 1.1000000000000001D; return 1.1000000000000001D;
} }
private double getBaseAbsorptionRatio() private double getBaseAbsorptionRatio() {
{
return 0.14999999999999999D; return 0.14999999999999999D;
} }

View file

@ -1,19 +1,19 @@
package techreborn.items.armor; package techreborn.items.armor;
import java.util.List;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem; import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItem;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import java.util.List;
public class ItemLapotronPack extends ItemArmor implements IElectricItem { public class ItemLapotronPack extends ItemArmor implements IElectricItem {
@ -21,8 +21,7 @@ public class ItemLapotronPack extends ItemArmor implements IElectricItem{
public static final int tier = ConfigTechReborn.LapotronPackTier; public static final int tier = ConfigTechReborn.LapotronPackTier;
public double transferLimit = 100000; public double transferLimit = 100000;
public ItemLapotronPack(ArmorMaterial armormaterial, int par2, int par3) public ItemLapotronPack(ArmorMaterial armormaterial, int par2, int par3) {
{
super(armormaterial, par2, par3); super(armormaterial, par2, par3);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.lapotronpack"); setUnlocalizedName("techreborn.lapotronpack");
@ -31,68 +30,57 @@ public class ItemLapotronPack extends ItemArmor implements IElectricItem{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister) {
{
this.itemIcon = iconRegister.registerIcon("techreborn:" + "tool/lapotronicEnergyOrb"); this.itemIcon = iconRegister.registerIcon("techreborn:" + "tool/lapotronicEnergyOrb");
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
{
return "techreborn:" + "textures/models/lapotronpack.png"; return "techreborn:" + "textures/models/lapotronpack.png";
} }
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
{
ItemStack itemStack = new ItemStack(this, 1); ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this) if (getChargedItem(itemStack) == this) {
{
ItemStack charged = new ItemStack(this, 1); ItemStack charged = new ItemStack(this, 1);
ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false);
itemList.add(charged); itemList.add(charged);
} }
if (getEmptyItem(itemStack) == this) if (getEmptyItem(itemStack) == this) {
{
itemList.add(new ItemStack(this, 1, getMaxDamage())); itemList.add(new ItemStack(this, 1, getMaxDamage()));
} }
} }
@Override @Override
public boolean canProvideEnergy(ItemStack itemStack) public boolean canProvideEnergy(ItemStack itemStack) {
{
return true; return true;
} }
@Override @Override
public Item getChargedItem(ItemStack itemStack) public Item getChargedItem(ItemStack itemStack) {
{
return this; return this;
} }
@Override @Override
public Item getEmptyItem(ItemStack itemStack) public Item getEmptyItem(ItemStack itemStack) {
{
return this; return this;
} }
@Override @Override
public double getMaxCharge(ItemStack itemStack) public double getMaxCharge(ItemStack itemStack) {
{
return maxCharge; return maxCharge;
} }
@Override @Override
public int getTier(ItemStack itemStack) public int getTier(ItemStack itemStack) {
{
return tier; return tier;
} }
@Override @Override
public double getTransferLimit(ItemStack itemStack) public double getTransferLimit(ItemStack itemStack) {
{
return transferLimit; return transferLimit;
} }

View file

@ -1,7 +1,7 @@
package techreborn.items.armor; package techreborn.items.armor;
import java.util.List; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem; import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItem;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -12,8 +12,8 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import java.util.List;
public class ItemLithiumBatpack extends ItemArmor implements IElectricItem { public class ItemLithiumBatpack extends ItemArmor implements IElectricItem {
@ -21,8 +21,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IElectricItem{
public static final int tier = ConfigTechReborn.LithiumBatpackTier; public static final int tier = ConfigTechReborn.LithiumBatpackTier;
public double transferLimit = 10000; public double transferLimit = 10000;
public ItemLithiumBatpack(ArmorMaterial armorMaterial, int par3, int par4) public ItemLithiumBatpack(ArmorMaterial armorMaterial, int par3, int par4) {
{
super(armorMaterial, par3, par4); super(armorMaterial, par3, par4);
setMaxStackSize(1); setMaxStackSize(1);
setUnlocalizedName("techreborn.lithiumbatpack"); setUnlocalizedName("techreborn.lithiumbatpack");
@ -31,68 +30,57 @@ public class ItemLithiumBatpack extends ItemArmor implements IElectricItem{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister) {
{
this.itemIcon = iconRegister.registerIcon("techreborn:" + "tool/lithiumBatpack"); this.itemIcon = iconRegister.registerIcon("techreborn:" + "tool/lithiumBatpack");
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
{
return "techreborn:" + "textures/models/lithiumbatpack.png"; return "techreborn:" + "textures/models/lithiumbatpack.png";
} }
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
{
ItemStack itemStack = new ItemStack(this, 1); ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this) if (getChargedItem(itemStack) == this) {
{
ItemStack charged = new ItemStack(this, 1); ItemStack charged = new ItemStack(this, 1);
ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false);
itemList.add(charged); itemList.add(charged);
} }
if (getEmptyItem(itemStack) == this) if (getEmptyItem(itemStack) == this) {
{
itemList.add(new ItemStack(this, 1, getMaxDamage())); itemList.add(new ItemStack(this, 1, getMaxDamage()));
} }
} }
@Override @Override
public boolean canProvideEnergy(ItemStack itemStack) public boolean canProvideEnergy(ItemStack itemStack) {
{
return true; return true;
} }
@Override @Override
public Item getChargedItem(ItemStack itemStack) public Item getChargedItem(ItemStack itemStack) {
{
return this; return this;
} }
@Override @Override
public Item getEmptyItem(ItemStack itemStack) public Item getEmptyItem(ItemStack itemStack) {
{
return this; return this;
} }
@Override @Override
public double getMaxCharge(ItemStack itemStack) public double getMaxCharge(ItemStack itemStack) {
{
return maxCharge; return maxCharge;
} }
@Override @Override
public int getTier(ItemStack itemStack) public int getTier(ItemStack itemStack) {
{
return tier; return tier;
} }
@Override @Override
public double getTransferLimit(ItemStack itemStack) public double getTransferLimit(ItemStack itemStack) {
{
return transferLimit; return transferLimit;
} }

View file

@ -1,11 +1,9 @@
package techreborn.items.tools; package techreborn.items.tools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem; import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItem;
import java.util.List;
import mcp.mobius.waila.api.impl.ConfigHandler;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
@ -13,26 +11,24 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.event.ForgeEventFactory;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.util.TorchHelper; import techreborn.util.TorchHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import java.util.List;
public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem { public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem {
public static final int maxCharge = ConfigTechReborn.AdvancedDrillCharge; public static final int maxCharge = ConfigTechReborn.AdvancedDrillCharge;
public int cost = 250;; public int cost = 250;
;
public static final int tier = ConfigTechReborn.AdvancedDrillTier; public static final int tier = ConfigTechReborn.AdvancedDrillTier;
public double transferLimit = 100; public double transferLimit = 100;
public ItemAdvancedDrill() public ItemAdvancedDrill() {
{
super(ToolMaterial.EMERALD); super(ToolMaterial.EMERALD);
efficiencyOnProperMaterial = 20F; efficiencyOnProperMaterial = 20F;
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -43,31 +39,26 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister) {
{
this.itemIcon = iconRegister.registerIcon("techreborn:" + "tool/advancedDrill"); this.itemIcon = iconRegister.registerIcon("techreborn:" + "tool/advancedDrill");
} }
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
{
ItemStack itemStack = new ItemStack(this, 1); ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this) if (getChargedItem(itemStack) == this) {
{
ItemStack charged = new ItemStack(this, 1); ItemStack charged = new ItemStack(this, 1);
ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false);
itemList.add(charged); itemList.add(charged);
} }
if (getEmptyItem(itemStack) == this) if (getEmptyItem(itemStack) == this) {
{
itemList.add(new ItemStack(this, 1, getMaxDamage())); itemList.add(new ItemStack(this, 1, getMaxDamage()));
} }
} }
@Override @Override
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
{
ElectricItem.manager.use(stack, cost, entityLiving); ElectricItem.manager.use(stack, cost, entityLiving);
return true; return true;
} }
@ -79,13 +70,11 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem{
@Override @Override
public float getDigSpeed(ItemStack stack, Block block, int meta) { public float getDigSpeed(ItemStack stack, Block block, int meta) {
if (!ElectricItem.manager.canUse(stack, cost)) if (!ElectricItem.manager.canUse(stack, cost)) {
{
return 4.0F; return 4.0F;
} }
if (Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F) if (Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F) {
{
return efficiencyOnProperMaterial; return efficiencyOnProperMaterial;
} else { } else {
return super.getDigSpeed(stack, block, meta); return super.getDigSpeed(stack, block, meta);
@ -93,14 +82,12 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem{
} }
@Override @Override
public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) {
{
return true; return true;
} }
@Override @Override
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) {
{
return TorchHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); return TorchHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset);
} }

View file

@ -1,14 +1,9 @@
package techreborn.items.tools; package techreborn.items.tools;
import java.util.List;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem; import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItem;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.util.TorchHelper;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
@ -16,12 +11,15 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.event.ForgeEventFactory; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.util.TorchHelper;
import java.util.List;
public class ItemOmniTool extends ItemPickaxe implements IElectricItem { public class ItemOmniTool extends ItemPickaxe implements IElectricItem {
@ -30,8 +28,7 @@ public class ItemOmniTool extends ItemPickaxe implements IElectricItem{
public int cost = 100; public int cost = 100;
public int hitCost = 125; public int hitCost = 125;
public ItemOmniTool(ToolMaterial toolMaterial) public ItemOmniTool(ToolMaterial toolMaterial) {
{
super(toolMaterial); super(toolMaterial);
efficiencyOnProperMaterial = 13F; efficiencyOnProperMaterial = 13F;
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -42,51 +39,42 @@ public class ItemOmniTool extends ItemPickaxe implements IElectricItem{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister) {
{
this.itemIcon = iconRegister.registerIcon("techreborn:" + "tool/omnitool"); this.itemIcon = iconRegister.registerIcon("techreborn:" + "tool/omnitool");
} }
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
{
ItemStack itemStack = new ItemStack(this, 1); ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this) if (getChargedItem(itemStack) == this) {
{
ItemStack charged = new ItemStack(this, 1); ItemStack charged = new ItemStack(this, 1);
ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false);
itemList.add(charged); itemList.add(charged);
} }
if (getEmptyItem(itemStack) == this) if (getEmptyItem(itemStack) == this) {
{
itemList.add(new ItemStack(this, 1, getMaxDamage())); itemList.add(new ItemStack(this, 1, getMaxDamage()));
} }
} }
@Override @Override
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
{
ElectricItem.manager.use(stack, cost, entityLiving); ElectricItem.manager.use(stack, cost, entityLiving);
return true; return true;
} }
@Override @Override
public boolean canHarvestBlock(Block block, ItemStack stack) public boolean canHarvestBlock(Block block, ItemStack stack) {
{
return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack) || Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack) || Items.shears.canHarvestBlock(block, stack); return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack) || Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack) || Items.shears.canHarvestBlock(block, stack);
} }
@Override @Override
public float getDigSpeed(ItemStack stack, Block block, int meta) public float getDigSpeed(ItemStack stack, Block block, int meta) {
{ if (!ElectricItem.manager.canUse(stack, cost)) {
if (!ElectricItem.manager.canUse(stack, cost))
{
return 5.0F; return 5.0F;
} }
if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F || Items.shears.getDigSpeed(stack, block, meta) > 1.0F) if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F || Items.shears.getDigSpeed(stack, block, meta) > 1.0F) {
{
return efficiencyOnProperMaterial; return efficiencyOnProperMaterial;
} else { } else {
return super.getDigSpeed(stack, block, meta); return super.getDigSpeed(stack, block, meta);
@ -94,60 +82,50 @@ public class ItemOmniTool extends ItemPickaxe implements IElectricItem{
} }
@Override @Override
public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) {
{ if (ElectricItem.manager.use(itemstack, hitCost, attacker)) {
if (ElectricItem.manager.use(itemstack, hitCost, attacker))
{
entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 8F); entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 8F);
} }
return false; return false;
} }
@Override @Override
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) {
{
return TorchHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); return TorchHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset);
} }
@Override @Override
public boolean isRepairable() public boolean isRepairable() {
{
return false; return false;
} }
@Override @Override
public Item getChargedItem(ItemStack itemStack) public Item getChargedItem(ItemStack itemStack) {
{
return this; return this;
} }
@Override @Override
public Item getEmptyItem(ItemStack itemStack) public Item getEmptyItem(ItemStack itemStack) {
{
return this; return this;
} }
@Override @Override
public boolean canProvideEnergy(ItemStack itemStack) public boolean canProvideEnergy(ItemStack itemStack) {
{
return false; return false;
} }
@Override @Override
public double getMaxCharge(ItemStack itemStack) public double getMaxCharge(ItemStack itemStack) {
{
return maxCharge; return maxCharge;
} }
@Override @Override
public int getTier(ItemStack itemStack) public int getTier(ItemStack itemStack) {
{
return 2; return 2;
} }
@Override @Override
public double getTransferLimit(ItemStack itemStack) public double getTransferLimit(ItemStack itemStack) {
{
return 200; return 200;
} }

View file

@ -1,7 +1,7 @@
package techreborn.items.tools; package techreborn.items.tools;
import java.util.List; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem; import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -16,8 +16,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import java.util.List;
public class ItemRockCutter extends ItemPickaxe implements IElectricItem { public class ItemRockCutter extends ItemPickaxe implements IElectricItem {
@ -25,8 +25,7 @@ public class ItemRockCutter extends ItemPickaxe implements IElectricItem{
public int cost = 500; public int cost = 500;
public static final int tier = ConfigTechReborn.RockCutterTier; public static final int tier = ConfigTechReborn.RockCutterTier;
public ItemRockCutter(ToolMaterial toolMaterial) public ItemRockCutter(ToolMaterial toolMaterial) {
{
super(toolMaterial); super(toolMaterial);
setUnlocalizedName("techreborn.rockcutter"); setUnlocalizedName("techreborn.rockcutter");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -37,79 +36,66 @@ public class ItemRockCutter extends ItemPickaxe implements IElectricItem{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister) {
{
this.itemIcon = iconRegister.registerIcon("techreborn:" + "tool/rockcutter"); this.itemIcon = iconRegister.registerIcon("techreborn:" + "tool/rockcutter");
} }
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
{
ItemStack itemStack = new ItemStack(this, 1); ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this) if (getChargedItem(itemStack) == this) {
{
ItemStack charged = new ItemStack(this, 1); ItemStack charged = new ItemStack(this, 1);
ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false);
itemList.add(charged); itemList.add(charged);
} }
if (getEmptyItem(itemStack) == this) if (getEmptyItem(itemStack) == this) {
{
itemList.add(new ItemStack(this, 1, getMaxDamage())); itemList.add(new ItemStack(this, 1, getMaxDamage()));
} }
} }
@Override @Override
public boolean canHarvestBlock(Block block, ItemStack stack) public boolean canHarvestBlock(Block block, ItemStack stack) {
{
return Items.diamond_pickaxe.canHarvestBlock(block, stack); return Items.diamond_pickaxe.canHarvestBlock(block, stack);
} }
@Override @Override
public boolean isRepairable() public boolean isRepairable() {
{
return false; return false;
} }
public void onCreated(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) public void onCreated(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
{
par1ItemStack.addEnchantment(Enchantment.silkTouch, 1); par1ItemStack.addEnchantment(Enchantment.silkTouch, 1);
} }
@Override @Override
public boolean canProvideEnergy(ItemStack itemStack) public boolean canProvideEnergy(ItemStack itemStack) {
{
return false; return false;
} }
@Override @Override
public Item getChargedItem(ItemStack itemStack) public Item getChargedItem(ItemStack itemStack) {
{
return this; return this;
} }
@Override @Override
public Item getEmptyItem(ItemStack itemStack) public Item getEmptyItem(ItemStack itemStack) {
{
return this; return this;
} }
@Override @Override
public double getMaxCharge(ItemStack itemStack) public double getMaxCharge(ItemStack itemStack) {
{
return maxCharge; return maxCharge;
} }
@Override @Override
public int getTier(ItemStack itemStack) public int getTier(ItemStack itemStack) {
{
return tier; return tier;
} }
@Override @Override
public double getTransferLimit(ItemStack itemStack) public double getTransferLimit(ItemStack itemStack) {
{
return 300; return 300;
} }

View file

@ -1,7 +1,6 @@
package techreborn.lib; package techreborn.lib;
public class ModInfo public class ModInfo {
{
public static final String MOD_NAME = "TechReborn"; public static final String MOD_NAME = "TechReborn";
public static final String MOD_ID = "techreborn"; public static final String MOD_ID = "techreborn";
public static final String MOD_VERSION = "@MODVERSION@"; public static final String MOD_VERSION = "@MODVERSION@";

View file

@ -1,20 +1,19 @@
package techreborn.packets; package techreborn.packets;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import java.io.IOException;
import java.util.EnumMap;
import java.util.logging.Logger;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.Packet;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.FMLEmbeddedChannel; import cpw.mods.fml.common.network.FMLEmbeddedChannel;
import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec;
import cpw.mods.fml.common.network.FMLOutboundHandler; import cpw.mods.fml.common.network.FMLOutboundHandler;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.Packet;
import net.minecraft.world.World;
import java.io.IOException;
import java.util.EnumMap;
import java.util.logging.Logger;
public class PacketHandler extends FMLIndexedMessageToMessageCodec<SimplePacket> { public class PacketHandler extends FMLIndexedMessageToMessageCodec<SimplePacket> {
private static EnumMap<Side, FMLEmbeddedChannel> channels; private static EnumMap<Side, FMLEmbeddedChannel> channels;

View file

@ -1,9 +1,7 @@
package techreborn.packets; package techreborn.packets;
import com.google.common.base.Charsets;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -11,7 +9,7 @@ import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;
import com.google.common.base.Charsets; import java.io.IOException;
public abstract class SimplePacket { public abstract class SimplePacket {
protected EntityPlayer player; protected EntityPlayer player;

View file

@ -297,7 +297,8 @@ public class TileCentrifuge extends TileMachineBase implements IInventory, IWren
} }
@Override @Override
public void setFacing(short facing) {} public void setFacing(short facing) {
}
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) { public boolean wrenchCanRemove(EntityPlayer entityPlayer) {

View file

@ -89,8 +89,7 @@ public class TileQuantumChest extends TileMachineBase implements IInventory ,IWr
storedItem = null; storedItem = null;
if (tagCompound.hasKey("storedStack")) if (tagCompound.hasKey("storedStack")) {
{
storedItem = ItemStack. storedItem = ItemStack.
loadItemStackFromNBT((NBTTagCompound) tagCompound.getTag("storedStack")); loadItemStackFromNBT((NBTTagCompound) tagCompound.getTag("storedStack"));
} }
@ -108,12 +107,10 @@ public class TileQuantumChest extends TileMachineBase implements IInventory ,IWr
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound) { public void writeToNBTWithoutCoords(NBTTagCompound tagCompound) {
inventory.writeToNBT(tagCompound); inventory.writeToNBT(tagCompound);
if (storedItem != null) if (storedItem != null) {
{
tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound())); tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound()));
tagCompound.setInteger("storedQuantity", storedItem.stackSize); tagCompound.setInteger("storedQuantity", storedItem.stackSize);
} } else
else
tagCompound.setInteger("storedQuantity", 0); tagCompound.setInteger("storedQuantity", 0);
} }

View file

@ -1,9 +1,6 @@
package techreborn.tiles; package techreborn.tiles;
import ic2.api.tile.IWrenchable; import ic2.api.tile.IWrenchable;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -21,6 +18,8 @@ import techreborn.util.FluidUtils;
import techreborn.util.Inventory; import techreborn.util.Inventory;
import techreborn.util.Tank; import techreborn.util.Tank;
import java.util.List;
public class TileQuantumTank extends TileMachineBase implements IFluidHandler, IInventory, IWrenchable { public class TileQuantumTank extends TileMachineBase implements IFluidHandler, IInventory, IWrenchable {
public Tank tank = new Tank("TileQuantumTank", Integer.MAX_VALUE, this); public Tank tank = new Tank("TileQuantumTank", Integer.MAX_VALUE, this);

View file

@ -1,14 +1,10 @@
package techreborn.tiles; package techreborn.tiles;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import ic2.api.energy.prefab.BasicSink; import ic2.api.energy.prefab.BasicSink;
import ic2.api.tile.IWrenchable; import ic2.api.tile.IWrenchable;
import techreborn.api.CentrifugeRecipie; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import techreborn.api.RollingMachineRecipie; import techreborn.api.RollingMachineRecipie;
import techreborn.api.TechRebornAPI;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.util.Inventory; import techreborn.util.Inventory;
@ -23,14 +19,12 @@ public class TileRollingMachine extends TileMachineBase implements IWrenchable{
public int euTick = 5; public int euTick = 5;
public TileRollingMachine() public TileRollingMachine() {
{
energy = new BasicSink(this, 100000, 1); energy = new BasicSink(this, 100000, 1);
} }
@Override @Override
public void updateEntity() public void updateEntity() {
{
super.updateEntity(); super.updateEntity();
energy.updateEntity(); energy.updateEntity();
} }
@ -46,7 +40,8 @@ public class TileRollingMachine extends TileMachineBase implements IWrenchable{
} }
@Override @Override
public void setFacing(short facing) {} public void setFacing(short facing) {
}
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) { public boolean wrenchCanRemove(EntityPlayer entityPlayer) {

View file

@ -11,12 +11,7 @@ import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.*;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.util.FluidUtils; import techreborn.util.FluidUtils;
@ -45,7 +40,8 @@ public class TileThermalGenerator extends TileEntity implements IWrenchable, IFl
} }
@Override @Override
public void setFacing(short facing) {} public void setFacing(short facing) {
}
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) { public boolean wrenchCanRemove(EntityPlayer entityPlayer) {

View file

@ -7,13 +7,11 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
public class CraftingHelper { public class CraftingHelper {
public static void addShapedOreRecipe(ItemStack outputItemStack, Object... objectInputs) public static void addShapedOreRecipe(ItemStack outputItemStack, Object... objectInputs) {
{
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(outputItemStack, objectInputs)); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(outputItemStack, objectInputs));
} }
public static void addShapelessOreRecipe(ItemStack outputItemStack, Object... objectInputs) public static void addShapelessOreRecipe(ItemStack outputItemStack, Object... objectInputs) {
{
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(outputItemStack, objectInputs)); CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(outputItemStack, objectInputs));
} }

View file

@ -1,54 +1,44 @@
package techreborn.util; package techreborn.util;
import org.apache.logging.log4j.Level;
import techreborn.lib.ModInfo;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;
import org.apache.logging.log4j.Level;
import techreborn.lib.ModInfo;
public class LogHelper { public class LogHelper {
public static void log(Level logLevel, Object object) public static void log(Level logLevel, Object object) {
{
FMLLog.log(ModInfo.MOD_NAME, logLevel, String.valueOf(object)); FMLLog.log(ModInfo.MOD_NAME, logLevel, String.valueOf(object));
} }
public static void all(Object object) public static void all(Object object) {
{
log(Level.ALL, object); log(Level.ALL, object);
} }
public static void debug(Object object) public static void debug(Object object) {
{
log(Level.DEBUG, object); log(Level.DEBUG, object);
} }
public static void error(Object object) public static void error(Object object) {
{
log(Level.ERROR, object); log(Level.ERROR, object);
} }
public static void fatal(Object object) public static void fatal(Object object) {
{
log(Level.FATAL, object); log(Level.FATAL, object);
} }
public static void info(Object object) public static void info(Object object) {
{
log(Level.INFO, object); log(Level.INFO, object);
} }
public static void off(Object object) public static void off(Object object) {
{
log(Level.OFF, object); log(Level.OFF, object);
} }
public static void trace(Object object) public static void trace(Object object) {
{
log(Level.TRACE, object); log(Level.TRACE, object);
} }
public static void warn(Object object) public static void warn(Object object) {
{
log(Level.WARN, object); log(Level.WARN, object);
} }

View file

@ -1,47 +1,38 @@
package techreborn.util; package techreborn.util;
import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapedRecipes;
public class RecipeRemover import java.util.List;
{
public static void removeShapedRecipes(List<ItemStack> removelist) public class RecipeRemover {
{ public static void removeShapedRecipes(List<ItemStack> removelist) {
for (ItemStack stack : removelist) for (ItemStack stack : removelist)
removeShapedRecipe(stack); removeShapedRecipe(stack);
} }
public static void removeAnyRecipe(ItemStack resultItem) public static void removeAnyRecipe(ItemStack resultItem) {
{
List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList(); List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList();
for (int i = 0; i < recipes.size(); i++) for (int i = 0; i < recipes.size(); i++) {
{
IRecipe tmpRecipe = recipes.get(i); IRecipe tmpRecipe = recipes.get(i);
ItemStack recipeResult = tmpRecipe.getRecipeOutput(); ItemStack recipeResult = tmpRecipe.getRecipeOutput();
if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) {
{
recipes.remove(i--); recipes.remove(i--);
} }
} }
} }
public static void removeShapedRecipe(ItemStack resultItem) public static void removeShapedRecipe(ItemStack resultItem) {
{
List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList(); List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList();
for (int i = 0; i < recipes.size(); i++) for (int i = 0; i < recipes.size(); i++) {
{
IRecipe tmpRecipe = recipes.get(i); IRecipe tmpRecipe = recipes.get(i);
if (tmpRecipe instanceof ShapedRecipes) if (tmpRecipe instanceof ShapedRecipes) {
{
ShapedRecipes recipe = (ShapedRecipes) tmpRecipe; ShapedRecipes recipe = (ShapedRecipes) tmpRecipe;
ItemStack recipeResult = recipe.getRecipeOutput(); ItemStack recipeResult = recipe.getRecipeOutput();
if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) {
{
recipes.remove(i++); recipes.remove(i++);
} }
} }

View file

@ -9,10 +9,8 @@ import net.minecraftforge.event.ForgeEventFactory;
public class TorchHelper { public class TorchHelper {
public static boolean placeTorch(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) public static boolean placeTorch(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) {
{ for (int i = 0; i < player.inventory.mainInventory.length; i++) {
for (int i = 0; i < player.inventory.mainInventory.length; i++)
{
ItemStack torchStack = player.inventory.mainInventory[i]; ItemStack torchStack = player.inventory.mainInventory[i];
if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) continue; if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) continue;
Item item = torchStack.getItem(); Item item = torchStack.getItem();
@ -20,12 +18,10 @@ public class TorchHelper {
int oldMeta = torchStack.getItemDamage(); int oldMeta = torchStack.getItemDamage();
int oldSize = torchStack.stackSize; int oldSize = torchStack.stackSize;
boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset);
if (player.capabilities.isCreativeMode) if (player.capabilities.isCreativeMode) {
{
torchStack.setItemDamage(oldMeta); torchStack.setItemDamage(oldMeta);
torchStack.stackSize = oldSize; torchStack.stackSize = oldSize;
} else if (torchStack.stackSize <= 0) } else if (torchStack.stackSize <= 0) {
{
ForgeEventFactory.onPlayerDestroyItem(player, torchStack); ForgeEventFactory.onPlayerDestroyItem(player, torchStack);
player.inventory.mainInventory[i] = null; player.inventory.mainInventory[i] = null;
} }

View file

@ -1,7 +1,6 @@
package techreborn.world; package techreborn.world;
import java.util.Random; import cpw.mods.fml.common.IWorldGenerator;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.chunk.IChunkProvider;
@ -9,7 +8,8 @@ import net.minecraft.world.gen.feature.WorldGenMinable;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.util.LogHelper; import techreborn.util.LogHelper;
import cpw.mods.fml.common.IWorldGenerator;
import java.util.Random;
public class TROreGen implements IWorldGenerator { public class TROreGen implements IWorldGenerator {
public static ConfigTechReborn config; public static ConfigTechReborn config;
@ -27,8 +27,7 @@ public class TROreGen implements IWorldGenerator{
WorldGenMinable oreOlivine; WorldGenMinable oreOlivine;
WorldGenMinable oreSodalite; WorldGenMinable oreSodalite;
public TROreGen() public TROreGen() {
{
//World //World
oreGalena = new WorldGenMinable(ModBlocks.ore, 0, 8, Blocks.stone); oreGalena = new WorldGenMinable(ModBlocks.ore, 0, 8, Blocks.stone);
oreIridium = new WorldGenMinable(ModBlocks.ore, 1, 2, Blocks.stone); oreIridium = new WorldGenMinable(ModBlocks.ore, 1, 2, Blocks.stone);
@ -48,70 +47,53 @@ public class TROreGen implements IWorldGenerator{
} }
@Override @Override
public void generate(Random random, int xChunk, int zChunk, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) public void generate(Random random, int xChunk, int zChunk, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) {
{ if (world.provider.isSurfaceWorld()) {
if(world.provider.isSurfaceWorld())
{
generateUndergroundOres(random, xChunk * 16, zChunk * 16, world); generateUndergroundOres(random, xChunk * 16, zChunk * 16, world);
} } else if (world.provider.isHellWorld) {
else if(world.provider.isHellWorld)
{
generateHellOres(random, xChunk * 16, zChunk * 16, world); generateHellOres(random, xChunk * 16, zChunk * 16, world);
} } else {
else
{
generateEndOres(random, xChunk * 16, zChunk * 16, world); generateEndOres(random, xChunk * 16, zChunk * 16, world);
} }
} }
void generateUndergroundOres (Random random, int xChunk, int zChunk, World world) void generateUndergroundOres(Random random, int xChunk, int zChunk, World world) {
{
int xPos, yPos, zPos; int xPos, yPos, zPos;
if (config.GalenaOreTrue) if (config.GalenaOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);
oreGalena.generate(world, random, xPos, yPos, zPos); oreGalena.generate(world, random, xPos, yPos, zPos);
} }
} }
if (config.IridiumOreTrue) if (config.IridiumOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);
oreIridium.generate(world, random, xPos, yPos, zPos); oreIridium.generate(world, random, xPos, yPos, zPos);
} }
} }
if (config.RubyOreTrue) if (config.RubyOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);
oreRuby.generate(world, random, xPos, yPos, zPos); oreRuby.generate(world, random, xPos, yPos, zPos);
} }
} }
if (config.SapphireOreTrue) if (config.SapphireOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);
oreSapphire.generate(world, random, xPos, yPos, zPos); oreSapphire.generate(world, random, xPos, yPos, zPos);
} }
} }
if (config.BauxiteOreTrue) if (config.BauxiteOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);
@ -120,33 +102,26 @@ public class TROreGen implements IWorldGenerator{
} }
} }
void generateHellOres (Random random, int xChunk, int zChunk, World world) void generateHellOres(Random random, int xChunk, int zChunk, World world) {
{
int xPos, yPos, zPos; int xPos, yPos, zPos;
if (config.PyriteOreTrue) if (config.PyriteOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);
orePyrite.generate(world, random, xPos, yPos, zPos); orePyrite.generate(world, random, xPos, yPos, zPos);
} }
} }
if (config.CinnabarOreTrue) if (config.CinnabarOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);
oreCinnabar.generate(world, random, xPos, yPos, zPos); oreCinnabar.generate(world, random, xPos, yPos, zPos);
} }
} }
if (config.SphaleriteOreTrue) if (config.SphaleriteOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);
@ -155,43 +130,34 @@ public class TROreGen implements IWorldGenerator{
} }
} }
void generateEndOres (Random random, int xChunk, int zChunk, World world) void generateEndOres(Random random, int xChunk, int zChunk, World world) {
{
int xPos, yPos, zPos; int xPos, yPos, zPos;
if (config.TungstonOreTrue) if (config.TungstonOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);
oreTungston.generate(world, random, xPos, yPos, zPos); oreTungston.generate(world, random, xPos, yPos, zPos);
} }
} }
if (config.SheldoniteOreTrue) if (config.SheldoniteOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);
oreSheldonite.generate(world, random, xPos, yPos, zPos); oreSheldonite.generate(world, random, xPos, yPos, zPos);
} }
} }
if (config.OlivineOreTrue) if (config.OlivineOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);
oreOlivine.generate(world, random, xPos, yPos, zPos); oreOlivine.generate(world, random, xPos, yPos, zPos);
} }
} }
if (config.SodaliteOreTrue) if (config.SodaliteOreTrue) {
{ for (int i = 0; i <= 16; i++) {
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16); xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20); yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16); zPos = zChunk + random.nextInt(16);