upstream/Electro-Magic-Tools
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Electro-Magic-Tools.git synced 2026-11-13 17:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Another mini-overhaul

Browse Source 
-Moved some textures around
-Renamed some textures
-Redid some item unloc names
-Cleaned up foci a bit
This commit is contained in:
TehNut committed 2014-10-01 16:56:07 -07:00
1 parent 4ea1b059c0
commit 79b0dc565c
117 files changed
+237 -242
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tombenpotter/emt/common/commands/CommandOutputs.java
+3 -3
View File
@@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import thaumcraft.api.aspects.Aspect;
import tombenpotter.emt.common.util.EssentiasOutputs;
import tombenpotter.emt.common.util.TextHelper;
import java.util.Collection;
import java.util.List;
@@ -47,16 +48,15 @@ public class CommandOutputs extends CommandBase {
}
}
@Override
public void processCommand(ICommandSender command, String[] astring) {
text = "EU Ouput per Essentia: ";
text = TextHelper.localize("gui.EMT.book.aspect.output.essentia.eu") + ": ";
Collection<Aspect> aspectCollection = Aspect.aspects.values();
for (Aspect aspect : aspectCollection) {
String text2 = addStrings(text, (aspect.getTag() + ": " + String.valueOf(EssentiasOutputs.outputs.get(aspect.getTag())) + "\n"));
text = text2;
}
addOutputsBook("Essentia Outputs Book", text, command, astring);
addOutputsBook(TextHelper.localize("gui.EMT.book.aspect.output.eu.title"), text, command, astring);
}
public void addOutputsBook(String title, String text, ICommandSender command, String[] astring) {
src/main/java/tombenpotter/emt/common/module/base/items/ItemEMTItems.java
+17 -17
View File
@@ -131,23 +131,23 @@ public class ItemEMTItems extends Item {
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister ri) {
this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":clusteruranium");
this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":crushedamber");
this.icon[2] = ri.registerIcon(ModInformation.texturePath + ":purifiedamber");
this.icon[3] = ri.registerIcon(ModInformation.texturePath + ":crushedcinnabar");
this.icon[4] = ri.registerIcon(ModInformation.texturePath + ":purifiedcinnabar");
this.icon[5] = ri.registerIcon(ModInformation.texturePath + ":thaumiumplate");
this.icon[6] = ri.registerIcon(ModInformation.texturePath + ":lightningsummoner");
this.icon[7] = ri.registerIcon(ModInformation.texturePath + ":feathermesh");
this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":glue");
this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":ducttape");
this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":rubberball");
this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":cardboard");
this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":feathercarboardwing");
this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":denseironsheet");
this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":taintedfeather");
this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":thaumiumWing");
this.icon[16] = ri.registerIcon(ModInformation.texturePath + ":uumatterdrop");
this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":materials/clusteruranium");
this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":materials/crushedamber");
this.icon[2] = ri.registerIcon(ModInformation.texturePath + ":materials/purifiedamber");
this.icon[3] = ri.registerIcon(ModInformation.texturePath + ":materials/crushedcinnabar");
this.icon[4] = ri.registerIcon(ModInformation.texturePath + ":materials/purifiedcinnabar");
this.icon[5] = ri.registerIcon(ModInformation.texturePath + ":materials/thaumiumplate");
this.icon[6] = ri.registerIcon(ModInformation.texturePath + ":materials/lightningsummoner");
this.icon[7] = ri.registerIcon(ModInformation.texturePath + ":materials/feathermesh");
this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":materials/glue");
this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":materials/ducttape");
this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":materials/rubberball");
this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":materials/cardboard");
this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":materials/cardboardsheet");
this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":materials/denseironsheet");
this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":materials/taintedfeather");
this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":materials/thaumiumWing");
this.icon[16] = ri.registerIcon(ModInformation.texturePath + ":materials/uumatterdrop");
}
@SideOnly(Side.CLIENT)
src/main/java/tombenpotter/emt/common/module/base/items/ItemFeatherWing.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class ItemFeatherWing extends ItemArmor {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":featherwings");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_feather");
}
@Override
src/main/java/tombenpotter/emt/common/module/base/items/ItemThaumiumReinforcedWing.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":thaumiumwings");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_thaumium");
}
@Override
src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemBaseFocus.java
+9 -5
View File
@@ -24,6 +24,7 @@ import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.wands.IWandFocus;
import tombenpotter.emt.ElectroMagicTools;
import tombenpotter.emt.ModInformation;
import java.util.List;
@@ -31,12 +32,15 @@ public abstract class ItemBaseFocus extends Item implements IWandFocus {
private IIcon ornament, depth;
public ItemBaseFocus() {
public ItemBaseFocus(String unlocName, String textureName) {
super();
this.setMaxDamage(1);
this.setNoRepair();
this.setMaxStackSize(1);
this.setCreativeTab(ElectroMagicTools.tabEMT);
setUnlocalizedName(ModInformation.modid + "." + unlocName);
setTextureName(ModInformation.texturePath + ":" + textureName);
setCreativeTab(ElectroMagicTools.tabEMT);
setMaxDamage(1);
setNoRepair();
setMaxStackSize(1);
}
boolean hasOrnament() {
src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemChristmasFocus.java
+1 -11
View File
@@ -12,9 +12,6 @@
package tombenpotter.emt.common.module.base.items.foci;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.monster.EntitySnowman;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -23,14 +20,13 @@ import net.minecraft.world.World;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.common.items.wands.ItemWandCasting;
import tombenpotter.emt.ModInformation;
public class ItemChristmasFocus extends ItemBaseFocus {
private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500);
public ItemChristmasFocus() {
super();
super("focus.christmas", "focus_christmas");
}
@Override
@@ -38,12 +34,6 @@ public class ItemChristmasFocus extends ItemBaseFocus {
return 99999999;
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":christmasfocus");
}
@Override
public AspectList getVisCost() {
return visCost;
src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemExplosionFocus.java
+1 -11
View File
@@ -12,9 +12,6 @@
package tombenpotter.emt.common.module.base.items.foci;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MovingObjectPosition;
@@ -22,7 +19,6 @@ import net.minecraft.world.World;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.common.items.wands.ItemWandCasting;
import tombenpotter.emt.ModInformation;
import tombenpotter.emt.common.module.base.entities.EntityLaser;
public class ItemExplosionFocus extends ItemBaseFocus {
@@ -30,13 +26,7 @@ public class ItemExplosionFocus extends ItemBaseFocus {
private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 200).add(Aspect.ENTROPY, 200);
public ItemExplosionFocus() {
super();
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":explosionfocus");
super("focus.explosion", "focus_explosion");
}
@Override
src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemShieldFocus.java
+1 -11
View File
@@ -12,9 +12,6 @@
package tombenpotter.emt.common.module.base.items.foci;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -23,7 +20,6 @@ import net.minecraft.world.World;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.common.items.wands.ItemWandCasting;
import tombenpotter.emt.ModInformation;
import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry;
public class ItemShieldFocus extends ItemBaseFocus {
@@ -31,13 +27,7 @@ public class ItemShieldFocus extends ItemBaseFocus {
private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10);
public ItemShieldFocus() {
super();
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":shieldfocus");
super("focus.shield", "focus_shield");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleItemRegistry.java
+30 -29
View File
@@ -87,71 +87,72 @@ public class IC2ModuleItemRegistry {
emtBauble = new ItemEMTBaubles().setUnlocalizedName(ModInformation.modid + ".emtbauble");
GameRegistry.registerItem(emtBauble, "EMTBaubles");
electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".electricgoggles");
electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.electric");
GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing");
nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".nanothaumichelmet");
nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.nano");
GameRegistry.registerItem(nanoThaumicHelmet, "NanosuitGogglesRevealing");
quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".quantumthaumichelmet");
quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.quantum");
GameRegistry.registerItem(quantumThaumicHelmet, "QuantumGogglesRevealing");
solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".solarhelmetrevealing");
solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.solar");
GameRegistry.registerItem(solarHelmetRevealing, "SolarHelmetRevealing");
electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".electricboots");
electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.electric");
GameRegistry.registerItem(electricBootsTraveller, "ElectricBootsTraveller");
nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".nanobootstraveller");
nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.nano");
GameRegistry.registerItem(nanoBootsTraveller, "NanoBootsTraveller");
quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".quantumbootstraveller");
quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.quantum");
GameRegistry.registerItem(quantumBootsTraveller, "QuantumBootsTraveller");
electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.modid + ".electricscribingtools");
electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.modid + ".scribingtools.electric");
GameRegistry.registerItem(electricScribingTools, "ElectricScribingTools");
featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.modid + ".featherwing");
featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.feather");
GameRegistry.registerItem(featherWing, "FeatherWing");
thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.modid + ".thaumiumwing");
thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.thaumium");
GameRegistry.registerItem(thaumiumWing, "ThaumiumWing");
nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".nanowing");
nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.nano");
GameRegistry.registerItem(nanoWing, "NanosuitWing");
quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".quantumwing");
quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.quantum");
GameRegistry.registerItem(quantumWing, "QuantumWing");
taintedThorHammer = new ItemTaintedThorHammer().setUnlocalizedName(ModInformation.modid + ".taintedthorhammer");
taintedThorHammer = new ItemTaintedThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer.broken");
GameRegistry.registerItem(taintedThorHammer, "TaintedMjolnir");
thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.modid + ".hammerthor");
thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer");
GameRegistry.registerItem(thorHammer, "Mjolnir");
electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.modid + ".electricthorhammer");
electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer.electric");
GameRegistry.registerItem(electricThorHammer, "SuperchargedMjolnir");
thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.modid + ".thaumiumdrill");
thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.modid + ".drill.thaumium");
GameRegistry.registerItem(thaumiumDrill, "ThaumiumDrill");
diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.modid + ".diamondchainsaw");
diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond");
GameRegistry.registerItem(diamondChainsaw, "DiamondChainsaw");
thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.modid + ".thaumiumchainsaw");
thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.thaumium");
GameRegistry.registerItem(thaumiumChainsaw, "ThaumiumChainsaw");
ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.modid + ".ironomnitool");
ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.modid + ".omnitool.iron");
GameRegistry.registerItem(ironOmnitool, "Omnitool");
diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.modid + ".diamondomnitool");
diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.modid + ".omnitool.diamond");
GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool");
thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.modid + ".thaumiumomnitool");
thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.modid + ".omnitool.thaumium");
GameRegistry.registerItem(thaumiumOmnitool, "ThaumiumOmnitool");
streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.modid + ".streamchainsaw");
streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.stream");
GameRegistry.registerItem(streamChainsaw, "ChainsawStream");
rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.modid + ".rockbreakerdrill");
rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.modid + ".drill.rockbreaker");
GameRegistry.registerItem(rockbreakerDrill, "DrillRockbreaker");
electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.modid + ".electrichoeofgrowth");
electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.modid + ".hoeofgrowth.electric");
GameRegistry.registerItem(electricHoeGrowth, "ElectricHoeGrowth");
explosionFocus = new ItemExplosionFocus().setUnlocalizedName(ModInformation.modid + ".laserfocus");
explosionFocus = new ItemExplosionFocus();
GameRegistry.registerItem(explosionFocus, "ExplosionFocus");
christmasFocus = new ItemChristmasFocus().setUnlocalizedName(ModInformation.modid + ".christmasfocus");
christmasFocus = new ItemChristmasFocus();
GameRegistry.registerItem(christmasFocus, "ChristmasFocus");
shieldFocus = new ItemShieldFocus().setUnlocalizedName(ModInformation.modid + ".shieldfocus");
shieldFocus = new ItemShieldFocus();
GameRegistry.registerItem(shieldFocus, "ShieldFocus");
chargeFocus = new ItemChargeFocus().setUnlocalizedName(ModInformation.modid + ".chargefocus");
chargeFocus = new ItemChargeFocus();
GameRegistry.registerItem(chargeFocus, "ChargingFocus");
wandChargeFocus = new ItemWandChargingFocus().setUnlocalizedName(ModInformation.modid + ".wandchargefocus");
wandChargeFocus = new ItemWandChargingFocus();
GameRegistry.registerItem(wandChargeFocus, "WandChargingFocus");
}
}
src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemElectricBootsTraveller.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":electricboots");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/boots_electric");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemNanoBootsTraveller.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":nanobootstravel");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/boots_nano");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemQuantumBootsTraveller.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":quantumbootstravel");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/boots_quantum");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemElectricGoggles.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":electricgoggles");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_electric");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemNanoGoggles.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class ItemNanoGoggles extends ItemElectricGoggles {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":nanothaumichelmet");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_nano");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemQuantumGoggles.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class ItemQuantumGoggles extends ItemNanoGoggles {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":quantumthaumichelmet");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_quantum");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java
+6 -6
View File
@@ -68,6 +68,12 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles {
potionCost.put(Integer.valueOf(Potion.confusion.id), Integer.valueOf(5000));
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_solar");
}
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layerType) {
return ModInformation.texturePath + ":textures/models/solarrevealinghelmet.png";
@@ -182,10 +188,4 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles {
public static int tickRate() {
return 128;
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":solarrevealinghelmet");
}
}
src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemNanoWing.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":nanowings");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_nano");
}
@SuppressWarnings({"rawtypes", "unchecked"})
src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemQuantumWing.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class ItemQuantumWing extends ItemNanoWing {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":quantumwings");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_quantum");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java
+1 -11
View File
@@ -12,11 +12,8 @@
package tombenpotter.emt.common.module.ic2.items.foci;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MovingObjectPosition;
@@ -24,7 +21,6 @@ import net.minecraft.world.World;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.common.items.wands.ItemWandCasting;
import tombenpotter.emt.ModInformation;
import tombenpotter.emt.common.module.base.items.foci.ItemBaseFocus;
import tombenpotter.emt.common.util.ConfigHandler;
@@ -33,13 +29,7 @@ public class ItemChargeFocus extends ItemBaseFocus {
private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10);
public ItemChargeFocus() {
super();
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":chargefocus");
super("focus.charge", "focus_charge");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java
+2 -12
View File
@@ -1,30 +1,20 @@
package tombenpotter.emt.common.module.ic2.items.foci;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.common.items.wands.ItemWandCasting;
import tombenpotter.emt.ModInformation;
import tombenpotter.emt.common.module.base.items.foci.ItemBaseFocus;
import tombenpotter.emt.common.util.ConfigHandler;
public class ItemWandChargingFocus extends ItemBaseFocus {
AspectList visCost = new AspectList();
AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10);
public ItemWandChargingFocus() {
super();
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":wandchargefocus");
super("focus.charge.wand", "focus_wandCharge");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/tools/ItemElectricHoeGrowth.java
+7 -7
View File
@@ -27,7 +27,7 @@ import java.util.List;
public class ItemElectricHoeGrowth extends ItemElementalHoe implements IElectricItem {
public IIcon icon;
public IIcon icon;
public int maxCharge = 1000000;
public int growthCost = 1000;
public int tillCost = 100;
@@ -38,12 +38,12 @@ public class ItemElectricHoeGrowth extends ItemElementalHoe implements IElectric
this.setMaxStackSize(1);
}
/**
* @SideOnly(Side.CLIENT)
* @Override public void registerIcons(IIconRegister iconRegister) {
* this.icon = iconRegister.registerIcon("electromagictools:electrichoegrowth");
* }
*/
// Why this no work? :(
// @SideOnly(Side.CLIENT)
// @Override
// public void registerIcons(IIconRegister iconRegister) {
// this.icon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/hoe_growth");
// }
@SuppressWarnings({"rawtypes", "unchecked"})
@SideOnly(Side.CLIENT)
src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":diamondchainsaw");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/chainsaw_diamond");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemStreamChainsaw.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":streamchainsaw");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/chainsaw_stream");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":thaumiumchainsaw");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/chainsaw_thaumium");
}
@Override
src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemRockbreakerDrill.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":rockbreakerdrill");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/drill_rockbreaker");
}
private boolean isEffectiveAgainst(Block block) {
src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemThaumiumDrill.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":thaumiumdrill");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/drill_thaumium");
}
@SuppressWarnings({"rawtypes", "unchecked"})
src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java
+3 -3
View File
@@ -33,7 +33,7 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron {
this.efficiencyOnProperMaterial = 16F;
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setMaxStackSize(1);
if (ConfigHandler.toolsInBore == false) {
if (!ConfigHandler.toolsInBore) {
this.setMaxDamage(27);
} else {
this.setMaxDamage(350);
@@ -45,12 +45,12 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":diamondomnitool");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/omnitool_diamond");
}
@Override
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
if (ConfigHandler.toolsInBore == false) {
if (!ConfigHandler.toolsInBore) {
cost = 200;
} else {
cost = 1;
src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolIron.java
+4 -4
View File
@@ -46,7 +46,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
this.efficiencyOnProperMaterial = 13F;
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setMaxStackSize(1);
if (ConfigHandler.toolsInBore == false) {
if (!ConfigHandler.toolsInBore) {
this.setMaxDamage(27);
} else {
this.setMaxDamage(200);
@@ -56,7 +56,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":ironomnitool");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/omnitool_iron");
}
@SuppressWarnings({"rawtypes", "unchecked"})
@@ -77,7 +77,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving)
{
if (ConfigHandler.toolsInBore == false) {
if (!ConfigHandler.toolsInBore) {
cost = 100;
} else {
cost = 1;
@@ -148,7 +148,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
@Override
public int getItemEnchantability() {
if (ConfigHandler.enchanting == false) {
if (!ConfigHandler.enchanting) {
return 0;
} else {
return 4;
src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java
+3 -3
View File
@@ -33,7 +33,7 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond {
this.efficiencyOnProperMaterial = 21F;
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setMaxStackSize(1);
if (ConfigHandler.toolsInBore == false) {
if (!ConfigHandler.toolsInBore) {
this.setMaxDamage(27);
} else {
this.setMaxDamage(467);
@@ -45,12 +45,12 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":thaumiumomnitool");
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/omnitool_thaumium");
}
@Override
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
if (ConfigHandler.toolsInBore == false) {
if (!ConfigHandler.toolsInBore) {
cost = 300;
} else {
cost = 1;
src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java
+18 -18
View File
@@ -51,44 +51,44 @@ public class VanillaItemsRegistry {
public static Item.ToolMaterial bronzeMaterial = EnumHelper.addToolMaterial("bronzeToolMaterial", 2, 350, 7.0F, 3.0F, 16);
public static void registerItems() {
craftingComponent = new ItemCraftingComponent().setUnlocalizedName(ModInformation.modid + ".craftingComponent");
craftingComponent = new ItemCraftingComponent().setUnlocalizedName(ModInformation.modid + ".material");
GameRegistry.registerItem(craftingComponent, "craftingComponents");
woodenDrill = new ItemVanillaDrill(Item.ToolMaterial.WOOD, 75, ":woodenDrill", new ItemStack(Item.getItemFromBlock(Blocks.planks))).setUnlocalizedName(ModInformation.modid + ".woodenDrill");
woodenDrill = new ItemVanillaDrill(Item.ToolMaterial.WOOD, 75, ":drill_wood", new ItemStack(Item.getItemFromBlock(Blocks.planks))).setUnlocalizedName(ModInformation.modid + ".drill.wood");
GameRegistry.registerItem(woodenDrill, "woodenDrill");
stoneDrill = new ItemVanillaDrill(Item.ToolMaterial.STONE, 165, ":stoneDrill", new ItemStack(Item.getItemFromBlock(Blocks.cobblestone))).setUnlocalizedName(ModInformation.modid + ".stoneDrill");
stoneDrill = new ItemVanillaDrill(Item.ToolMaterial.STONE, 165, ":drill_stone", new ItemStack(Item.getItemFromBlock(Blocks.cobblestone))).setUnlocalizedName(ModInformation.modid + ".drill.stone");
GameRegistry.registerItem(stoneDrill, "stoneDrill");
ironDrill = new ItemVanillaDrill(Item.ToolMaterial.IRON, 400, ":ironDrill", new ItemStack(Items.iron_ingot)).setUnlocalizedName(ModInformation.modid + ".ironDrill");
ironDrill = new ItemVanillaDrill(Item.ToolMaterial.IRON, 400, ":drill_iron", new ItemStack(Items.iron_ingot)).setUnlocalizedName(ModInformation.modid + ".drill.iron");
GameRegistry.registerItem(ironDrill, "ironDrill");
goldenDrill = new ItemVanillaDrill(Item.ToolMaterial.GOLD, 55, ":goldenDrill", new ItemStack(Items.gold_ingot)).setUnlocalizedName(ModInformation.modid + ".goldenDrill");
goldenDrill = new ItemVanillaDrill(Item.ToolMaterial.GOLD, 55, ":drill_gold", new ItemStack(Items.gold_ingot)).setUnlocalizedName(ModInformation.modid + ".drill.gold");
GameRegistry.registerItem(goldenDrill, "goldenDrill");
diamondDrill = new ItemVanillaDrill(Item.ToolMaterial.EMERALD, 2015, ":diamondDrill", new ItemStack(Items.diamond)).setUnlocalizedName(ModInformation.modid + ".diamondDrill");
diamondDrill = new ItemVanillaDrill(Item.ToolMaterial.EMERALD, 2015, ":drill_diamond", new ItemStack(Items.diamond)).setUnlocalizedName(ModInformation.modid + ".drill.diamond");
GameRegistry.registerItem(diamondDrill, "diamondDrill");
copperDrill = new ItemVanillaDrill(copperMaterial, 450, ":copperDrill", OreDictionary.getOres("ingotCopper").get(0)).setUnlocalizedName(ModInformation.modid + ".copperDrill");
copperDrill = new ItemVanillaDrill(copperMaterial, 450, ":drill_copper", OreDictionary.getOres("ingotCopper").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.copper");
GameRegistry.registerItem(copperDrill, "copperDrill");
tinDrill = new ItemVanillaDrill(tinMaterial, 350, ":tinDrill", OreDictionary.getOres("ingotTin").get(0)).setUnlocalizedName(ModInformation.modid + ".tinDrill");
tinDrill = new ItemVanillaDrill(tinMaterial, 350, ":drill_tin", OreDictionary.getOres("ingotTin").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.tin");
GameRegistry.registerItem(tinDrill, "tinDrill");
leadDrill = new ItemVanillaDrill(leadMaterial, 400, ":leadDrill", OreDictionary.getOres("ingotLead").get(0)).setUnlocalizedName(ModInformation.modid + ".leadDrill");
leadDrill = new ItemVanillaDrill(leadMaterial, 400, ":drill_lead", OreDictionary.getOres("ingotLead").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.lead");
GameRegistry.registerItem(leadDrill, "leadDrill");
bronzeDrill = new ItemVanillaDrill(bronzeMaterial, 650, ":bronzeDrill", OreDictionary.getOres("ingotBronze").get(0)).setUnlocalizedName(ModInformation.modid + ".bronzeDrill");
bronzeDrill = new ItemVanillaDrill(bronzeMaterial, 650, ":drill_bronze", OreDictionary.getOres("ingotBronze").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.bronze");
GameRegistry.registerItem(bronzeDrill, "bronzeDrill");
woodenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.WOOD, 75, ":woodenChainsaw", Item.getItemFromBlock(Blocks.planks)).setUnlocalizedName(ModInformation.modid + ".woodenChainsaw");
woodenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.WOOD, 75, ":woodenChainsaw", Item.getItemFromBlock(Blocks.planks)).setUnlocalizedName(ModInformation.modid + ".chainsaw.wood");
GameRegistry.registerItem(woodenChainsaw, "woodenChainsaw");
stoneChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.STONE, 165, ":stoneChainsaw", Item.getItemFromBlock(Blocks.cobblestone)).setUnlocalizedName(ModInformation.modid + ".stoneChainsaw");
stoneChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.STONE, 165, ":stoneChainsaw", Item.getItemFromBlock(Blocks.cobblestone)).setUnlocalizedName(ModInformation.modid + ".chainsaw.stone");
GameRegistry.registerItem(stoneChainsaw, "stoneChainsaw");
ironChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.IRON, 315, ":ironChainsaw", Items.iron_ingot, 3F).setUnlocalizedName(ModInformation.modid + ".ironChainsaw");
ironChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.IRON, 315, ":ironChainsaw", Items.iron_ingot, 3F).setUnlocalizedName(ModInformation.modid + ".chainsaw.iron");
GameRegistry.registerItem(ironChainsaw, "ironChainsaw");
goldenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.GOLD, 55, ":goldenChainsaw", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".goldenChainsaw");
goldenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.GOLD, 55, ":goldenChainsaw", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".chainsaw.gold");
GameRegistry.registerItem(goldenChainsaw, "goldenChainsaw");
diamondChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.EMERALD, 2015, ":diamondChainsaw", Items.diamond, 6F).setUnlocalizedName(ModInformation.modid + ".diamondChainsaw");
diamondChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.EMERALD, 2015, ":diamondChainsaw", Items.diamond, 6F).setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond");
GameRegistry.registerItem(diamondChainsaw, "diamondChainsaw");
ironOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.IRON, 500, ":ironOmnitool", Items.iron_ingot).setUnlocalizedName(ModInformation.modid + ".ironOmnitool");
ironOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.IRON, 500, ":ironOmnitool", Items.iron_ingot).setUnlocalizedName(ModInformation.modid + ".omnitool.iron");
GameRegistry.registerItem(ironOmnitool, "ironOmnitool");
goldenOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.GOLD, 100, ":goldenOmnitool", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".goldenOmnitool");
goldenOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.GOLD, 100, ":goldenOmnitool", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".omnitool.gold");
GameRegistry.registerItem(goldenOmnitool, "goldenOmnitool");
diamondOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.EMERALD, 3900, ":diamondOmnitool", Items.diamond).setUnlocalizedName(ModInformation.modid + ".diamondOmnitool");
diamondOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.EMERALD, 3900, ":diamondOmnitool", Items.diamond).setUnlocalizedName(ModInformation.modid + ".omnitool.diamond");
GameRegistry.registerItem(diamondOmnitool, "diamondOmnitool");
}
}
src/main/java/tombenpotter/emt/common/module/vanilla/items/ItemCraftingComponent.java
+36 -46
View File
@@ -14,9 +14,9 @@ import java.util.List;
public class ItemCraftingComponent extends Item {
public IIcon[] icon = new IIcon[500];
public final String drillTop = "DrillTop";
public final String chainsawTop = "ChainsawTop";
public IIcon[] icon = new IIcon[17];
public final String drillTop = "drillTop";
public final String chainsawTop = "chainsawTop";
public ItemCraftingComponent() {
this.setMaxDamage(0);
@@ -32,75 +32,67 @@ public class ItemCraftingComponent extends Item {
name = "nothing";
break;
case 0: {
name = "wooden" + drillTop;
name = drillTop + ".wood";
break;
}
case 1: {
name = "stone" + drillTop;
name = drillTop + ".stone";
break;
}
case 2: {
name = "iron" + drillTop;
name = drillTop + ".iron";
break;
}
case 3: {
name = "golden" + drillTop;
name = drillTop + ".gold";
break;
}
case 4: {
name = "diamond" + drillTop;
name = drillTop + ".diamond";
break;
}
case 5: {
name = "copper" + drillTop;
name = drillTop + ".copper";
break;
}
case 6: {
name = "tin" + drillTop;
name = drillTop + ".tin";
break;
}
case 7: {
name = "lead" + drillTop;
name = drillTop + ".lead";
break;
}
case 8: {
name = "tin" + drillTop;
name = chainsawTop + ".wood";
break;
}
case 9: {
name = "wooden" + chainsawTop;
name = chainsawTop + ".stone";
break;
}
case 10: {
name = "stone" + chainsawTop;
name = chainsawTop + ".iron";
break;
}
case 11: {
name = "iron" + chainsawTop;
name = chainsawTop + ".gold";
break;
}
case 12: {
name = "golden" + chainsawTop;
name = chainsawTop + ".diamond";
break;
}
case 13: {
name = "diamond" + chainsawTop;
name = chainsawTop + ".copper";
break;
}
case 14: {
name = "copper" + chainsawTop;
name = chainsawTop + ".tin";
break;
}
case 15: {
name = "tin" + chainsawTop;
break;
}
case 16: {
name = "lead" + chainsawTop;
break;
}
case 17: {
name = "tin" + chainsawTop;
name = chainsawTop + ".lead";
break;
}
}
@@ -109,25 +101,23 @@ public class ItemCraftingComponent extends Item {
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister ri) {
this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":wooden" + drillTop);
this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":stone" + drillTop);
this.icon[2] = ri.registerIcon(ModInformation.texturePath + ":iron" + drillTop);
this.icon[3] = ri.registerIcon(ModInformation.texturePath + ":golden" + drillTop);
this.icon[4] = ri.registerIcon(ModInformation.texturePath + ":diamond" + drillTop);
this.icon[5] = ri.registerIcon(ModInformation.texturePath + ":copper" + drillTop);
this.icon[6] = ri.registerIcon(ModInformation.texturePath + ":tin" + drillTop);
this.icon[7] = ri.registerIcon(ModInformation.texturePath + ":lead" + drillTop);
this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":bronze" + drillTop);
this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "wood");
this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "stone");
this.icon[2] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "iron");
this.icon[3] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "gold");
this.icon[4] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "diamond");
this.icon[5] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "copper");
this.icon[6] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "tin");
this.icon[7] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "lead");
this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":wooden" + chainsawTop);
this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":stone" + chainsawTop);
this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":iron" + chainsawTop);
this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":golden" + chainsawTop);
this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":diamond" + chainsawTop);
this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":copper" + chainsawTop);
this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":tin" + chainsawTop);
this.icon[16] = ri.registerIcon(ModInformation.texturePath + ":lead" + chainsawTop);
this.icon[17] = ri.registerIcon(ModInformation.texturePath + ":bronze" + chainsawTop);
this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "wood");
this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "stone");
this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "iron");
this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "gold");
this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "diamond");
this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "copper");
this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "tin");
this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "lead");
}
@SideOnly(Side.CLIENT)
@@ -137,7 +127,7 @@ public class ItemCraftingComponent extends Item {
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) {
for (int i = 0; i <= 32; i++) {
for (int i = 0; i <= 15; i++) {
list.add(new ItemStack(this, 1, i));
}
}