diff options
Diffstat (limited to 'src/Java/miscutil')
4 files changed, 37 insertions, 7 deletions
diff --git a/src/Java/miscutil/core/item/base/CoreItem.java b/src/Java/miscutil/core/item/base/CoreItem.java index 06f29dffaa..55a468980c 100644 --- a/src/Java/miscutil/core/item/base/CoreItem.java +++ b/src/Java/miscutil/core/item/base/CoreItem.java @@ -22,43 +22,67 @@ public class CoreItem extends Item private final boolean hasEffect; //0 + /* + * Name, Tab - 64 Stack, 0 Dmg + */ public CoreItem(String unlocalizedName, CreativeTabs creativeTab) { this(unlocalizedName, creativeTab, 64, 0); //Calls 3 } //1 + /* + * Name, Tab, Stack - 0 Dmg + */ public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize) { this(unlocalizedName, creativeTab, stackSize, 0); //Calls 3 } //2 + /* + * Name, Tab, Stack, Description - 0 Dmg + */ public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, String description) { this(unlocalizedName, creativeTab, stackSize, 0, description); //Calls 4 } //3 + /* + * Name, Tab, Stack, Dmg - Description + */ public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg) { this(unlocalizedName, creativeTab, stackSize, maxDmg, ""); //Calls 4 } //4 //Not Rare + basic tooltip + /* + * Name, Tab, Stack, Dmg, Description + */ public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String description) { this(unlocalizedName, creativeTab, stackSize, maxDmg, description, EnumRarity.common, EnumChatFormatting.GRAY, false); //Calls 4.5 } //4.5 + /* + * Name, Tab, Stack, Dmg, Description, Text Colour - Common + */ public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String description, EnumChatFormatting colour) { this(unlocalizedName, creativeTab, stackSize, maxDmg, description, EnumRarity.common, colour, false); //Calls 5 } //4.75 + /* + * Name, Tab, Stack, Dmg, Description, Rarity - Gray text + */ public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String description, EnumRarity rarity) { this(unlocalizedName, creativeTab, stackSize, maxDmg, description, rarity, EnumChatFormatting.GRAY, false); //Calls 5 } //5 + /* + * Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect + */ public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String description, EnumRarity regRarity, EnumChatFormatting colour, boolean Effect) { setUnlocalizedName(unlocalizedName); diff --git a/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java b/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java index 2d996b0cf0..75f5c5bdf5 100644 --- a/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java +++ b/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java @@ -3,6 +3,7 @@ package miscutil.core.xmod.ic2.item; import ic2.core.IC2; import ic2.core.init.InternalName; import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.item.base.CoreItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -19,10 +20,16 @@ public class IC2_Items { public static ItemStack rotor_Blade_Material_4; public static void register(){ - rotor_Material_1 = new ItemStack(new RotorBase(InternalName.itemsteelrotor, 9, 512000, 0.9F, 12, 80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemEnergeticRotor")); - rotor_Material_2 = new ItemStack(new RotorBase(InternalName.itemsteelrotor, 11, 809600, 1.0F, 14, 120, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemTungstenSteelRotor")); + + rotor_Blade_Material_1 = new ItemStack (new CoreItem("itemEnergeticRotorBlade", 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("itemVibrantRotorBlade", 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_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")); + 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")); 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")); - rotor_Material_4 = new ItemStack(new RotorBase(InternalName.itemsteelrotor, 15, 3200000, 1.5F, 18, 320, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemIridiumRotor")); + 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/miscutil/core/xmod/ic2/item/RotorBase.java b/src/Java/miscutil/core/xmod/ic2/item/RotorBase.java index c2f31f27a2..11817818b4 100644 --- a/src/Java/miscutil/core/xmod/ic2/item/RotorBase.java +++ b/src/Java/miscutil/core/xmod/ic2/item/RotorBase.java @@ -30,7 +30,7 @@ public class RotorBase extends ItemWindRotor{ setMaxStackSize(1); - setMaxDamage(Integer.MAX_VALUE); + setMaxDamage(durability); this.radius = Radius; this.efficiency = efficiency; @@ -51,7 +51,7 @@ public class RotorBase extends ItemWindRotor{ 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))); } } diff --git a/src/Java/miscutil/core/xmod/ic2/item/RotorIridium.java b/src/Java/miscutil/core/xmod/ic2/item/RotorIridium.java index 656d700ff9..ac568d3b9e 100644 --- a/src/Java/miscutil/core/xmod/ic2/item/RotorIridium.java +++ b/src/Java/miscutil/core/xmod/ic2/item/RotorIridium.java @@ -4,7 +4,6 @@ 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 ic2.core.util.StackUtil; import java.util.List; @@ -54,7 +53,7 @@ public class RotorIridium extends RotorBase{ 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))); } } |