diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/ic2')
18 files changed, 576 insertions, 586 deletions
diff --git a/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java b/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java index 97f37a8628..bb97132ab4 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java +++ b/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java @@ -9,20 +9,20 @@ public class HANDLER_IC2{ public static void preInit() { if (LoadedMods.IndustrialCraft2){ IC2_Items.register(); - //new BlockRTG(InternalName.beer); - } + //new BlockRTG(InternalName.beer); + } } public static void init() { if (LoadedMods.IndustrialCraft2){ - - } + + } } public static void postInit() { if (LoadedMods.IndustrialCraft2){ RECIPE_IC2.initRecipes(); - } + } } } diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java index 1287b81e49..7038d98a7d 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java +++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java @@ -1,5 +1,13 @@ package gtPlusPlus.xmod.ic2.block.RTGGenerator; +import java.util.List; +import java.util.Random; + +import org.apache.commons.lang3.mutable.MutableObject; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.xmod.ic2.block.kieticgenerator.tileentity.TileEntityKineticWindGenerator; import gtPlusPlus.xmod.ic2.item.IC2_Items; @@ -10,10 +18,6 @@ import ic2.core.block.BlockMultiID; import ic2.core.block.TileEntityBlock; import ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric; import ic2.core.init.InternalName; - -import java.util.List; -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -21,21 +25,15 @@ import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import org.apache.commons.lang3.mutable.MutableObject; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class BlockRTG extends BlockMultiID { - public BlockRTG(InternalName internalName1) + public BlockRTG(final InternalName internalName1) { super(internalName1, Material.iron, ItemGenerators.class); - setCreativeTab(AddToCreativeTab.tabMachines); - setHardness(3.0F); - setStepSound(soundTypeMetal); + this.setCreativeTab(AddToCreativeTab.tabMachines); + this.setHardness(3.0F); + this.setStepSound(soundTypeMetal); IC2_Items.blockRTG = new ItemStack(this, 1, 0); IC2_Items.blockKineticGenerator = new ItemStack(this, 1, 1); @@ -45,14 +43,14 @@ extends BlockMultiID } @Override - public void getSubBlocks(Item j, CreativeTabs tabs, List itemList) { - Item item = Item.getItemFromBlock(this); + public void getSubBlocks(final Item j, final CreativeTabs tabs, final List itemList) { + final Item item = Item.getItemFromBlock(this); if (!item.getHasSubtypes()) { itemList.add(new ItemStack(this)); } else { for (int i = 0; i < 16; i++) { - ItemStack is = new ItemStack(this, 1, i); + final ItemStack is = new ItemStack(this, 1, i); if (is.getItem().getUnlocalizedName(is) == null) { break; } @@ -63,36 +61,36 @@ extends BlockMultiID @Override - public String getTextureFolder(int id) + public String getTextureFolder(final int id) { return "generator"; } @Override - public int damageDropped(int meta) + public int damageDropped(final int meta) { switch (meta) { - case 2: + case 2: return 2; } return 0; } @Override - public Class<? extends TileEntity> getTeClass(int meta, MutableObject<Class<?>[]> ctorArgTypes, MutableObject<Object[]> ctorArgs) + public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes, final MutableObject<Object[]> ctorArgs) { try { switch (meta) - { - case 0: - return TileEntityRTG.class; - case 1: + { + case 0: + return TileEntityRTG.class; + case 1: return TileEntityKineticWindGenerator.class; } } - catch (Exception e) + catch (final Exception e) { throw new RuntimeException(e); } @@ -100,75 +98,75 @@ extends BlockMultiID } /* - * + * * { - case 0: + case 0: return TileEntityGenerator.class; - case 1: + case 1: return TileEntityGeoGenerator.class; - case 2: + case 2: return TileEntityWaterGenerator.class; - case 3: + case 3: return TileEntitySolarGenerator.class; - case 4: + case 4: return TileEntityWindGenerator.class; - case 5: + case 5: return TileEntityNuclearReactorElectric.class; - case 6: + case 6: return TileEntityRTGenerator.class; - case 7: + case 7: return TileEntitySemifluidGenerator.class; - case 8: + case 8: return TileEntityStirlingGenerator.class; - case 9: + case 9: return TileEntityKineticGenerator.class; } - * + * * (non-Javadoc) * @see net.minecraft.block.Block#randomDisplayTick(net.minecraft.world.World, int, int, int, java.util.Random) */ @Override - public void randomDisplayTick(World world, int x, int y, int z, Random random) + public void randomDisplayTick(final World world, final int x, final int y, final int z, final Random random) { if (!IC2.platform.isRendering()) { return; } - int meta = world.getBlockMetadata(x, y, z); - if ((meta == 0) && (isActive(world, x, y, z))) + final int meta = world.getBlockMetadata(x, y, z); + if ((meta == 0) && (this.isActive(world, x, y, z))) { - TileEntityBlock te = (TileEntityBlock)getOwnTe(world, x, y, z); + final TileEntityBlock te = (TileEntityBlock)this.getOwnTe(world, x, y, z); if (te == null) { return; } - int l = te.getFacing(); - float f = x + 0.5F; - float f1 = y + 0.0F + random.nextFloat() * 6.0F / 16.0F; - float f2 = z + 0.5F; - float f3 = 0.52F; - float f4 = random.nextFloat() * 0.6F - 0.3F; + final int l = te.getFacing(); + final float f = x + 0.5F; + final float f1 = y + 0.0F + ((random.nextFloat() * 6.0F) / 16.0F); + final float f2 = z + 0.5F; + final float f3 = 0.52F; + final float f4 = (random.nextFloat() * 0.6F) - 0.3F; switch (l) { - case 4: + case 4: world.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); world.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); break; - case 5: + case 5: world.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); world.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); break; - case 2: + case 2: world.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); world.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); break; - case 3: + case 3: world.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); } } else if (meta == 5) { - TileEntityNuclearReactorElectric te = (TileEntityNuclearReactorElectric)getOwnTe(world, x, y, z); + final TileEntityNuclearReactorElectric te = (TileEntityNuclearReactorElectric)this.getOwnTe(world, x, y, z); if (te == null) { return; } @@ -188,7 +186,7 @@ extends BlockMultiID } @Override - public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int side, float a, float b, float c) + public boolean onBlockActivated(final World world, final int i, final int j, final int k, final EntityPlayer entityplayer, final int side, final float a, final float b, final float c) { if ((entityplayer.getCurrentEquippedItem() != null) && (entityplayer.getCurrentEquippedItem().isItemEqual(Ic2Items.reactorChamber))) { return false; @@ -198,7 +196,7 @@ extends BlockMultiID @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack stack) + public EnumRarity getRarity(final ItemStack stack) { return stack.getItemDamage() == 5 ? EnumRarity.uncommon : EnumRarity.common; } diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java index cea09bdd5c..d057da8715 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java +++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.ic2.block.RTGGenerator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RTG; import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.GUI_RTG; import ic2.core.ContainerBase; @@ -10,8 +12,6 @@ import ic2.core.block.invslot.InvSlotConsumableId; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TileEntityRTG extends TileEntityRTGenerator @@ -24,26 +24,26 @@ extends TileEntityRTGenerator } @Override - public int gaugeFuelScaled(int i) + public int gaugeFuelScaled(final int i) { return i; } @Override - public boolean gainEnergy() - { - int counter = 0; - for (int i = 0; i < this.fuelSlot.size(); i++) { - if (this.fuelSlot.get(i) != null) { - counter++; - } - } - if (counter == 0) { - return false; - } - this.storage += (int)Math.pow(2.0D, counter - 1); - return true; - } + public boolean gainEnergy() + { + int counter = 0; + for (int i = 0; i < this.fuelSlot.size(); i++) { + if (this.fuelSlot.get(i) != null) { + counter++; + } + } + if (counter == 0) { + return false; + } + this.storage += (int)Math.pow(2.0D, counter - 1); + return true; + } @Override public boolean gainFuel() @@ -62,16 +62,16 @@ extends TileEntityRTGenerator { return "RTG"; } - + @Override - public ContainerBase<TileEntityRTGenerator> getGuiContainer(EntityPlayer entityPlayer) + public ContainerBase<TileEntityRTGenerator> getGuiContainer(final EntityPlayer entityPlayer) { return new CONTAINER_RTG(entityPlayer, this); } @Override @SideOnly(Side.CLIENT) - public GuiScreen getGui(EntityPlayer entityPlayer, boolean isAdmin) + public GuiScreen getGui(final EntityPlayer entityPlayer, final boolean isAdmin) { return new GUI_RTG(new CONTAINER_RTG(entityPlayer, this)); } @@ -82,5 +82,5 @@ extends TileEntityRTGenerator return true; } - + } diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java index e9c7b5cc81..eae0c3dd9c 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java +++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java @@ -1,34 +1,33 @@ package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui; +import java.util.List; + import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG; import ic2.core.block.generator.container.ContainerRTGenerator; import ic2.core.slot.SlotInvSlot; - -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; public class CONTAINER_RTG extends ContainerRTGenerator { - public CONTAINER_RTG(EntityPlayer entityPlayer, TileEntityRTG tileEntity1) + public CONTAINER_RTG(final EntityPlayer entityPlayer, final TileEntityRTG tileEntity1) { super(entityPlayer, tileEntity1); for (int i = 0; i < 4; i++) { - addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + i * 18, 18)); + this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + (i * 18), 18)); } for (int i = 4; i < 8; i++) { - addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + (i - 4) * 18, 36)); + this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + ((i - 4) * 18), 36)); } for (int i = 8; i < 12; i++) { - addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + (i - 8) * 18, 54)); + this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + ((i - 8) * 18), 54)); } } @Override public List<String> getNetworkedFields() { - List<String> ret = super.getNetworkedFields(); + final List<String> ret = super.getNetworkedFields(); ret.add("storage"); diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java index 34ac0af814..72edb4403d 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java +++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java @@ -1,5 +1,9 @@ package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG; import ic2.core.IC2; import ic2.core.block.generator.gui.GuiRTGenerator; @@ -7,45 +11,40 @@ import ic2.core.util.GuiTooltipHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GUI_RTG - extends GuiRTGenerator +extends GuiRTGenerator { - public CONTAINER_RTG container; - - public GUI_RTG(CONTAINER_RTG container1) - { - super(container1); - - this.container = container1; - this.name = "RTG Mach II"; - } - - @Override -protected void drawGuiContainerForegroundLayer(int par1, int par2) - { - this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 4, 4210752); - - GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocalFormatted("ic2.generic.text.bufferEU", new Object[] { Double.valueOf(((TileEntityRTG)this.container.base).storage) }), 117, 38, 150, 48); - } - - @Override -protected void drawGuiContainerBackgroundLayer(float f, int x, int y) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); - int j = (this.width - this.xSize) / 2; - int k = (this.height - this.ySize) / 2; - drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize); - - int i1 = ((TileEntityRTG)this.container.base).gaugeStorageScaled(31); - drawTexturedModalRect(j + 119, k + 40, 179, 3, i1, 8); - } - - private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain, "textures/gui/GUIRTGenerator.png"); + public CONTAINER_RTG container; + + public GUI_RTG(final CONTAINER_RTG container1) + { + super(container1); + + this.container = container1; + this.name = "RTG Mach II"; + } + + @Override + protected void drawGuiContainerForegroundLayer(final int par1, final int par2) + { + this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 4, 4210752); + + GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocalFormatted("ic2.generic.text.bufferEU", new Object[] { Double.valueOf(((TileEntityRTG)this.container.base).storage) }), 117, 38, 150, 48); + } + + @Override + protected void drawGuiContainerBackgroundLayer(final float f, final int x, final int y) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.mc.getTextureManager().bindTexture(background); + final int j = (this.width - this.xSize) / 2; + final int k = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize); + + final int i1 = ((TileEntityRTG)this.container.base).gaugeStorageScaled(31); + this.drawTexturedModalRect(j + 119, k + 40, 179, 3, i1, 8); + } + + private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain, "textures/gui/GUIRTGenerator.png"); } diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java index 74d94011ea..db608e25b2 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java +++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.ic2.block.kieticgenerator; +import org.apache.commons.lang3.mutable.MutableObject; + +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import ic2.core.block.BlockMultiID; import ic2.core.block.kineticgenerator.tileentity.TileEntityManualKineticGenerator; @@ -12,65 +15,61 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import org.apache.commons.lang3.mutable.MutableObject; - -import cpw.mods.fml.common.registry.GameRegistry; - public class IC2_BlockKineticGenerator - extends BlockMultiID +extends BlockMultiID { - public IC2_BlockKineticGenerator(InternalName internalName1) - { - super(internalName1, Material.iron, ItemKineticGenerator.class); - - setHardness(3.0F); - setStepSound(Block.soundTypeMetal); - this.setCreativeTab(AddToCreativeTab.tabMachines); - - GameRegistry.registerTileEntity(TileEntityWindKineticGenerator.class, "Advanced Kinetic Wind Generator"); - - } - - @Override -public String getTextureFolder(int id) - { - return "kineticgenerator"; - } - - @Override -public int damageDropped(int meta) - { - return meta; - } - - @Override -public Class<? extends TileEntity> getTeClass(int meta, MutableObject<Class<?>[]> ctorArgTypes, MutableObject<Object[]> ctorArgs) - { - try - { - switch (meta) - { - case 0: - return TileEntityWindKineticGenerator.class; - } - } - catch (Exception e) - { - throw new RuntimeException(e); - } - return null; - } - - @Override -public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float a, float b, float c) - { - if (entityPlayer.isSneaking()) { - return false; - } - TileEntity te = getOwnTe(world, x, y, z); - if ((te != null) && ((te instanceof TileEntityManualKineticGenerator))) { - return ((TileEntityManualKineticGenerator)te).playerKlicked(entityPlayer); - } - return super.onBlockActivated(world, x, y, z, entityPlayer, side, a, b, c); - } + public IC2_BlockKineticGenerator(final InternalName internalName1) + { + super(internalName1, Material.iron, ItemKineticGenerator.class); + + this.setHardness(3.0F); + this.setStepSound(Block.soundTypeMetal); + this.setCreativeTab(AddToCreativeTab.tabMachines); + + GameRegistry.registerTileEntity(TileEntityWindKineticGenerator.class, "Advanced Kinetic Wind Generator"); + + } + + @Override + public String getTextureFolder(final int id) + { + return "kineticgenerator"; + } + + @Override + public int damageDropped(final int meta) + { + return meta; + } + + @Override + public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes, final MutableObject<Object[]> ctorArgs) + { + try + { + switch (meta) + { + case 0: + return TileEntityWindKineticGenerator.class; + } + } + catch (final Exception e) + { + throw new RuntimeException(e); + } + return null; + } + + @Override + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer entityPlayer, final int side, final float a, final float b, final float c) + { + if (entityPlayer.isSneaking()) { + return false; + } + final TileEntity te = this.getOwnTe(world, x, y, z); + if ((te != null) && ((te instanceof TileEntityManualKineticGenerator))) { + return ((TileEntityManualKineticGenerator)te).playerKlicked(entityPlayer); + } + return super.onBlockActivated(world, x, y, z, entityPlayer, side, a, b, c); + } } diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java index f356441921..3f42cea00a 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java +++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java @@ -1,48 +1,47 @@ package gtPlusPlus.xmod.ic2.block.kieticgenerator; -import ic2.core.block.TileEntityBlock; - import java.io.DataInput; import java.io.IOException; +import ic2.core.block.TileEntityBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; public abstract class IC2_TEComponent { - protected final TileEntityBlock parent; - - public IC2_TEComponent(TileEntityBlock parent) - { - this.parent = parent; - } - - public abstract String getDefaultName(); - - public void readFromNbt(NBTTagCompound nbt) {} - - public NBTTagCompound writeToNbt() - { - return null; - } - - public void onLoaded() {} - - public void onUnloaded() {} - - public void onNeighborUpdate(Block srcBlock) {} - - public void onContainerUpdate(String name, EntityPlayerMP player) {} - - public void onNetworkUpdate(DataInput is) - throws IOException - {} - - public boolean enableWorldTick() - { - return false; - } - - public void onWorldTick() {} + protected final TileEntityBlock parent; + + public IC2_TEComponent(final TileEntityBlock parent) + { + this.parent = parent; + } + + public abstract String getDefaultName(); + + public void readFromNbt(final NBTTagCompound nbt) {} + + public NBTTagCompound writeToNbt() + { + return null; + } + + public void onLoaded() {} + + public void onUnloaded() {} + + public void onNeighborUpdate(final Block srcBlock) {} + + public void onContainerUpdate(final String name, final EntityPlayerMP player) {} + + public void onNetworkUpdate(final DataInput is) + throws IOException + {} + + public boolean enableWorldTick() + { + return false; + } + + public void onWorldTick() {} } diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java index b3ceea52d4..37f9436983 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java +++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java @@ -1,27 +1,27 @@ package gtPlusPlus.xmod.ic2.block.kieticgenerator.container; +import java.util.List; + import ic2.core.ContainerFullInv; import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator; import ic2.core.slot.SlotInvSlot; - -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; public class ContainerKineticWindgenerator - extends ContainerFullInv<TileEntityWindKineticGenerator> +extends ContainerFullInv<TileEntityWindKineticGenerator> { - public ContainerKineticWindgenerator(EntityPlayer entityPlayer, TileEntityWindKineticGenerator tileEntity1) - { - super(entityPlayer, tileEntity1, 166); - - addSlotToContainer(new SlotInvSlot(tileEntity1.rotorSlot, 0, 80, 26)); - } - - public List<String> getNetworkedFields() - { - List<String> ret = super.getNetworkedFields(); - ret.add("windStrength"); - return ret; - } + public ContainerKineticWindgenerator(final EntityPlayer entityPlayer, final TileEntityWindKineticGenerator tileEntity1) + { + super(entityPlayer, tileEntity1, 166); + + this.addSlotToContainer(new SlotInvSlot(tileEntity1.rotorSlot, 0, 80, 26)); + } + + @Override + public List<String> getNetworkedFields() + { + final List<String> ret = super.getNetworkedFields(); + ret.add("windStrength"); + return ret; + } } diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java index f677e7fcfb..2d9dadb9b8 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java +++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java @@ -1,76 +1,76 @@ package gtPlusPlus.xmod.ic2.block.kieticgenerator.gui; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.core.IC2; import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator; -import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator; import ic2.core.util.GuiTooltipHelper; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiKineticWindGenerator - extends GuiContainer +extends GuiContainer { - public ContainerWindKineticGenerator container; - public String name; - - public GuiKineticWindGenerator(ContainerWindKineticGenerator container1) - { - super(container1); - - this.container = container1; - this.name = StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.name"); - } - - protected void drawGuiContainerForegroundLayer(int par1, int par2) - { - this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 6, 4210752); - if (((TileEntityWindKineticGenerator)this.container.base).checkrotor()) - { - if (!((TileEntityWindKineticGenerator)this.container.base).rotorspace()) - { - this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotorspace"), 20, 52, 2157374); - } - else if ((((TileEntityWindKineticGenerator)this.container.base).checkrotor()) && (!((TileEntityWindKineticGenerator)this.container.base).guiisminWindStrength())) - { - this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"), 27, 52, 2157374); - this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak2"), 24, 69, 2157374); - } - else - { - this.fontRendererObj.drawString(StatCollector.translateToLocalFormatted("ic2.WindKineticGenerator.gui.output", new Object[] { Integer.valueOf(((TileEntityWindKineticGenerator)this.container.base).getKuOutput()) }), 55, 52, 2157374); - this.fontRendererObj.drawString(((TileEntityWindKineticGenerator)this.container.base).getRotorhealth() + " %", 46, 70, 2157374); - if (((TileEntityWindKineticGenerator)this.container.base).guiisoverload()) - { - GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), 44, 20, 79, 45); - GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload2"), 102, 20, 131, 45); - } - } - } - else { - this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"), 27, 52, 2157374); - } - } - - protected void drawGuiContainerBackgroundLayer(float f, int x, int y) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); - int j = (this.width - this.xSize) / 2; - int k = (this.height - this.ySize) / 2; - drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize); - if ((((TileEntityWindKineticGenerator)this.container.base).guiisoverload()) && (((TileEntityWindKineticGenerator)this.container.base).checkrotor())) - { - drawTexturedModalRect(j + 44, k + 20, 176, 0, 30, 26); - drawTexturedModalRect(j + 102, k + 20, 176, 0, 30, 26); - } - } - - private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain, "textures/gui/GUIWindKineticGenerator.png"); + public ContainerWindKineticGenerator container; + public String name; + + public GuiKineticWindGenerator(final ContainerWindKineticGenerator container1) + { + super(container1); + + this.container = container1; + this.name = StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.name"); + } + + @Override + protected void drawGuiContainerForegroundLayer(final int par1, final int par2) + { + this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 6, 4210752); + if (this.container.base.checkrotor()) + { + if (!this.container.base.rotorspace()) + { + this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotorspace"), 20, 52, 2157374); + } + else if ((this.container.base.checkrotor()) && (!this.container.base.guiisminWindStrength())) + { + this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"), 27, 52, 2157374); + this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak2"), 24, 69, 2157374); + } + else + { + this.fontRendererObj.drawString(StatCollector.translateToLocalFormatted("ic2.WindKineticGenerator.gui.output", new Object[] { Integer.valueOf(this.container.base.getKuOutput()) }), 55, 52, 2157374); + this.fontRendererObj.drawString(this.container.base.getRotorhealth() + " %", 46, 70, 2157374); + if (this.container.base.guiisoverload()) + { + GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), 44, 20, 79, 45); + GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload2"), 102, 20, 131, 45); + } + } + } + else { + this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"), 27, 52, 2157374); + } + } + + @Override + protected void drawGuiContainerBackgroundLayer(final float f, final int x, final int y) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.mc.getTextureManager().bindTexture(background); + final int j = (this.width - this.xSize) / 2; + final int k = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize); + if ((this.container.base.guiisoverload()) && (this.container.base.checkrotor())) + { + this.drawTexturedModalRect(j + 44, k + 20, 176, 0, 30, 26); + this.drawTexturedModalRect(j + 102, k + 20, 176, 0, 30, 26); + } + } + + private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain, "textures/gui/GUIWindKineticGenerator.png"); } diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java index e2140f9fce..29206c398d 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java +++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java @@ -1,5 +1,10 @@ package gtPlusPlus.xmod.ic2.block.kieticgenerator.tileentity; +import java.util.List; +import java.util.Vector; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.energy.tile.IKineticSource; import ic2.api.item.IKineticRotor; import ic2.api.item.IKineticRotor.GearboxType; @@ -8,12 +13,7 @@ import ic2.core.block.invslot.InvSlotConsumableKineticRotor; import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator; import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator; -import ic2.core.network.NetworkManager; import ic2.core.util.Util; - -import java.util.List; -import java.util.Vector; - import net.minecraft.block.Block; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; @@ -22,8 +22,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.ChunkCache; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TileEntityKineticWindGenerator extends TileEntityWindKineticGenerator @@ -40,63 +38,63 @@ implements IKineticSource, IHasGui public TileEntityKineticWindGenerator() { - this.updateTicker = IC2.random.nextInt(getTickRate()); + this.updateTicker = IC2.random.nextInt(this.getTickRate()); this.rotorSlot = new InvSlotConsumableKineticRotor(this, "rotorslot", 0, null, 1, null, GearboxType.WIND); } - + public void update2Entity() { super.updateEntity(); assert (IC2.platform.isSimulating()); - if (this.updateTicker++ % getTickRate() != 0) { + if ((this.updateTicker++ % this.getTickRate()) != 0) { return; } boolean needsInvUpdate = false; if (!this.rotorSlot.isEmpty()) { - if (checkSpace(1, true) == 0) + if (this.checkSpace(1, true) == 0) { - if (getActive() != true) { - setActive(true); + if (this.getActive() != true) { + this.setActive(true); } needsInvUpdate = true; } else { - if (getActive()) { - setActive(false); + if (this.getActive()) { + this.setActive(false); } needsInvUpdate = true; } } else { - if (getActive()) { - setActive(false); + if (this.getActive()) { + this.setActive(false); } needsInvUpdate = true; } - if (getActive()) + if (this.getActive()) { - this.crossSection = (getRotorDiameter() / 2 * 2 * 2 + 1); + this.crossSection = (((this.getRotorDiameter() / 2) * 2 * 2) + 1); this.crossSection *= this.crossSection; - this.obstructedCrossSection = checkSpace(getRotorDiameter() * 3, false); - if ((this.obstructedCrossSection > 0) && (this.obstructedCrossSection <= (getRotorDiameter() + 1) / 2)) { + this.obstructedCrossSection = this.checkSpace(this.getRotorDiameter() * 3, false); + if ((this.obstructedCrossSection > 0) && (this.obstructedCrossSection <= ((this.getRotorDiameter() + 1) / 2))) { this.obstructedCrossSection = 0; } else if (this.obstructedCrossSection < 0) { this.obstructedCrossSection = this.crossSection; } - this.windStrength = calcWindStrength(); + this.windStrength = this.calcWindStrength(); - float speed = (float)Util.limit((this.windStrength - getMinWindStrength()) / getMaxWindStrength(), 0.0D, 2.0D); + final float speed = (float)Util.limit((this.windStrength - this.getMinWindStrength()) / this.getMaxWindStrength(), 0.0D, 2.0D); - setRotationSpeed(speed*2); - if (this.windStrength >= getMinWindStrength()) { - if (this.windStrength <= getMaxWindStrength()) { + this.setRotationSpeed(speed*2); + if (this.windStrength >= this.getMinWindStrength()) { + if (this.windStrength <= this.getMaxWindStrength()) { this.rotorSlot.damage(1, false); } else { this.rotorSlot.damage(4, false); @@ -110,7 +108,7 @@ implements IKineticSource, IHasGui @Override public List<String> getNetworkedFields() { - List<String> ret = new Vector<String>(1); + final List<String> ret = new Vector<>(1); ret.add("rotationSpeed"); ret.add("rotorSlot"); @@ -120,35 +118,35 @@ implements IKineticSource, IHasGui } @Override - public ContainerBase<TileEntityWindKineticGenerator> getGuiContainer(EntityPlayer entityPlayer) + public ContainerBase<TileEntityWindKineticGenerator> getGuiContainer(final EntityPlayer entityPlayer) { return new ContainerWindKineticGenerator(entityPlayer, this); } @Override @SideOnly(Side.CLIENT) - public GuiScreen getGui(EntityPlayer entityPlayer, boolean isAdmin) + public GuiScreen getGui(final EntityPlayer entityPlayer, final boolean isAdmin) { return new GuiWindKineticGenerator(new ContainerWindKineticGenerator(entityPlayer, this)); } @Override - public boolean facingMatchesDirection(ForgeDirection direction) + public boolean facingMatchesDirection(final ForgeDirection direction) { - return direction.ordinal() == getFacing(); + return direction.ordinal() == this.getFacing(); } @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) + public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final int side) { if ((side == 0) || (side == 1)) { return false; } - return getFacing() != side; + return this.getFacing() != side; } @Override - public void setFacing(short side) + public void setFacing(final short side) { super.setFacing(side); } @@ -162,22 +160,22 @@ implements IKineticSource, IHasGui public String getRotorhealth() { if (!this.rotorSlot.isEmpty()) { - return StatCollector.translateToLocalFormatted("ic2.WindKineticGenerator.gui.rotorhealth", new Object[] { Integer.valueOf((int)(100.0F - this.rotorSlot.get().getItemDamage() / this.rotorSlot.get().getMaxDamage() * 100.0F)) }); + return StatCollector.translateToLocalFormatted("ic2.WindKineticGenerator.gui.rotorhealth", new Object[] { Integer.valueOf((int)(100.0F - ((this.rotorSlot.get().getItemDamage() / this.rotorSlot.get().getMaxDamage()) * 100.0F))) }); } return ""; } @Override - public int maxrequestkineticenergyTick(ForgeDirection directionFrom) + public int maxrequestkineticenergyTick(final ForgeDirection directionFrom) { - return getKuOutput(); + return this.getKuOutput(); } @Override - public int requestkineticenergy(ForgeDirection directionFrom, int requestkineticenergy) + public int requestkineticenergy(final ForgeDirection directionFrom, final int requestkineticenergy) { - if (facingMatchesDirection(directionFrom.getOpposite())) { - return Math.min(requestkineticenergy, getKuOutput()); + if (this.facingMatchesDirection(directionFrom.getOpposite())) { + return Math.min(requestkineticenergy, this.getKuOutput()); } return 0; } @@ -189,18 +187,18 @@ implements IKineticSource, IHasGui } @Override - public void onGuiClosed(EntityPlayer entityPlayer) {} + public void onGuiClosed(final EntityPlayer entityPlayer) {} @Override - public boolean shouldRenderInPass(int pass) + public boolean shouldRenderInPass(final int pass) { return pass == 0; } @Override - public int checkSpace(int length, boolean onlyrotor) + public int checkSpace(int length, final boolean onlyrotor) { - int box = getRotorDiameter() / 2; + int box = this.getRotorDiameter() / 2; int lentemp = 0; if (onlyrotor) { @@ -210,36 +208,36 @@ implements IKineticSource, IHasGui if (!onlyrotor) { box *= 2; } - ForgeDirection fwdDir = ForgeDirection.VALID_DIRECTIONS[getFacing()]; - ForgeDirection rightDir = fwdDir.getRotation(ForgeDirection.DOWN); + final ForgeDirection fwdDir = ForgeDirection.VALID_DIRECTIONS[this.getFacing()]; + final ForgeDirection rightDir = fwdDir.getRotation(ForgeDirection.DOWN); - int xMaxDist = Math.abs(length * fwdDir.offsetX + box * rightDir.offsetX); + final int xMaxDist = Math.abs((length * fwdDir.offsetX) + (box * rightDir.offsetX)); - int zMaxDist = Math.abs(length * fwdDir.offsetZ + box * rightDir.offsetZ); + final int zMaxDist = Math.abs((length * fwdDir.offsetZ) + (box * rightDir.offsetZ)); - ChunkCache chunkCache = new ChunkCache(this.worldObj, this.xCoord - xMaxDist, this.yCoord - box, this.zCoord - zMaxDist, this.xCoord + xMaxDist, this.yCoord + box, this.zCoord + zMaxDist, 0); + final ChunkCache chunkCache = new ChunkCache(this.worldObj, this.xCoord - xMaxDist, this.yCoord - box, this.zCoord - zMaxDist, this.xCoord + xMaxDist, this.yCoord + box, this.zCoord + zMaxDist, 0); int ret = 0; for (int up = -box; up <= box; up++) { - int y = this.yCoord + up; + final int y = this.yCoord + up; for (int right = -box; right <= box; right++) { boolean occupied = false; for (int fwd = lentemp - length; fwd <= length; fwd++) { - int x = this.xCoord + fwd * fwdDir.offsetX + right * rightDir.offsetX; + final int x = this.xCoord + (fwd * fwdDir.offsetX) + (right * rightDir.offsetX); - int z = this.zCoord + fwd * fwdDir.offsetZ + right * rightDir.offsetZ; + final int z = this.zCoord + (fwd * fwdDir.offsetZ) + (right * rightDir.offsetZ); assert (Math.abs(x - this.xCoord) <= xMaxDist); assert (Math.abs(z - this.zCoord) <= zMaxDist); - Block block = chunkCache.getBlock(x, y, z); + final Block block = chunkCache.getBlock(x, y, z); if (!block.isAir(chunkCache, x, y, z)) { occupied = true; @@ -265,15 +263,15 @@ implements IKineticSource, IHasGui @Override public boolean rotorspace() { - return checkSpace(1, true) == 0; + return this.checkSpace(1, true) == 0; } - private void setRotationSpeed(float speed) + private void setRotationSpeed(final float speed) { if (this.rotationSpeed != speed) { this.rotationSpeed = speed; - ((NetworkManager)IC2.network.get()).updateTileEntityField(this, "rotationSpeed"); + IC2.network.get().updateTileEntityField(this, "rotationSpeed"); } } @@ -299,10 +297,10 @@ implements IKineticSource, IHasGui { if (this.rotationSpeed > 0.0F) { - long period = (long) (5.0E+008F / this.rotationSpeed); + final long period = (long) (5.0E+008F / this.rotationSpeed); - return (float)(System.nanoTime() % period) / (float)period * 360.0F; + return ((float)(System.nanoTime() % period) / (float)period) * 360.0F; } return 0.0F; } @@ -310,7 +308,7 @@ implements IKineticSource, IHasGui @Override public float getefficiency() { - ItemStack stack = this.rotorSlot.get(); + final ItemStack stack = this.rotorSlot.get(); if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { return (float) (((IKineticRotor)stack.getItem()).getEfficiency(stack)*1.5); } @@ -320,7 +318,7 @@ implements IKineticSource, IHasGui @Override public int getMinWindStrength() { - ItemStack stack = this.rotorSlot.get(); + final ItemStack stack = this.rotorSlot.get(); if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { return ((IKineticRotor)stack.getItem()).getMinWindStrength(stack)/2; } @@ -330,7 +328,7 @@ implements IKineticSource, IHasGui @Override public int getMaxWindStrength() { - ItemStack stack = this.rotorSlot.get(); + final ItemStack stack = this.rotorSlot.get(); if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { return ((IKineticRotor)stack.getItem()).getMaxWindStrength(stack)*2; } @@ -340,7 +338,7 @@ implements IKineticSource, IHasGui @Override public int getRotorDiameter() { - ItemStack stack = this.rotorSlot.get(); + final ItemStack stack = this.rotorSlot.get(); if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { return ((IKineticRotor)stack.getItem()).getDiameter(stack)/2; } @@ -350,7 +348,7 @@ implements IKineticSource, IHasGui @Override public ResourceLocation getRotorRenderTexture() { - ItemStack stack = this.rotorSlot.get(); + final ItemStack stack = this.rotorSlot.get(); if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { return ((IKineticRotor)stack.getItem()).getRotorRenderTexture(stack); } @@ -360,7 +358,7 @@ implements IKineticSource, IHasGui @Override public boolean guiisoverload() { - if (this.windStrength > getMaxWindStrength()) { + if (this.windStrength > this.getMaxWindStrength()) { return true; } return false; @@ -369,14 +367,14 @@ implements IKineticSource, IHasGui @Override public boolean guiisminWindStrength() { - return this.windStrength >= getMinWindStrength(); + return this.windStrength >= this.getMinWindStrength(); } @Override public int getKuOutput() { - if ((this.windStrength >= getMinWindStrength()) && (getActive())) { - return (int)(this.windStrength * 50.0D * getefficiency()); + if ((this.windStrength >= this.getMinWindStrength()) && (this.getActive())) { + return (int)(this.windStrength * 50.0D * this.getefficiency()); } return 0; } diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java index e258d437d3..5aecd9c5ec 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java +++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java @@ -1,39 +1,38 @@ package gtPlusPlus.xmod.ic2.item; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.CoreItem; - import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.CoreItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.*; public class IC2_ItemGradual extends CoreItem { - public IC2_ItemGradual(String internalName) + public IC2_ItemGradual(final String internalName) { super(internalName, AddToCreativeTab.tabMachines, 1, 10000, "", EnumRarity.uncommon); - setNoRepair(); + this.setNoRepair(); } @Override - public boolean isDamaged(ItemStack stack) + public boolean isDamaged(final ItemStack stack) { - return getDamage(stack) > 1; + return this.getDamage(stack) > 1; } @Override - public boolean showDurabilityBar(ItemStack stack) + public boolean showDurabilityBar(final ItemStack stack) { return true; } @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List itemList) + public void getSubItems(final Item item, final CreativeTabs tabs, final List itemList) { itemList.add(new ItemStack(this, 1, 1)); } diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java index 4922e0f806..004713f092 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java +++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java @@ -7,47 +7,47 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class IC2_ItemGradualInteger - extends IC2_ItemGradual - implements ICustomDamageItem +extends IC2_ItemGradual +implements ICustomDamageItem { - private final int maxDmg; - - public IC2_ItemGradualInteger(String internalName, int maxdmg) - { - super(internalName); - - this.maxDmg = maxdmg; - } - - @Override -public int getCustomDamage(ItemStack stack) - { - NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); - return nbt.getInteger("advDmg"); - } - - @Override -public int getMaxCustomDamage(ItemStack stack) - { - return this.maxDmg; - } - - @Override -public void setCustomDamage(ItemStack stack, int damage) - { - NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); - nbt.setInteger("advDmg", 0); - - int maxStackDamage = stack.getMaxDamage(); - if (maxStackDamage > 2) { - //stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2)); - } - } - - @Override -public boolean applyCustomDamage(ItemStack stack, int damage, EntityLivingBase src) - { - setCustomDamage(stack, getCustomDamage(stack) + damage); - return true; - } + private final int maxDmg; + + public IC2_ItemGradualInteger(final String internalName, final int maxdmg) + { + super(internalName); + + this.maxDmg = maxdmg; + } + + @Override + public int getCustomDamage(final ItemStack stack) + { + final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); + return nbt.getInteger("advDmg"); + } + + @Override + public int getMaxCustomDamage(final ItemStack stack) + { + return this.maxDmg; + } + + @Override + public void setCustomDamage(final ItemStack stack, final int damage) + { + final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); + nbt.setInteger("advDmg", 0); + + final int maxStackDamage = stack.getMaxDamage(); + if (maxStackDamage > 2) { + //stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2)); + } + } + + @Override + public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src) + { + this.setCustomDamage(stack, this.getCustomDamage(stack) + damage); + return true; + } } diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java index b257124345..9d4990e76c 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java +++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java @@ -1,22 +1,22 @@ package gtPlusPlus.xmod.ic2.item; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class IC2_ItemIC2 extends Item { - public IC2_ItemIC2(String internalName) + public IC2_ItemIC2(final String internalName) { - setUnlocalizedName(internalName); - setCreativeTab(AddToCreativeTab.tabMachines); - setTextureName(CORE.MODID + ":" + internalName); + this.setUnlocalizedName(internalName); + this.setCreativeTab(AddToCreativeTab.tabMachines); + this.setTextureName(CORE.MODID + ":" + internalName); GameRegistry.registerItem(this, internalName); } @@ -73,18 +73,18 @@ extends Item } @Override - public String getUnlocalizedName(ItemStack itemStack) + public String getUnlocalizedName(final ItemStack itemStack) { - return getUnlocalizedName(); + return this.getUnlocalizedName(); } @Override - public String getItemStackDisplayName(ItemStack itemStack) + public String getItemStackDisplayName(final ItemStack itemStack) { - return StatCollector.translateToLocal(getUnlocalizedName(itemStack)); + return StatCollector.translateToLocal(this.getUnlocalizedName(itemStack)); } - public IC2_ItemIC2 setRarity(int aRarity) + public IC2_ItemIC2 setRarity(final int aRarity) { this.rarity = aRarity; return this; @@ -92,7 +92,7 @@ extends Item @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack stack) + public EnumRarity getRarity(final ItemStack stack) { return EnumRarity.values()[this.rarity]; } diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java index bf6f3bc1cd..2e9cec3c33 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java +++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java @@ -24,7 +24,7 @@ public class IC2_Items { public static ItemStack shaft_Material_2; //TungstenSteel public static ItemStack shaft_Material_3; //Vibrant Alloy public static ItemStack shaft_Material_4; //Iridium - + public static ItemStack blockRTG; public static ItemStack blockKineticGenerator; diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java b/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java index 2d73638ce9..046324a4ac 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java +++ b/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java @@ -1,55 +1,54 @@ package gtPlusPlus.xmod.ic2.item; -import ic2.core.item.block.ItemBlockIC2; - import java.util.List; +import ic2.core.item.block.ItemBlockIC2; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; public class ItemGenerators - extends ItemBlockIC2 +extends ItemBlockIC2 { - public ItemGenerators(Block block) - { - super(block); - - setMaxDamage(0); - setHasSubtypes(true); - } - - @Override -public int getMetadata(int i) - { - return i; - } - - @Override -public String getUnlocalizedName(ItemStack itemstack) - { - int meta = itemstack.getItemDamage(); - switch (meta) - { - case 0: - return "ic2.blockRTGenerator2"; - case 1: - return "ic2.blockKineticGenerator2"; - } - return null; - } - - @Override -public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean b) - { - int meta = itemStack.getItemDamage(); - switch (meta) - { - case 0: - info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-32 EU/t " + StatCollector.translateToLocal("ic2.item.tooltip.max")); break; - case 1: - info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-512 EU/t " + StatCollector.translateToLocal("ic2.item.tooltip.max")); - } - } + public ItemGenerators(final Block block) + { + super(block); + + this.setMaxDamage(0); + this.setHasSubtypes(true); + } + + @Override + public int getMetadata(final int i) + { + return i; + } + + @Override + public String getUnlocalizedName(final ItemStack itemstack) + { + final int meta = itemstack.getItemDamage(); + switch (meta) + { + case 0: + return "ic2.blockRTGenerator2"; + case 1: + return "ic2.blockKineticGenerator2"; + } + return null; + } + + @Override + public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) + { + final int meta = itemStack.getItemDamage(); + switch (meta) + { + case 0: + info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-32 EU/t " + StatCollector.translateToLocal("ic2.item.tooltip.max")); break; + case 1: + info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-512 EU/t " + StatCollector.translateToLocal("ic2.item.tooltip.max")); + } + } } diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java b/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java index dbea1dc299..9a8cdd5df1 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java +++ b/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java @@ -1,13 +1,12 @@ package gtPlusPlus.xmod.ic2.item; +import java.util.List; + import ic2.api.item.IKineticRotor; import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator; import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; import ic2.core.init.InternalName; import ic2.core.item.resources.ItemWindRotor; - -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -21,16 +20,16 @@ public class RotorBase extends ItemWindRotor{ private final int radius; private final float efficiency; private final ResourceLocation renderTexture; - private final boolean water; + private final boolean water; - public RotorBase(InternalName internalName, int Radius, int durability, float efficiency, int minWindStrength, int maxWindStrength, ResourceLocation RenderTexture) + public RotorBase(final InternalName internalName, final int Radius, final int durability, final float efficiency, final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture) { super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture); - setMaxStackSize(1); - setMaxDamage(durability); + this.setMaxStackSize(1); + this.setMaxDamage(durability); this.radius = Radius; this.efficiency = efficiency; @@ -41,7 +40,7 @@ public class RotorBase extends ItemWindRotor{ } @Override - public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean b) + public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) { info.add(StatCollector.translateToLocalFormatted("ic2.itemrotor.wind.info", new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) })); IKineticRotor.GearboxType type = null; @@ -62,36 +61,37 @@ public class RotorBase extends ItemWindRotor{ } @Override - public int getDiameter(ItemStack stack) + public int getDiameter(final ItemStack stack) { return this.radius; } @Override - public ResourceLocation getRotorRenderTexture(ItemStack stack) + public ResourceLocation getRotorRenderTexture(final ItemStack stack) { return this.renderTexture; } @Override - public float getEfficiency(ItemStack stack) + public float getEfficiency(final ItemStack stack) { return this.efficiency; } @Override - public int getMinWindStrength(ItemStack stack) + public int getMinWindStrength(final ItemStack stack) { return this.minWindStrength; } @Override - public int getMaxWindStrength(ItemStack stack) + public int getMaxWindStrength(final ItemStack stack) { return this.maxWindStrength; } - public boolean isAcceptedType(ItemStack stack, IKineticRotor.GearboxType type) + @Override + public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type) { return (type == IKineticRotor.GearboxType.WIND) || (this.water); } diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java b/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java index f35b1e88f0..e76d689533 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java +++ b/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java @@ -1,13 +1,12 @@ package gtPlusPlus.xmod.ic2.item; +import java.util.List; + import ic2.api.item.IKineticRotor; import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator; import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; import ic2.core.init.InternalName; import ic2.core.util.StackUtil; - -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -23,16 +22,16 @@ public class RotorIridium extends RotorBase{ private final int radius; private final float efficiency; private final ResourceLocation renderTexture; - private final boolean water; + private final boolean water; - public RotorIridium(InternalName internalName, int Radius, int durability, float efficiency, int minWindStrength, int maxWindStrength, ResourceLocation RenderTexture) + public RotorIridium(final InternalName internalName, final int Radius, final int durability, final float efficiency, final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture) { super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture); - - - setMaxStackSize(1); - setMaxDamage(Integer.MAX_VALUE); + + + this.setMaxStackSize(1); + this.setMaxDamage(Integer.MAX_VALUE); this.radius = Radius; this.efficiency = efficiency; @@ -43,7 +42,7 @@ public class RotorIridium extends RotorBase{ } @Override - public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean b) + public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) { info.add(StatCollector.translateToLocalFormatted("ic2.itemrotor.wind.info", new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) })); IKineticRotor.GearboxType type = null; @@ -59,63 +58,64 @@ public class RotorIridium extends RotorBase{ @Override public String getTextureFolder() - { - return "rotors"; - } - - @Override - public int getDiameter(ItemStack stack) - { - return this.radius; - } - - @Override - public ResourceLocation getRotorRenderTexture(ItemStack stack) - { - return this.renderTexture; - } - - @Override - public float getEfficiency(ItemStack stack) - { - return this.efficiency; - } - - @Override - public int getMinWindStrength(ItemStack stack) - { - return this.minWindStrength; - } - - @Override - public int getMaxWindStrength(ItemStack stack) - { - return this.maxWindStrength; - } - - public boolean isAcceptedType(ItemStack stack, IKineticRotor.GearboxType type) - { - return (type == IKineticRotor.GearboxType.WIND) || (this.water); - } - - - @Override - public void setCustomDamage(ItemStack stack, int damage) - { - NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); - nbt.setInteger("advDmg", 0); - - int maxStackDamage = stack.getMaxDamage(); - if (maxStackDamage > 2) { - //stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2)); - } - } - - @Override - public boolean applyCustomDamage(ItemStack stack, int damage, EntityLivingBase src) - { - setCustomDamage(stack, getCustomDamage(stack) + damage); - return true; - } + { + return "rotors"; + } + + @Override + public int getDiameter(final ItemStack stack) + { + return this.radius; + } + + @Override + public ResourceLocation getRotorRenderTexture(final ItemStack stack) + { + return this.renderTexture; + } + + @Override + public float getEfficiency(final ItemStack stack) + { + return this.efficiency; + } + + @Override + public int getMinWindStrength(final ItemStack stack) + { + return this.minWindStrength; + } + + @Override + public int getMaxWindStrength(final ItemStack stack) + { + return this.maxWindStrength; + } + + @Override + public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type) + { + return (type == IKineticRotor.GearboxType.WIND) || (this.water); + } + + + @Override + public void setCustomDamage(final ItemStack stack, final int damage) + { + final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); + nbt.setInteger("advDmg", 0); + + final int maxStackDamage = stack.getMaxDamage(); + if (maxStackDamage > 2) { + //stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2)); + } } - + + @Override + public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src) + { + this.setCustomDamage(stack, this.getCustomDamage(stack) + damage); + return true; + } +} + diff --git a/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java index bf55a6cbf7..730e3c9032 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java +++ b/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java @@ -11,12 +11,12 @@ import gtPlusPlus.xmod.ic2.item.IC2_Items; import net.minecraft.item.ItemStack; public class RECIPE_IC2 { - + public static String plate_T1 = "plateEnergeticAlloy"; public static String plate_T2 = "plateTungstenSteel"; public static String plate_T3 = "plateVibrantAlloy"; public static String plate_T4 = "plateAlloyIridium"; - + public static ItemStack block_T1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.EnergeticAlloy, 1L); public static ItemStack block_T2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L); public static ItemStack block_T3 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.VibrantAlloy, 1L); @@ -26,12 +26,12 @@ public class RECIPE_IC2 { public static String ingot_T2 = "ingotTungstenSteel"; public static String ingot_T3 = "ingotVibrantAlloy"; public static String ingot_T4 = "ingotIridium"; - + private static ItemStack rotor_blade_T1 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_1.getItem()); private static ItemStack rotor_blade_T2 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_2.getItem()); private static ItemStack rotor_blade_T3 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_3.getItem()); private static ItemStack rotor_blade_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_4.getItem()); - + private static ItemStack shaft_T1 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_1.getItem()); private static ItemStack shaft_T2 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_2.getItem()); private static ItemStack shaft_T3 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_3.getItem()); @@ -41,14 +41,14 @@ public class RECIPE_IC2 { private static ItemStack rotor_T2 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_2.getItem()); private static ItemStack rotor_T3 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_3.getItem()); private static ItemStack rotor_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_4.getItem()); - + private static void checkForEnderIO(){ if(!LoadedMods.EnderIO){ plate_T1 = "plateMagnalium"; plate_T2 = "plateTungstenSteel"; plate_T3 = "plateUltimet"; plate_T4 = "plateAlloyIridium"; - + block_T1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Magnalium, 1L); block_T2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L); block_T3 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Ultimet, 1L); @@ -60,44 +60,44 @@ public class RECIPE_IC2 { ingot_T4 = "ingotIridium"; } } - + public static void initRecipes(){ - + //Rotor Blade Recipes RecipeUtils.recipeBuilder( plate_T1, ingot_T1, plate_T1, plate_T1, ingot_T1, plate_T1, plate_T1, ingot_T1, plate_T1, rotor_blade_T1); - + RecipeUtils.recipeBuilder( plate_T2, ingot_T2, plate_T2, plate_T2, ingot_T2, plate_T2, plate_T2, ingot_T2, plate_T2, rotor_blade_T2); - + RecipeUtils.recipeBuilder( plate_T3, ingot_T3, plate_T3, plate_T3, ingot_T3, plate_T3, plate_T3, ingot_T3, plate_T3, rotor_blade_T3); - + RecipeUtils.recipeBuilder( plate_T4, ingot_T4, plate_T4, plate_T4, ingot_T4, plate_T4, plate_T4, ingot_T4, plate_T4, rotor_blade_T4); - + //Shaft Extruder Recipe GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.DarkIron), Character.valueOf('S'), OrePrefixes.screw.get(Materials.DarkIron)}); GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('S'), OrePrefixes.screw.get(Materials.TungstenSteel)}); GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.Molybdenum), Character.valueOf('S'), OrePrefixes.screw.get(Materials.Molybdenum)}); Utils.LOG_INFO("Added recipe item for GT5 Extruder: Shaft Shape"); - + //Shaft Recipes GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T1, 2560, 250); if (LoadedMods.EnderIO){ - Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]"); + Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]"); } else { Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Magnalium]"); @@ -106,41 +106,41 @@ public class RECIPE_IC2 { Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [TungstenSteel]"); GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T3, 10240, 2000); if (LoadedMods.EnderIO){ - Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]"); + Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]"); } else { Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Ultimet]"); } GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T4), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T4, 20480, 4000); Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Iridium]"); - + //Rotor Recipes RecipeUtils.recipeBuilder( null, rotor_blade_T1, null, rotor_blade_T1, shaft_T1, rotor_blade_T1, null, rotor_blade_T1, null, rotor_T1); - + RecipeUtils.recipeBuilder( null, rotor_blade_T2, null, rotor_blade_T2, shaft_T2, rotor_blade_T2, null, rotor_blade_T2, null, rotor_T2); - + RecipeUtils.recipeBuilder( null, rotor_blade_T3, null, rotor_blade_T3, shaft_T3, rotor_blade_T3, null, rotor_blade_T3, null, rotor_T3); - + RecipeUtils.recipeBuilder( null, rotor_blade_T4, null, rotor_blade_T4, shaft_T4, rotor_blade_T4, null, rotor_blade_T4, null, - rotor_T4); - + rotor_T4); + } - - - + + + } |