diff options
4 files changed, 97 insertions, 27 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index 8381670a47..a0ce184c4e 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -63,9 +63,8 @@ public class ThingsLoader implements Runnable { ElementalDefinitionScanStorage_EM.run(); EuMeterGT.run(); - for(int i=1;i <= 8; i++){ - TeslaCoilCapacitor.run(i);//TODO Verify the category of capacitors! - } + + TeslaCoilCapacitor.run(); TecTech.LOGGER.info("Useful Items registered"); diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java index 1dbeab093f..1755ad05fb 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java @@ -2,10 +2,16 @@ package com.github.technus.tectech.thing.item; import com.github.technus.tectech.CommonValues; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GT_LanguageManager; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; import java.util.List; @@ -15,23 +21,103 @@ import static com.github.technus.tectech.Reference.MODID; public final class TeslaCoilCapacitor extends Item { public static TeslaCoilCapacitor INSTANCE; + public static IIcon LVicon, MVicon, HVicon, EVicon, IVicon, LuVicon, ZPMicon, UVicon; - public TeslaCoilCapacitor(int capTier) { - setUnlocalizedName("tm.teslaCoilCapacitor_" + capTier); + public TeslaCoilCapacitor() { + setUnlocalizedName("tm.teslaCoilCapacitor"); setTextureName(MODID + ":itemParametrizerMemoryCardUnlocked"); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "LV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "MV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "HV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "EV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "IV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "LuV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "ZPM Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "UV Tesla Capacitor"); } @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.BASS_MARK); - aList.add("I IDENTIFY AS A: " + VN[Integer.parseInt(getUnlocalizedName(aStack).replaceAll("[^0-9]", ""))]); - aList.add("Stores energy for tesla towers!"); + switch (aStack.getItemDamage()) { + case 1://"MV" + aList.add("Stores energy for tesla towers! (MV)"); + break; + case 2://"HV" + aList.add("Stores energy for tesla towers! (HV)"); + break; + case 3://"EV" + aList.add("Stores energy for tesla towers! (EV)"); + break; + case 4://"IV" + aList.add("Stores energy for tesla towers! (IV)"); + break; + case 5://"LuV" + aList.add("Stores energy for tesla towers! (LuV)"); + break; + case 6://"ZPM" + aList.add("Stores energy for tesla towers! (ZPM)"); + break; + case 7://"UV" + aList.add("Stores energy for tesla towers! (UV)"); + break; + default://"LV" + aList.add("Stores energy for tesla towers! (LV)"); + break; + } aList.add(EnumChatFormatting.BLUE + "Insert into a Capacitor hatch of a Tesla Tower"); aList.add(EnumChatFormatting.BLUE + "Capacitors are the same thing as batteries, right?"); } - public static void run(int capTier) { - INSTANCE = new TeslaCoilCapacitor(capTier); + @Override + public String getUnlocalizedName(ItemStack aStack) { + return getUnlocalizedName() + "." + getDamage(aStack); + } + + public static void run() { + INSTANCE = new TeslaCoilCapacitor(); GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + LVicon = itemIcon = iconRegister.registerIcon(getIconString()); + MVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + HVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + EVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + IVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + LuVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + ZPMicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + UVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + } + + @Override + public IIcon getIconFromDamage(int damage) { + switch (damage) { + case 1: + return MVicon; + case 2: + return HVicon; + case 3: + return EVicon; + case 4: + return IVicon; + case 5: + return LuVicon; + case 6: + return ZPMicon; + case 7: + return UVicon; + default: + return LVicon; + } + } + + public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + for (int i = 0; i <= 7; i++) { + aList.add(new ItemStack(aItem, 1, i)); + } + } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java index 2aae2b8c2b..61062f22ca 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java @@ -102,20 +102,16 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch { if (aBaseMetaTileEntity.isClientSide()) { return true; } - //if(aBaseMetaTileEntity.isActive()) - // aPlayer.addChatComponentMessage(new ChatComponentText("It is still active...")); - //else if(heat>0) - // aPlayer.addChatComponentMessage(new ChatComponentText("It is still warm...")); - //else aBaseMetaTileEntity.openGUI(aPlayer); return true; } @Override - public int getInventoryStackLimit() { - return 1; + public int getSizeInventory() {//HACK TO NOT DROP CONTENTS!!! + return energyStoredFrac >= 0.25 || getBaseMetaTileEntity().isActive() ? 0 : mInventory.length; } + @Override public String[] getDescription() { return new String[]{ diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index cf0db4b7bf..ac36e32772 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -12,17 +12,6 @@ item.em.EuMeterGT.name=GT EU meter item.tm.teslaCoilCover.name=Tesla Coil Cover item.tm.teslaCoilCoverUltimate.name=Tesla Coil Cover Rich Edition -//TODO Improve names of everything involved with tesla - -item.tm.teslaCoilCapacitor_1.name=LV Tesla Capacitor -item.tm.teslaCoilCapacitor_2.name=MV Tesla Capacitor -item.tm.teslaCoilCapacitor_3.name=HV Tesla Capacitor -item.tm.teslaCoilCapacitor_4.name=EV Tesla Capacitor -item.tm.teslaCoilCapacitor_5.name=IV Tesla Capacitor -item.tm.teslaCoilCapacitor_6.name=LuV Tesla Capacitor -item.tm.teslaCoilCapacitor_7.name=ZPM Tesla Capacitor -item.tm.teslaCoilCapacitor_8.name=UV Tesla Capacitor - death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. |