aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/ic2/item
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/ic2/item')
-rw-r--r--src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java37
-rw-r--r--src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java81
-rw-r--r--src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java130
-rw-r--r--src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java134
-rw-r--r--src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java84
-rw-r--r--src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java85
-rw-r--r--src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java159
7 files changed, 368 insertions, 342 deletions
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
index 96c61d65b5..b6ec4d66df 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
@@ -1,33 +1,42 @@
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.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;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.*;
-public class IC2_ItemGradual extends CoreItem {
- public IC2_ItemGradual(final String internalName) {
+public class IC2_ItemGradual
+extends CoreItem
+{
+ public IC2_ItemGradual(String internalName)
+ {
super(internalName, AddToCreativeTab.tabMachines, 1, 10000, "", EnumRarity.uncommon);
- this.setNoRepair();
+ setNoRepair();
}
@Override
- @SideOnly(Side.CLIENT)
- public void getSubItems(final Item item, final CreativeTabs tabs, final List itemList) {
- itemList.add(new ItemStack(this, 1, 1));
+ public boolean isDamaged(ItemStack stack)
+ {
+ return getDamage(stack) > 1;
}
@Override
- public boolean isDamaged(final ItemStack stack) {
- return this.getDamage(stack) > 1;
+ public boolean showDurabilityBar(ItemStack stack)
+ {
+ return true;
}
@Override
- public boolean showDurabilityBar(final ItemStack stack) {
- return true;
+ @SideOnly(Side.CLIENT)
+ public void getSubItems(Item item, CreativeTabs tabs, 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 54e8ae855e..4922e0f806 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
@@ -6,41 +6,48 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
-public class IC2_ItemGradualInteger extends IC2_ItemGradual implements ICustomDamageItem {
- private final int maxDmg;
-
- public IC2_ItemGradualInteger(final String internalName, final int maxdmg) {
- super(internalName);
-
- this.maxDmg = maxdmg;
- }
-
- @Override
- public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src) {
- this.setCustomDamage(stack, this.getCustomDamage(stack) + damage);
- return true;
- }
-
- @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));
- }
- }
+public class IC2_ItemGradualInteger
+ 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;
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
index d7cb77ee40..852830dc5c 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
@@ -1,76 +1,104 @@
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.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;
-public class IC2_ItemIC2 extends Item {
- private int rarity = 0;
-
- protected IIcon[] textures;
-
- /*
- * 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 IC2_ItemIC2(final String internalName) {
- this.setUnlocalizedName(internalName);
- this.setCreativeTab(AddToCreativeTab.tabMachines);
- this.setTextureName(CORE.MODID + ":" + internalName);
+public class IC2_ItemIC2
+extends Item
+{
+ public IC2_ItemIC2(String internalName)
+ {
+ setUnlocalizedName(internalName);
+ setCreativeTab(AddToCreativeTab.tabMachines);
+ setTextureName(CORE.MODID + ":" + internalName);
GameRegistry.registerItem(this, internalName);
}
- @Override
- public String getItemStackDisplayName(final ItemStack itemStack) {
- return StatCollector.translateToLocal(this.getUnlocalizedName(itemStack));
+ public String getTextureFolder()
+ {
+ return null;
}
- @Override
- @SideOnly(Side.CLIENT)
- public EnumRarity getRarity(final ItemStack stack) {
- return EnumRarity.values()[this.rarity];
- }
+ /* 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;
+ }
- public String getTextureFolder() {
- return null;
- }
+ @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() {
+ public String getUnlocalizedName()
+ {
return super.getUnlocalizedName();
}
@Override
- public String getUnlocalizedName(final ItemStack itemStack) {
- return this.getUnlocalizedName();
+ public String getUnlocalizedName(ItemStack itemStack)
+ {
+ return getUnlocalizedName();
+ }
+
+ @Override
+ public String getItemStackDisplayName(ItemStack itemStack)
+ {
+ return StatCollector.translateToLocal(getUnlocalizedName(itemStack));
}
- public IC2_ItemIC2 setRarity(final int aRarity) {
+
+ public IC2_ItemIC2 setRarity(int aRarity)
+ {
this.rarity = aRarity;
return this;
}
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public EnumRarity getRarity(ItemStack stack)
+ {
+ return EnumRarity.values()[this.rarity];
+ }
+
+ private int rarity = 0;
+ protected IIcon[] textures;
}
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
index c7645d309e..bf6f3bc1cd 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
@@ -10,98 +10,62 @@ import net.minecraft.util.ResourceLocation;
public class IC2_Items {
- public static ItemStack rotor_Material_1; // Energetic Alloy
- public static ItemStack rotor_Material_2; // TungstenSteel
- public static ItemStack rotor_Material_3; // Vibrant Alloy
- public static ItemStack rotor_Material_4; // Iridium
+ public static ItemStack rotor_Material_1; //Energetic Alloy
+ public static ItemStack rotor_Material_2; //TungstenSteel
+ public static ItemStack rotor_Material_3; //Vibrant Alloy
+ public static ItemStack rotor_Material_4; //Iridium
- public static ItemStack rotor_Blade_Material_1;
- public static ItemStack rotor_Blade_Material_2;
- public static ItemStack rotor_Blade_Material_3;
- public static ItemStack rotor_Blade_Material_4;
+ public static ItemStack rotor_Blade_Material_1;
+ public static ItemStack rotor_Blade_Material_2;
+ public static ItemStack rotor_Blade_Material_3;
+ public static ItemStack rotor_Blade_Material_4;
- public static ItemStack shaft_Material_1; // Energetic Alloy
- 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 shaft_Material_1; //Energetic Alloy
+ 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;
- public static ItemStack blockRTG;
- public static ItemStack blockKineticGenerator;
+ public static void register(){
- public static void register() {
-
- if (LoadedMods.EnderIO) {
- // Tier 1
- IC2_Items.rotor_Blade_Material_1 = new ItemStack(new CoreItem("itemEnergeticRotorBlade",
- AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.shaft_Material_1 = new ItemStack(new CoreItem("itemEnergeticShaft", AddToCreativeTab.tabMachines,
- 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.rotor_Material_1 = new ItemStack(new RotorBase(InternalName.itemwoodrotor, 9, 512000, 0.9F, 12,
- 80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png"))
- .setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemEnergeticRotor"));
- // Tier 2
- IC2_Items.rotor_Blade_Material_2 = new ItemStack(new CoreItem("itemTungstenSteelRotorBlade",
- AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.shaft_Material_2 = new ItemStack(new CoreItem("itemTungstenSteelShaft",
- AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.rotor_Material_2 = new ItemStack(new RotorBase(InternalName.itemironrotor, 11, 809600, 1.0F, 14,
- 120, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png"))
- .setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemTungstenSteelRotor"));
- // Tier 3
- IC2_Items.rotor_Blade_Material_3 = new ItemStack(new CoreItem("itemVibrantRotorBlade",
- AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.shaft_Material_3 = new ItemStack(new CoreItem("itemVibrantShaft", AddToCreativeTab.tabMachines,
- 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.rotor_Material_3 = new ItemStack(new RotorBase(InternalName.itemsteelrotor, 13, 1600000, 1.2F, 16,
- 160, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png"))
- .setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemVibrantRotor"));
- // Tier 4
- IC2_Items.rotor_Blade_Material_4 = new ItemStack(new CoreItem("itemIridiumRotorBlade",
- AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.shaft_Material_4 = new ItemStack(new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines,
- 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.rotor_Material_4 = new ItemStack(
- new RotorIridium(InternalName.itemwcarbonrotor, 15, 3200000, 1.5F, 18, 320,
- new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png"))
- .setCreativeTab(AddToCreativeTab.tabMachines)
- .setUnlocalizedName("itemIridiumRotor"));
+ if(LoadedMods.EnderIO){
+ //Tier 1
+ rotor_Blade_Material_1 = new ItemStack (new CoreItem("itemEnergeticRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+ shaft_Material_1 = new ItemStack (new CoreItem("itemEnergeticShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+ rotor_Material_1 = new ItemStack (new RotorBase(InternalName.itemwoodrotor, 9, 512000, 0.9F, 12, 80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemEnergeticRotor"));
+ //Tier 2
+ rotor_Blade_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelRotorBlade", 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"));
+ rotor_Material_2 = new ItemStack (new RotorBase(InternalName.itemironrotor, 11, 809600, 1.0F, 14, 120, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemTungstenSteelRotor"));
+ //Tier 3
+ rotor_Blade_Material_3 = new ItemStack (new CoreItem("itemVibrantRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+ shaft_Material_3 = new ItemStack (new CoreItem("itemVibrantShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+ rotor_Material_3 = new ItemStack (new RotorBase(InternalName.itemsteelrotor, 13, 1600000, 1.2F, 16, 160, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemVibrantRotor"));
+ //Tier 4
+ rotor_Blade_Material_4 = new ItemStack (new CoreItem("itemIridiumRotorBlade", 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"));
+ rotor_Material_4 = new ItemStack (new RotorIridium(InternalName.itemwcarbonrotor, 15, 3200000, 1.5F, 18, 320, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemIridiumRotor"));
}
else {
- // Tier 1 - Magnalium
- IC2_Items.rotor_Blade_Material_1 = new ItemStack(new CoreItem("itemMagnaliumRotorBlade",
- AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.shaft_Material_1 = new ItemStack(new CoreItem("itemMagnaliumShaft", AddToCreativeTab.tabMachines,
- 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.rotor_Material_1 = new ItemStack(new RotorBase(InternalName.itemwoodrotor, 9, 512000, 0.9F, 12,
- 80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorMagnaliumModel.png"))
- .setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemMagnaliumRotor"));
- // Tier 2
- IC2_Items.rotor_Blade_Material_2 = new ItemStack(new CoreItem("itemTungstenSteelRotorBlade",
- AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.shaft_Material_2 = new ItemStack(new CoreItem("itemTungstenSteelShaft",
- AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.rotor_Material_2 = new ItemStack(new RotorBase(InternalName.itemironrotor, 11, 809600, 1.0F, 14,
- 120, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png"))
- .setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemTungstenSteelRotor"));
- // Tier 3 - Ultimet
- IC2_Items.rotor_Blade_Material_3 = new ItemStack(new CoreItem("itemUltimetRotorBlade",
- AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.shaft_Material_3 = new ItemStack(new CoreItem("itemUltimetShaft", AddToCreativeTab.tabMachines,
- 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.rotor_Material_3 = new ItemStack(new RotorBase(InternalName.itemsteelrotor, 13, 1600000, 1.2F, 16,
- 160, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorUltimetModel.png"))
- .setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemUltimetRotor"));
- // Tier 4
- IC2_Items.rotor_Blade_Material_4 = new ItemStack(new CoreItem("itemIridiumRotorBlade",
- AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.shaft_Material_4 = new ItemStack(new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines,
- 16, "A part for an advanced Kinetic Rotor"));
- IC2_Items.rotor_Material_4 = new ItemStack(
- new RotorIridium(InternalName.itemwcarbonrotor, 15, 3200000, 1.5F, 18, 320,
- new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png"))
- .setCreativeTab(AddToCreativeTab.tabMachines)
- .setUnlocalizedName("itemIridiumRotor"));
+ //Tier 1 - Magnalium
+ rotor_Blade_Material_1 = new ItemStack (new CoreItem("itemMagnaliumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+ shaft_Material_1 = new ItemStack (new CoreItem("itemMagnaliumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+ rotor_Material_1 = new ItemStack (new RotorBase(InternalName.itemwoodrotor, 9, 512000, 0.9F, 12, 80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorMagnaliumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemMagnaliumRotor"));
+ //Tier 2
+ rotor_Blade_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelRotorBlade", 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"));
+ rotor_Material_2 = new ItemStack (new RotorBase(InternalName.itemironrotor, 11, 809600, 1.0F, 14, 120, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemTungstenSteelRotor"));
+ //Tier 3 - Ultimet
+ rotor_Blade_Material_3 = new ItemStack (new CoreItem("itemUltimetRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+ shaft_Material_3 = new ItemStack (new CoreItem("itemUltimetShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+ rotor_Material_3 = new ItemStack (new RotorBase(InternalName.itemsteelrotor, 13, 1600000, 1.2F, 16, 160, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorUltimetModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemUltimetRotor"));
+ //Tier 4
+ rotor_Blade_Material_4 = new ItemStack (new CoreItem("itemIridiumRotorBlade", 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"));
+ rotor_Material_4 = new ItemStack (new RotorIridium(InternalName.itemwcarbonrotor, 15, 3200000, 1.5F, 18, 320, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemIridiumRotor"));
}
}
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java b/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
index 38f259b578..2d73638ce9 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
@@ -1,49 +1,55 @@
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 {
- public ItemGenerators(final Block block) {
- super(block);
-
- this.setMaxDamage(0);
- this.setHasSubtypes(true);
- }
-
- @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"));
- }
- }
-
- @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;
- }
+public class ItemGenerators
+ 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"));
+ }
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java b/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java
index 8f1dd7f479..06e33d6793 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java
@@ -1,94 +1,99 @@
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;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
-public class RotorBase extends ItemWindRotor {
+public class RotorBase extends ItemWindRotor{
- private final int maxWindStrength;
- private final int minWindStrength;
- private final int radius;
- private final float efficiency;
- private final ResourceLocation renderTexture;
- private final boolean water;
+ private final int maxWindStrength;
+ private final int minWindStrength;
+ private final int radius;
+ private final float efficiency;
+ 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(InternalName internalName, int Radius, int durability, float efficiency, int minWindStrength, int maxWindStrength, ResourceLocation RenderTexture)
+ {
super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture);
- this.setMaxStackSize(1);
- this.setMaxDamage(durability);
+
+
+ setMaxStackSize(1);
+ setMaxDamage(durability);
this.radius = Radius;
this.efficiency = efficiency;
this.renderTexture = RenderTexture;
this.minWindStrength = minWindStrength;
this.maxWindStrength = maxWindStrength;
- this.water = internalName != InternalName.itemwoodrotor;
+ this.water = (internalName != InternalName.itemwoodrotor);
}
@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)
- }));
+ public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean b)
+ {
+ 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) {
+ 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) {
+ } else if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) {
type = IKineticRotor.GearboxType.WIND;
}
if (type != null) {
- // info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." +
- // isAcceptedType(itemStack, type)));
+ //info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type)));
}
}
@Override
- public int getDiameter(final ItemStack stack) {
- return this.radius;
+ public String getTextureFolder()
+ {
+ return "rotors";
}
@Override
- public float getEfficiency(final ItemStack stack) {
- return this.efficiency;
+ public int getDiameter(ItemStack stack)
+ {
+ return this.radius;
}
@Override
- public int getMaxWindStrength(final ItemStack stack) {
- return this.maxWindStrength;
+ public ResourceLocation getRotorRenderTexture(ItemStack stack)
+ {
+ return this.renderTexture;
}
@Override
- public int getMinWindStrength(final ItemStack stack) {
- return this.minWindStrength;
+ public float getEfficiency(ItemStack stack)
+ {
+ return this.efficiency;
}
@Override
- public ResourceLocation getRotorRenderTexture(final ItemStack stack) {
- return this.renderTexture;
+ public int getMinWindStrength(ItemStack stack)
+ {
+ return this.minWindStrength;
}
@Override
- public String getTextureFolder() {
- return "rotors";
+ public int getMaxWindStrength(ItemStack stack)
+ {
+ return this.maxWindStrength;
}
- @Override
- public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type) {
- return type == IKineticRotor.GearboxType.WIND || this.water;
+ public boolean isAcceptedType(ItemStack stack, 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 2aa89bd868..f35b1e88f0 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
@@ -1,12 +1,13 @@
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;
@@ -15,100 +16,106 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
-public class RotorIridium extends RotorBase {
+public class RotorIridium extends RotorBase{
- private final int maxWindStrength;
- private final int minWindStrength;
- private final int radius;
- private final float efficiency;
- private final ResourceLocation renderTexture;
- private final boolean water;
+ private final int maxWindStrength;
+ private final int minWindStrength;
+ private final int radius;
+ private final float efficiency;
+ 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(InternalName internalName, int Radius, int durability, float efficiency, int minWindStrength, int maxWindStrength, ResourceLocation RenderTexture)
+ {
super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture);
- this.setMaxStackSize(1);
- this.setMaxDamage(Integer.MAX_VALUE);
+
+
+ setMaxStackSize(1);
+ setMaxDamage(Integer.MAX_VALUE);
this.radius = Radius;
this.efficiency = efficiency;
this.renderTexture = RenderTexture;
this.minWindStrength = minWindStrength;
this.maxWindStrength = maxWindStrength;
- this.water = internalName != InternalName.itemwoodrotor;
+ this.water = (internalName != InternalName.itemwoodrotor);
}
@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)
- }));
+ public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean b)
+ {
+ 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) {
+ 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) {
+ } else if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) {
type = IKineticRotor.GearboxType.WIND;
}
if (type != null) {
- // info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." +
- // isAcceptedType(itemStack, type)));
+ //info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type)));
}
}
@Override
- public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src) {
- this.setCustomDamage(stack, this.getCustomDamage(stack) + damage);
- return true;
- }
-
- @Override
- public int getDiameter(final ItemStack stack) {
- return this.radius;
- }
-
- @Override
- public float getEfficiency(final ItemStack stack) {
- return this.efficiency;
- }
-
- @Override
- public int getMaxWindStrength(final ItemStack stack) {
- return this.maxWindStrength;
- }
-
- @Override
- public int getMinWindStrength(final ItemStack stack) {
- return this.minWindStrength;
- }
-
- @Override
- public ResourceLocation getRotorRenderTexture(final ItemStack stack) {
- return this.renderTexture;
- }
-
- @Override
- public String getTextureFolder() {
- return "rotors";
- }
-
- @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));
- }
+ 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;
+ }
}
-}
+
generated by cgit (git 2.46.0) at 2025-03-10 10:35:06 +0000