diff options
author | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
---|---|---|
committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
commit | 55f64675b42ac8d3c557cc850f78664bee006f6f (patch) | |
tree | 2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/xmod/ic2 | |
parent | 0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff) | |
download | GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2 GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/ic2')
21 files changed, 343 insertions, 365 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java b/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java index 6ac8a86504..14ad5cff60 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java @@ -1,8 +1,9 @@ package gtPlusPlus.xmod.ic2; -import ic2.core.init.InternalName; import net.minecraftforge.common.util.EnumHelper; +import ic2.core.init.InternalName; + public class CustomInternalName { public static InternalName aHazmatHelmetEx; @@ -11,12 +12,12 @@ public class CustomInternalName { public static InternalName aHazmatBootsEx; public static void init() { - aHazmatHelmetEx = - EnumHelper.addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {}); - aHazmatChestEx = - EnumHelper.addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {}); - aHazmatLegsEx = - EnumHelper.addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {}); + aHazmatHelmetEx = EnumHelper + .addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {}); + aHazmatChestEx = EnumHelper + .addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {}); + aHazmatLegsEx = EnumHelper + .addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {}); aHazmatBootsEx = EnumHelper.addEnum(InternalName.class, "itemArmorRubBootsEx", new Class[] {}, new Object[] {}); } } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java index 03a2606f71..6e8cf675e8 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java @@ -1,5 +1,19 @@ package gtPlusPlus.xmod.ic2.block.RTGGenerator; +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; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +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; @@ -13,19 +27,9 @@ 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; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import org.apache.commons.lang3.mutable.MutableObject; public class BlockRTG extends BlockMultiID { + public BlockRTG(final InternalName internalName1) { super(internalName1, Material.iron, ItemGenerators.class); this.setCreativeTab(AddToCreativeTab.tabMachines); @@ -39,7 +43,7 @@ public class BlockRTG extends BlockMultiID { GameRegistry.registerTileEntity(TileEntityKineticWindGenerator.class, "Wind Ripper Mach II"); } - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void getSubBlocks(final Item j, final CreativeTabs tabs, final List itemList) { final Item item = Item.getItemFromBlock(this); @@ -71,8 +75,8 @@ public class BlockRTG extends BlockMultiID { } @Override - public Class<? extends TileEntity> getTeClass( - final int meta, final MutableObject<Class<?>[]> ctorArgTypes, final MutableObject<Object[]> ctorArgs) { + public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes, + final MutableObject<Object[]> ctorArgs) { try { switch (meta) { case 0: @@ -87,33 +91,13 @@ public class BlockRTG extends BlockMultiID { } /* - * - * { - case 0: - return TileEntityGenerator.class; - case 1: - return TileEntityGeoGenerator.class; - case 2: - return TileEntityWaterGenerator.class; - case 3: - return TileEntitySolarGenerator.class; - case 4: - return TileEntityWindGenerator.class; - case 5: - return TileEntityNuclearReactorElectric.class; - case 6: - return TileEntityRTGenerator.class; - case 7: - return TileEntitySemifluidGenerator.class; - case 8: - return TileEntityStirlingGenerator.class; - case 9: - return TileEntityKineticGenerator.class; - } - * - * (non-Javadoc) - * @see net.minecraft.block.Block#randomDisplayTick(net.minecraft.world.World, int, int, int, java.util.Random) - */ + * { case 0: return TileEntityGenerator.class; case 1: return TileEntityGeoGenerator.class; case 2: return + * TileEntityWaterGenerator.class; case 3: return TileEntitySolarGenerator.class; case 4: return + * TileEntityWindGenerator.class; case 5: return TileEntityNuclearReactorElectric.class; case 6: return + * TileEntityRTGenerator.class; case 7: return TileEntitySemifluidGenerator.class; case 8: return + * TileEntityStirlingGenerator.class; 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(final World world, final int x, final int y, final int z, final Random random) { @@ -150,8 +134,8 @@ public class BlockRTG extends BlockMultiID { world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); } } else if (meta == 5) { - final TileEntityNuclearReactorElectric te = - (TileEntityNuclearReactorElectric) this.getOwnTe(world, x, y, z); + final TileEntityNuclearReactorElectric te = (TileEntityNuclearReactorElectric) this + .getOwnTe(world, x, y, z); if (te == null) { return; } @@ -162,27 +146,31 @@ public class BlockRTG extends BlockMultiID { puffs = world.rand.nextInt(puffs); for (int n = 0; n < puffs; n++) { world.spawnParticle( - "smoke", x + random.nextFloat(), y + 0.95F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D); + "smoke", + x + random.nextFloat(), + y + 0.95F, + z + random.nextFloat(), + 0.0D, + 0.0D, + 0.0D); } puffs -= world.rand.nextInt(4) + 3; for (int n = 0; n < puffs; n++) { world.spawnParticle( - "flame", x + random.nextFloat(), y + 1.0F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D); + "flame", + x + random.nextFloat(), + y + 1.0F, + z + random.nextFloat(), + 0.0D, + 0.0D, + 0.0D); } } } @Override - 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) { + 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; diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java index 19602273c3..097e3bf50d 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java @@ -1,5 +1,9 @@ package gtPlusPlus.xmod.ic2.block.RTGGenerator; +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; import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RTG; @@ -9,15 +13,13 @@ import ic2.core.Ic2Items; import ic2.core.block.generator.tileentity.TileEntityRTGenerator; import ic2.core.block.invslot.InvSlotConsumable; import ic2.core.block.invslot.InvSlotConsumableId; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; public class TileEntityRTG extends TileEntityRTGenerator { + public final InvSlotConsumable fuelSlot; public TileEntityRTG() { - this.fuelSlot = new InvSlotConsumableId(this, "fuelSlot", 0, 12, new Item[] {Ic2Items.RTGPellets.getItem()}); + this.fuelSlot = new InvSlotConsumableId(this, "fuelSlot", 0, 12, new Item[] { Ic2Items.RTGPellets.getItem() }); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java index 9ac5476ed9..22a48e8916 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java @@ -1,12 +1,15 @@ package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; + 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(final EntityPlayer entityPlayer, final TileEntityRTG tileEntity1) { super(entityPlayer, tileEntity1); for (int i = 0; i < 4; i++) { diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java index 913d456553..1e22f66f32 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java @@ -1,17 +1,20 @@ package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui; +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; import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG; import ic2.core.IC2; import ic2.core.block.generator.gui.GuiRTGenerator; import ic2.core.util.GuiTooltipHelper; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GUI_RTG extends GuiRTGenerator { + public CONTAINER_RTG container; public GUI_RTG(final CONTAINER_RTG container1) { @@ -23,15 +26,15 @@ public class GUI_RTG extends GuiRTGenerator { @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); + 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)}), + new Object[] { Double.valueOf(((TileEntityRTG) this.container.base).storage) }), 117, 38, 150, @@ -50,6 +53,7 @@ public class GUI_RTG extends GuiRTGenerator { this.drawTexturedModalRect(j + 119, k + 40, 179, 3, i1, 8); } - private static final ResourceLocation background = - new ResourceLocation(IC2.textureDomain, "textures/gui/GUIRTGenerator.png"); + private static final ResourceLocation background = new ResourceLocation( + IC2.textureDomain, + "textures/gui/GUIRTGenerator.png"); } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java index 4f9a2ccab1..2391809eb7 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java @@ -1,5 +1,13 @@ package gtPlusPlus.xmod.ic2.block.kieticgenerator; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +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; import gtPlusPlus.core.creative.AddToCreativeTab; import ic2.core.block.BlockMultiID; @@ -7,14 +15,9 @@ import ic2.core.block.kineticgenerator.tileentity.TileEntityManualKineticGenerat import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator; import ic2.core.init.InternalName; import ic2.core.item.block.ItemKineticGenerator; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import org.apache.commons.lang3.mutable.MutableObject; public class IC2_BlockKineticGenerator extends BlockMultiID { + public IC2_BlockKineticGenerator(final InternalName internalName1) { super(internalName1, Material.iron, ItemKineticGenerator.class); @@ -36,8 +39,8 @@ public class IC2_BlockKineticGenerator extends BlockMultiID { } @Override - public Class<? extends TileEntity> getTeClass( - final int meta, final MutableObject<Class<?>[]> ctorArgTypes, final MutableObject<Object[]> ctorArgs) { + public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes, + final MutableObject<Object[]> ctorArgs) { try { switch (meta) { case 0: @@ -50,16 +53,8 @@ public class IC2_BlockKineticGenerator extends BlockMultiID { } @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) { + 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; } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java index 6b851e2666..fe08f7f959 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java @@ -1,13 +1,16 @@ package gtPlusPlus.xmod.ic2.block.kieticgenerator; -import ic2.core.block.TileEntityBlock; import java.io.DataInput; import java.io.IOException; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import ic2.core.block.TileEntityBlock; + public abstract class IC2_TEComponent { + protected final TileEntityBlock parent; public IC2_TEComponent(final TileEntityBlock parent) { diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java index 6bc79849c3..8c4e099889 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java @@ -1,14 +1,17 @@ package gtPlusPlus.xmod.ic2.block.kieticgenerator.container; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; + 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> { - public ContainerKineticWindgenerator( - final EntityPlayer entityPlayer, final TileEntityWindKineticGenerator tileEntity1) { + + public ContainerKineticWindgenerator(final EntityPlayer entityPlayer, + final TileEntityWindKineticGenerator tileEntity1) { super(entityPlayer, tileEntity1, 166); this.addSlotToContainer(new SlotInvSlot(tileEntity1.rotorSlot, 0, 80, 26)); diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java index b432bf4e15..29eaa6d69c 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java @@ -1,3 +1,4 @@ package gtPlusPlus.xmod.ic2.block.kieticgenerator.container; -public class IC2_ContainerBase {} +public class IC2_ContainerBase { +} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java index 27d4f014bb..33a59ee35a 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java @@ -1,17 +1,20 @@ package gtPlusPlus.xmod.ic2.block.kieticgenerator.gui; +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; import ic2.core.IC2; import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator; 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; @SideOnly(Side.CLIENT) public class GuiKineticWindGenerator extends GuiContainer { + public ContainerWindKineticGenerator container; public String name; @@ -24,22 +27,31 @@ public class GuiKineticWindGenerator extends GuiContainer { @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); + 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); + 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); + StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"), + 27, + 52, + 2157374); this.fontRendererObj.drawString( - StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak2"), 24, 69, 2157374); + 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())}), + new Object[] { Integer.valueOf(this.container.base.getKuOutput()) }), 55, 52, 2157374); @@ -65,7 +77,10 @@ public class GuiKineticWindGenerator extends GuiContainer { } } else { this.fontRendererObj.drawString( - StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"), 27, 52, 2157374); + StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"), + 27, + 52, + 2157374); } } @@ -82,6 +97,7 @@ public class GuiKineticWindGenerator extends GuiContainer { } } - private static final ResourceLocation background = - new ResourceLocation(IC2.textureDomain, "textures/gui/GUIWindKineticGenerator.png"); + private static final ResourceLocation background = new ResourceLocation( + IC2.textureDomain, + "textures/gui/GUIWindKineticGenerator.png"); } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java index 1f9ebcc8bd..f86562f1de 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java @@ -1,5 +1,17 @@ package gtPlusPlus.xmod.ic2.block.kieticgenerator.tileentity; +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; +import net.minecraft.item.ItemStack; +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; import ic2.api.energy.tile.IKineticSource; @@ -11,18 +23,9 @@ import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator; import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator; 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; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import net.minecraft.world.ChunkCache; -import net.minecraftforge.common.util.ForgeDirection; public class TileEntityKineticWindGenerator extends TileEntityWindKineticGenerator implements IKineticSource, IHasGui { + public final InvSlotConsumableKineticRotor rotorSlot; private double windStrength; private int obstructedCrossSection; @@ -76,8 +79,8 @@ public class TileEntityKineticWindGenerator extends TileEntityWindKineticGenerat } this.windStrength = this.calcWindStrength(); - final float speed = (float) - Util.limit((this.windStrength - this.getMinWindStrength()) / this.getMaxWindStrength(), 0.0D, 2.0D); + final float speed = (float) Util + .limit((this.windStrength - this.getMinWindStrength()) / this.getMaxWindStrength(), 0.0D, 2.0D); this.setRotationSpeed(speed * 2); if (this.windStrength >= this.getMinWindStrength()) { @@ -137,12 +140,12 @@ public class TileEntityKineticWindGenerator extends TileEntityWindKineticGenerat @Override 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 ""; } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java index 441e910f50..8dafc12de8 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java @@ -1,14 +1,7 @@ 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.lib.LoadedMods; -import ic2.api.item.IKineticRotor; -import ic2.core.IC2; -import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator; -import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -18,6 +11,15 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.lib.LoadedMods; +import ic2.api.item.IKineticRotor; +import ic2.core.IC2; +import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator; +import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; + public class CustomKineticRotor extends Item implements IKineticRotor { private final int mTier; @@ -25,31 +27,24 @@ public class CustomKineticRotor extends Item implements IKineticRotor { @SideOnly(Side.CLIENT) private IIcon[] mTextures; - private static final String[] mRegistrationNames = - new String[] {"itemwoodrotor", "itemironrotor", "itemsteelrotor", "itemwcarbonrotor"}; - - private static final String[] mUnlocalNames = new String[] { - "itemEnergeticRotor", - "itemTungstenSteelRotor", - "itemVibrantRotor", - "itemIridiumRotor", - "itemMagnaliumRotor", - "itemUltimetRotor", - }; - private static final int[] mMaxDurability = new int[] {512000, 809600, 1600000, 3200000}; - private static final int[] mRadius = new int[] {9, 11, 13, 15}; - private static final float[] mEfficiency = new float[] {0.9f, 1.0f, 1.2f, 1.5f}; - private static final int[] mMinWindStrength = new int[] {12, 14, 16, 18}; - private static final int[] mMaxWindStrength = new int[] {80, 120, 160, 320}; + private static final String[] mRegistrationNames = new String[] { "itemwoodrotor", "itemironrotor", + "itemsteelrotor", "itemwcarbonrotor" }; + + private static final String[] mUnlocalNames = new String[] { "itemEnergeticRotor", "itemTungstenSteelRotor", + "itemVibrantRotor", "itemIridiumRotor", "itemMagnaliumRotor", "itemUltimetRotor", }; + private static final int[] mMaxDurability = new int[] { 512000, 809600, 1600000, 3200000 }; + private static final int[] mRadius = new int[] { 9, 11, 13, 15 }; + private static final float[] mEfficiency = new float[] { 0.9f, 1.0f, 1.2f, 1.5f }; + private static final int[] mMinWindStrength = new int[] { 12, 14, 16, 18 }; + private static final int[] mMaxWindStrength = new int[] { 80, 120, 160, 320 }; private static final ResourceLocation[] mResourceLocations = new ResourceLocation[] { - new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png"), - new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png"), - new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png"), - new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png"), - new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorMagnaliumModel.png"), - new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorUltimetModel.png"), - }; + new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png"), + new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png"), + new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png"), + new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png"), + new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorMagnaliumModel.png"), + new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorUltimetModel.png"), }; private final int maxWindStrength; private final int minWindStrength; @@ -88,8 +83,10 @@ public class CustomKineticRotor extends Item implements IKineticRotor { @Override 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[] {this.minWindStrength, this.maxWindStrength})); + info.add( + StatCollector.translateToLocalFormatted( + "ic2.itemrotor.wind.info", + new Object[] { this.minWindStrength, this.maxWindStrength })); GearboxType type = null; if (Minecraft.getMinecraft().currentScreen != null @@ -97,8 +94,8 @@ public class CustomKineticRotor extends Item implements IKineticRotor { type = GearboxType.WATER; } else if (Minecraft.getMinecraft().currentScreen != null && Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator) { - type = GearboxType.WIND; - } + type = GearboxType.WIND; + } if (type != null) { info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + this.isAcceptedType(itemStack, type))); diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java index 2dd7274c7b..1ce01a5985 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java @@ -1,16 +1,19 @@ package gtPlusPlus.xmod.ic2.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 java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.CoreItem; + public class IC2_ItemGradual extends CoreItem { + public IC2_ItemGradual(final String internalName) { super(internalName, AddToCreativeTab.tabMachines, 1, 10000, "", EnumRarity.uncommon); this.setNoRepair(); diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java index 2e4b82cfd2..817a902813 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java @@ -1,12 +1,14 @@ package gtPlusPlus.xmod.ic2.item; -import ic2.api.item.ICustomDamageItem; -import ic2.core.util.StackUtil; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import ic2.api.item.ICustomDamageItem; +import ic2.core.util.StackUtil; + public class IC2_ItemGradualInteger extends IC2_ItemGradual implements ICustomDamageItem { + private final int maxDmg; public IC2_ItemGradualInteger(final String internalName, final int maxdmg) { diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java index 2e11b11b2f..e3401dcbc8 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java @@ -1,17 +1,19 @@ 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.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; 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; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; + public class IC2_ItemIC2 extends Item { + public IC2_ItemIC2(final String internalName) { this.setUnlocalizedName(internalName); this.setCreativeTab(AddToCreativeTab.tabMachines); @@ -24,45 +26,20 @@ public class IC2_ItemIC2 extends Item { return null; } - /* public String getTextureName(int index) - { - if ((!this.hasSubtypes) && (index > 0)) { - return null; - } - String name = getUnlocalizedName(new ItemStack(this, 1, index)); - if ((name != null) && (name.length() > 4)) { - return name.substring(4); - } - return name; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - int indexCount = 0; - while (getTextureName(indexCount) != null) - { - indexCount++; - if (indexCount > 32767) { - throw new RuntimeException("More Item Icons than actually possible @ " + getUnlocalizedName()); - } - } - this.textures = new IIcon[indexCount]; - for (int index = 0; index < indexCount; index++) { - this.textures[index] = iconRegister.registerIcon(CORE.MODID + ":" + getUnlocalizedName()); - } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) - { - if (meta < this.textures.length) { - return this.textures[meta]; - } - return this.textures.length < 1 ? null : this.textures[0]; - }*/ + /* + * public String getTextureName(int index) { if ((!this.hasSubtypes) && (index > 0)) { return null; } String name = + * getUnlocalizedName(new ItemStack(this, 1, index)); if ((name != null) && (name.length() > 4)) { return + * name.substring(4); } return name; } + * @Override + * @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { int indexCount = 0; while + * (getTextureName(indexCount) != null) { indexCount++; if (indexCount > 32767) { throw new + * RuntimeException("More Item Icons than actually possible @ " + getUnlocalizedName()); } } this.textures = new + * IIcon[indexCount]; for (int index = 0; index < indexCount; index++) { this.textures[index] = + * iconRegister.registerIcon(CORE.MODID + ":" + getUnlocalizedName()); } } + * @Override + * @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int meta) { if (meta < this.textures.length) { return + * this.textures[meta]; } return this.textures.length < 1 ? null : this.textures[0]; } + */ @Override public String getUnlocalizedName() { diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java index df83bce648..87dbd83e65 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java @@ -1,10 +1,11 @@ package gtPlusPlus.xmod.ic2.item; +import net.minecraft.item.ItemStack; + import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; import gtPlusPlus.core.item.wearable.hazmat.ItemArmorHazmatEx; import gtPlusPlus.core.lib.LoadedMods; -import net.minecraft.item.ItemStack; public class IC2_Items { @@ -26,37 +27,66 @@ public class IC2_Items { public static ItemStack blockRTG; public static ItemStack blockKineticGenerator; - private static final String[] mData1 = new String[] {"itemEnergeticRotorBlade", "itemMagnaliumRotorBlade"}; - private static final String[] mData2 = new String[] {"itemEnergeticShaft", "itemMagnaliumShaft"}; - private static final String[] mData3 = new String[] {"itemVibrantRotorBlade", "itemUltimetRotorBlade"}; - private static final String[] mData4 = new String[] {"itemVibrantShaft", "itemUltimetShaft"}; + private static final String[] mData1 = new String[] { "itemEnergeticRotorBlade", "itemMagnaliumRotorBlade" }; + private static final String[] mData2 = new String[] { "itemEnergeticShaft", "itemMagnaliumShaft" }; + private static final String[] mData3 = new String[] { "itemVibrantRotorBlade", "itemUltimetRotorBlade" }; + private static final String[] mData4 = new String[] { "itemVibrantShaft", "itemUltimetShaft" }; public static void register() { int aIndexEIO = (LoadedMods.EnderIO ? 0 : 1); // Rotor Blades - rotor_Blade_Material_1 = new ItemStack(new CoreItem( - mData1[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); - rotor_Blade_Material_2 = new ItemStack(new CoreItem( - "itemTungstenSteelRotorBlade", - AddToCreativeTab.tabMachines, - 16, - "A part for an advanced Kinetic Rotor")); - rotor_Blade_Material_3 = new ItemStack(new CoreItem( - mData3[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); - rotor_Blade_Material_4 = new ItemStack(new CoreItem( - "itemIridiumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); + rotor_Blade_Material_1 = new ItemStack( + new CoreItem( + mData1[aIndexEIO], + AddToCreativeTab.tabMachines, + 16, + "A part for an advanced Kinetic Rotor")); + rotor_Blade_Material_2 = new ItemStack( + new CoreItem( + "itemTungstenSteelRotorBlade", + AddToCreativeTab.tabMachines, + 16, + "A part for an advanced Kinetic Rotor")); + rotor_Blade_Material_3 = new ItemStack( + new CoreItem( + mData3[aIndexEIO], + AddToCreativeTab.tabMachines, + 16, + "A part for an advanced Kinetic Rotor")); + rotor_Blade_Material_4 = new ItemStack( + new CoreItem( + "itemIridiumRotorBlade", + AddToCreativeTab.tabMachines, + 16, + "A part for an advanced Kinetic Rotor")); // Rotor Shafts - shaft_Material_1 = new ItemStack(new CoreItem( - mData2[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); - shaft_Material_2 = new ItemStack(new CoreItem( - "itemTungstenSteelShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); - shaft_Material_3 = new ItemStack(new CoreItem( - mData4[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); - shaft_Material_4 = new ItemStack(new CoreItem( - "itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); + shaft_Material_1 = new ItemStack( + new CoreItem( + mData2[aIndexEIO], + AddToCreativeTab.tabMachines, + 16, + "A part for an advanced Kinetic Rotor")); + shaft_Material_2 = new ItemStack( + new CoreItem( + "itemTungstenSteelShaft", + AddToCreativeTab.tabMachines, + 16, + "A part for an advanced Kinetic Rotor")); + shaft_Material_3 = new ItemStack( + new CoreItem( + mData4[aIndexEIO], + AddToCreativeTab.tabMachines, + 16, + "A part for an advanced Kinetic Rotor")); + shaft_Material_4 = new ItemStack( + new CoreItem( + "itemIridiumShaft", + AddToCreativeTab.tabMachines, + 16, + "A part for an advanced Kinetic Rotor")); // Rotors rotor_Material_1 = new ItemStack(new CustomKineticRotor(0)); diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java b/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java index c0b6fd5427..e5809a0c98 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java @@ -1,13 +1,16 @@ package gtPlusPlus.xmod.ic2.item; -import ic2.core.item.block.ItemBlockIC2; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import ic2.core.item.block.ItemBlockIC2; + public class ItemGenerators extends ItemBlockIC2 { + public ItemGenerators(final Block block) { super(block); @@ -37,12 +40,14 @@ public class ItemGenerators extends ItemBlockIC2 { 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")); + 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")); + info.add( + StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-512 EU/t " + + StatCollector.translateToLocal("ic2.item.tooltip.max")); } } } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java index 4a3e1280c1..7ceb5b625f 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java @@ -1,17 +1,19 @@ package gtPlusPlus.xmod.ic2.item; -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; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +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; + public class RotorBase extends ItemWindRotor { private final int maxWindStrength; @@ -21,14 +23,8 @@ public class RotorBase extends ItemWindRotor { private final ResourceLocation renderTexture; private final boolean water; - public RotorBase( - final InternalName internalName, - final int Radius, - final int durability, - final float efficiency, - final int minWindStrength, - final int maxWindStrength, - final 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); this.setMaxStackSize(1); @@ -44,17 +40,18 @@ public class RotorBase extends ItemWindRotor { @Override 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)})); + info.add( + StatCollector.translateToLocalFormatted( + "ic2.itemrotor.wind.info", + new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) })); IKineticRotor.GearboxType type = null; if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) { type = IKineticRotor.GearboxType.WATER; } else if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) { - type = IKineticRotor.GearboxType.WIND; - } + type = IKineticRotor.GearboxType.WIND; + } if (type != null) { // info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type))); } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java index 46495fb965..410b106831 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java @@ -1,11 +1,7 @@ package gtPlusPlus.xmod.ic2.item; -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; @@ -14,6 +10,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +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; + public class RotorIridium extends RotorBase { private final int maxWindStrength; @@ -23,14 +25,8 @@ public class RotorIridium extends RotorBase { private final ResourceLocation renderTexture; private final boolean water; - public RotorIridium( - final InternalName internalName, - final int Radius, - final int durability, - final float efficiency, - final int minWindStrength, - final int maxWindStrength, - final 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); this.setMaxStackSize(1); @@ -46,17 +42,18 @@ public class RotorIridium extends RotorBase { @Override 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)})); + info.add( + StatCollector.translateToLocalFormatted( + "ic2.itemrotor.wind.info", + new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) })); IKineticRotor.GearboxType type = null; if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) { type = IKineticRotor.GearboxType.WATER; } else if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) { - type = IKineticRotor.GearboxType.WIND; - } + type = IKineticRotor.GearboxType.WIND; + } if (type != null) { // info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type))); } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java b/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java index f8d9a6eaa5..69c08a0095 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java @@ -1,8 +1,9 @@ package gtPlusPlus.xmod.ic2.item.reactor; +import net.minecraft.item.ItemStack; + import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; -import net.minecraft.item.ItemStack; public class IC2_FuelRod_Base implements IReactorComponent { @@ -13,8 +14,8 @@ public class IC2_FuelRod_Base implements IReactorComponent { } @Override - public boolean acceptUraniumPulse( - IReactor var1, ItemStack var2, ItemStack var3, int var4, int var5, int var6, int var7, boolean var8) { + public boolean acceptUraniumPulse(IReactor var1, ItemStack var2, ItemStack var3, int var4, int var5, int var6, + int var7, boolean var8) { // TODO Auto-generated method stub return false; } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java index c7555d4fc1..0d76bd5db9 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java @@ -2,6 +2,9 @@ package gtPlusPlus.xmod.ic2.recipe; import static gtPlusPlus.core.recipe.RECIPES_Tools.*; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -18,8 +21,6 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.ic2.item.IC2_Items; import ic2.core.Ic2Items; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class RECIPE_IC2 { @@ -194,52 +195,25 @@ public class RECIPE_IC2 { // 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.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.DarkSteel), - Character.valueOf('S'), - OrePrefixes.screw.get(Materials.DarkSteel) - }); + new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, + Character.valueOf('X'), OrePrefixes.plate.get(Materials.DarkSteel), Character.valueOf('S'), + OrePrefixes.screw.get(Materials.DarkSteel) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.BUFFERED - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + 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) - }); + 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.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) - }); + 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) }); Logger.INFO("Added recipe item for GT5 Extruder: Shaft Shape"); // Custm Recipes for Iron and Steel @@ -448,12 +422,8 @@ public class RECIPE_IC2 { private static void addAdvancedHazmat() { - ItemStack[] aBasicHazmatPieces = new ItemStack[] { - Ic2Items.hazmatHelmet.copy(), - Ic2Items.hazmatChestplate.copy(), - Ic2Items.hazmatLeggings.copy(), - Ic2Items.hazmatBoots.copy() - }; + ItemStack[] aBasicHazmatPieces = new ItemStack[] { Ic2Items.hazmatHelmet.copy(), + Ic2Items.hazmatChestplate.copy(), Ic2Items.hazmatLeggings.copy(), Ic2Items.hazmatBoots.copy() }; Material aRubber = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubber); ItemStack aYellowWool = ItemUtils.getSimpleStack(Blocks.wool, 4, 1); @@ -461,62 +431,42 @@ public class RECIPE_IC2 { ItemStack aCoilIC2 = Ic2Items.coil; ItemStack aPlateCobalt = CI.getTieredComponentOfMaterial(Materials.Cobalt, OrePrefixes.plate, 1); ItemStack aGearSmallSteel = CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.gearGtSmall, 1); - ItemStack aGearSmallAluminium = - CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGtSmall, 1); + ItemStack aGearSmallAluminium = CI + .getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGtSmall, 1); ItemStack aGearPotin = ALLOY.TUMBAGA.getGear(1); ItemStack aGearSiliconCarbide = ALLOY.SILICON_CARBIDE.getGear(1); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(2), - aBasicHazmatPieces[0], - ItemUtils.getSimpleStack(aYellowWool, 16), - ItemUtils.getSimpleStack(aPlateCobalt, 4), - ItemUtils.getSimpleStack(aCoilIC2, 8), - ItemUtils.getSimpleStack(aGearSmallAluminium, 4), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[0], + ItemUtils.getSimpleStack(aYellowWool, 16), ItemUtils.getSimpleStack(aPlateCobalt, 4), + ItemUtils.getSimpleStack(aCoilIC2, 8), ItemUtils.getSimpleStack(aGearSmallAluminium, 4), }, aRubber.getFluidStack(144 * 4), GregtechItemList.Armour_Hazmat_Advanced_Helmet.get(1), 30 * 20, MaterialUtils.getVoltageForTier(2)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(2), - aBasicHazmatPieces[1], - ItemUtils.getSimpleStack(aYellowWool, 64), - ItemUtils.getSimpleStack(aCoilIC2, 32), - ItemUtils.getSimpleStack(aPlateCobalt, 16), - ItemUtils.getSimpleStack(aGearSiliconCarbide, 8), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[1], + ItemUtils.getSimpleStack(aYellowWool, 64), ItemUtils.getSimpleStack(aCoilIC2, 32), + ItemUtils.getSimpleStack(aPlateCobalt, 16), ItemUtils.getSimpleStack(aGearSiliconCarbide, 8), }, aRubber.getFluidStack(144 * 10), GregtechItemList.Armour_Hazmat_Advanced_Chest.get(1), 90 * 20, MaterialUtils.getVoltageForTier(2)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(2), - aBasicHazmatPieces[2], - ItemUtils.getSimpleStack(aYellowWool, 32), - ItemUtils.getSimpleStack(aCoilIC2, 16), - ItemUtils.getSimpleStack(aPlateCobalt, 8), - ItemUtils.getSimpleStack(aGearSiliconCarbide, 4), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[2], + ItemUtils.getSimpleStack(aYellowWool, 32), ItemUtils.getSimpleStack(aCoilIC2, 16), + ItemUtils.getSimpleStack(aPlateCobalt, 8), ItemUtils.getSimpleStack(aGearSiliconCarbide, 4), }, aRubber.getFluidStack(144 * 8), GregtechItemList.Armour_Hazmat_Advanced_Legs.get(1), 75 * 20, MaterialUtils.getVoltageForTier(2)); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(2), - aBasicHazmatPieces[3], - ItemUtils.getSimpleStack(aBlackWool, 16), - ItemUtils.getSimpleStack(aCoilIC2, 6), - ItemUtils.getSimpleStack(aGearSmallSteel, 8), - ItemUtils.getSimpleStack(aGearPotin, 4), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[3], + ItemUtils.getSimpleStack(aBlackWool, 16), ItemUtils.getSimpleStack(aCoilIC2, 6), + ItemUtils.getSimpleStack(aGearSmallSteel, 8), ItemUtils.getSimpleStack(aGearPotin, 4), }, aRubber.getFluidStack(144 * 6), GregtechItemList.Armour_Hazmat_Advanced_Boots.get(1), 45 * 20, |