aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java5
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java37
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java16
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java1
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang11
5 files changed, 53 insertions, 17 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 6951ef6533..8381670a47 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
@@ -62,6 +62,11 @@ public class ThingsLoader implements Runnable {
ParametrizerMemoryCard.run();
ElementalDefinitionScanStorage_EM.run();
EuMeterGT.run();
+
+ for(int i=1;i <= 8; i++){
+ TeslaCoilCapacitor.run(i);//TODO Verify the category of capacitors!
+ }
+
TecTech.LOGGER.info("Useful Items registered");
ElementalDefinitionContainer_EM.run();
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
new file mode 100644
index 0000000000..1dbeab093f
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java
@@ -0,0 +1,37 @@
+package com.github.technus.tectech.thing.item;
+
+import com.github.technus.tectech.CommonValues;
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.util.List;
+
+import static com.github.technus.tectech.CommonValues.VN;
+import static com.github.technus.tectech.Reference.MODID;
+
+
+public final class TeslaCoilCapacitor extends Item {
+ public static TeslaCoilCapacitor INSTANCE;
+
+ public TeslaCoilCapacitor(int capTier) {
+ setUnlocalizedName("tm.teslaCoilCapacitor_" + capTier);
+ setTextureName(MODID + ":itemParametrizerMemoryCardUnlocked");
+ }
+
+ @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!");
+ 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);
+ GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName());
+ }
+}
diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java
index abf1bd90a0..8f2dfc0951 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java
@@ -1,30 +1,15 @@
package com.github.technus.tectech.thing.item;
import com.github.technus.tectech.CommonValues;
-import com.github.technus.tectech.Util;
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
import java.util.List;
import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.thing.CustomItemList.parametrizerMemory;
public final class TeslaCoilCover extends Item {
@@ -45,7 +30,6 @@ public final class TeslaCoilCover extends Item {
public static void run() {
INSTANCE = new TeslaCoilCover();
- System.out.print(INSTANCE.getUnlocalizedName());
GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName());
}
}
diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java
index 115f3a34c6..ca6734f8d6 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java
@@ -30,7 +30,6 @@ public final class TeslaCoilCoverUltimate extends Item {
public static void run() {
INSTANCE = new TeslaCoilCoverUltimate();
- System.out.print(INSTANCE.getUnlocalizedName());
GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName());
}
}
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index ac36e32772..cf0db4b7bf 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -12,6 +12,17 @@ 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.