From 0d4b9afd014a3bc86774b2d20c40ef855ae12054 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 27 Nov 2015 20:17:12 +0000 Subject: [PATCH] All Items now have textures --- src/main/java/techreborn/init/ModItems.java | 4 ++-- .../techreborn/items/ItemLapotronicOrb.java | 12 +++++++++- .../java/techreborn/items/ItemUUmatter.java | 11 ++++++++- .../items/armor/ItemLapotronPack.java | 20 ++++++++++++++++- .../items/armor/ItemLithiumBatpack.java | 21 +++++++++++++++++- .../items/tools/ItemAdvancedDrill.java | 21 +++++++++++++++++- .../techreborn/items/tools/ItemHammer.java | 19 +++++++++++++++- .../techreborn/items/tools/ItemOmniTool.java | 21 +++++++++++++++++- .../items/tools/ItemRockCutter.java | 21 +++++++++++++++++- .../techreborn/items/tools/ItemTechPda.java | 13 ++++++++++- .../textures/items/part/dataOrb.png | Bin 0 -> 208 bytes .../textures/items/part/destructoPack.png | Bin 0 -> 202 bytes .../items/part/diamondGrindingHead.png | Bin 0 -> 238 bytes .../textures/items/part/energyFlowCircuit.png | Bin 0 -> 228 bytes .../textures/items/part/laserFocus.png | Bin 0 -> 709 bytes .../textures/items/part/massHoleDevice.png | Bin 0 -> 203 bytes 16 files changed, 152 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/assets/techreborn/textures/items/part/dataOrb.png create mode 100644 src/main/resources/assets/techreborn/textures/items/part/destructoPack.png create mode 100644 src/main/resources/assets/techreborn/textures/items/part/diamondGrindingHead.png create mode 100644 src/main/resources/assets/techreborn/textures/items/part/energyFlowCircuit.png create mode 100644 src/main/resources/assets/techreborn/textures/items/part/laserFocus.png create mode 100644 src/main/resources/assets/techreborn/textures/items/part/massHoleDevice.png diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 88dc7f05f..efec81eaa 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -112,8 +112,8 @@ public class ModItems { uuMatter = new ItemUUmatter(); GameRegistry.registerItem(uuMatter, "uumatter"); - upgrades = new ItemUpgrade(); - GameRegistry.registerItem(upgrades, "upgrades"); +// upgrades = new ItemUpgrade(); +// GameRegistry.registerItem(upgrades, "upgrades"); cloakingDevice = PoweredItem.createItem(ItemCloakingDevice.class); GameRegistry.registerItem(cloakingDevice, "cloakingdevice"); diff --git a/src/main/java/techreborn/items/ItemLapotronicOrb.java b/src/main/java/techreborn/items/ItemLapotronicOrb.java index a2ef244b0..c0c8ea963 100644 --- a/src/main/java/techreborn/items/ItemLapotronicOrb.java +++ b/src/main/java/techreborn/items/ItemLapotronicOrb.java @@ -7,7 +7,7 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -public class ItemLapotronicOrb extends Item implements IEnergyItemInfo{ +public class ItemLapotronicOrb extends ItemTextureBase implements IEnergyItemInfo{ public static final int maxCharge = ConfigTechReborn.LapotronicOrbMaxCharge; public static final int tier = ConfigTechReborn.LithiumBatpackTier; @@ -48,4 +48,14 @@ public class ItemLapotronicOrb extends Item implements IEnergyItemInfo{ public int getStackTeir(ItemStack stack) { return tier; } + + @Override + public String getTextureName(int damage) { + return "techreborn:items/lapotronicEnergyOrb"; + } + + @Override + public int getMaxMeta() { + return 1; + } } diff --git a/src/main/java/techreborn/items/ItemUUmatter.java b/src/main/java/techreborn/items/ItemUUmatter.java index 2f1605be9..085a40a24 100644 --- a/src/main/java/techreborn/items/ItemUUmatter.java +++ b/src/main/java/techreborn/items/ItemUUmatter.java @@ -3,7 +3,7 @@ package techreborn.items; import net.minecraft.item.Item; import techreborn.client.TechRebornCreativeTabMisc; -public class ItemUUmatter extends Item { +public class ItemUUmatter extends ItemTextureBase { public ItemUUmatter() { setCreativeTab(TechRebornCreativeTabMisc.instance); @@ -11,4 +11,13 @@ public class ItemUUmatter extends Item { } + @Override + public String getTextureName(int damage) { + return "techreborn:items/misc/itemMatter"; + } + + @Override + public int getMaxMeta() { + return 1; + } } diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index 48e1bef87..afd8ecad3 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -8,14 +8,17 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.api.IItemTexture; +import reborncore.api.TextureRegistry; import techreborn.api.power.IEnergyItemInfo; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; +import techreborn.lib.ModInfo; import techreborn.powerSystem.PoweredItem; import java.util.List; -public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { +public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, IItemTexture { public static final int maxCharge = ConfigTechReborn.LapotronPackCharge; public static final int tier = ConfigTechReborn.LapotronPackTier; @@ -26,6 +29,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { setCreativeTab(TechRebornCreativeTab.instance); setUnlocalizedName("techreborn.lapotronpack"); setMaxStackSize(1); + TextureRegistry.registerItem(this); } @@ -85,4 +89,18 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { } + @Override + public String getTextureName(int damage) { + return "techreborn:items/tool/lapotronicEnergyOrb"; + } + + @Override + public int getMaxMeta() { + return 1; + } + + @Override + public String getModID() { + return ModInfo.MOD_ID; + } } diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index aa2ceccee..cf81058d5 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -7,14 +7,17 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.api.IItemTexture; +import reborncore.api.TextureRegistry; import techreborn.api.power.IEnergyItemInfo; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; +import techreborn.lib.ModInfo; import techreborn.powerSystem.PoweredItem; import java.util.List; -public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { +public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IItemTexture { public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge; public static final int tier = ConfigTechReborn.LithiumBatpackTier; @@ -25,6 +28,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { setMaxStackSize(1); setUnlocalizedName("techreborn.lithiumbatpack"); setCreativeTab(TechRebornCreativeTab.instance); + TextureRegistry.registerItem(this); } @@ -83,4 +87,19 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { public boolean showDurabilityBar(ItemStack stack) { return true; } + + @Override + public String getTextureName(int damage) { + return "techreborn:items/tool/lithiumBatpack"; + } + + @Override + public int getMaxMeta() { + return 1; + } + + @Override + public String getModID() { + return ModInfo.MOD_ID; + } } diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 59fb94e0a..d2595d115 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -14,15 +14,18 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.api.IItemTexture; +import reborncore.api.TextureRegistry; import reborncore.common.util.TorchHelper; import techreborn.api.power.IEnergyItemInfo; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; +import techreborn.lib.ModInfo; import techreborn.powerSystem.PoweredItem; import java.util.List; -public class ItemAdvancedDrill extends ItemPickaxe implements IEnergyItemInfo { +public class ItemAdvancedDrill extends ItemPickaxe implements IEnergyItemInfo, IItemTexture { public static final int maxCharge = ConfigTechReborn.AdvancedDrillCharge; public int cost = 250; @@ -36,6 +39,7 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IEnergyItemInfo { setMaxStackSize(1); setMaxDamage(240); setUnlocalizedName("techreborn.advancedDrill"); + TextureRegistry.registerItem(this); } @Override @@ -127,4 +131,19 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IEnergyItemInfo { public boolean showDurabilityBar(ItemStack stack) { return true; } + + @Override + public String getTextureName(int damage) { + return "techreborn:items/tool/advancedDrill"; + } + + @Override + public int getMaxMeta() { + return 1; + } + + @Override + public String getModID() { + return ModInfo.MOD_ID; + } } diff --git a/src/main/java/techreborn/items/tools/ItemHammer.java b/src/main/java/techreborn/items/tools/ItemHammer.java index b04af9a04..0406e0aac 100644 --- a/src/main/java/techreborn/items/tools/ItemHammer.java +++ b/src/main/java/techreborn/items/tools/ItemHammer.java @@ -2,9 +2,11 @@ package techreborn.items.tools; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import reborncore.api.IItemTexture; import techreborn.items.ItemTR; +import techreborn.lib.ModInfo; -public class ItemHammer extends ItemTR { +public class ItemHammer extends ItemTR implements IItemTexture { private String iconName; public ItemHammer(int MaxDamage) { @@ -40,4 +42,19 @@ public class ItemHammer extends ItemTR { return copiedStack; } + @Override + public String getTextureName(int damage) { + return "techreborn:items/tool/techreborn.hammer"; + } + + @Override + public int getMaxMeta() { + return 1; + } + + @Override + public String getModID() { + return ModInfo.MOD_ID; + } + } diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 1701e1e52..0e9f7c132 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -15,15 +15,18 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.api.IItemTexture; +import reborncore.api.TextureRegistry; import reborncore.common.util.TorchHelper; import techreborn.api.power.IEnergyItemInfo; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; +import techreborn.lib.ModInfo; import techreborn.powerSystem.PoweredItem; import java.util.List; -public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { +public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, IItemTexture { public static final int maxCharge = ConfigTechReborn.OmniToolCharge; public static final int tier = ConfigTechReborn.OmniToolTier; @@ -37,6 +40,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { setMaxStackSize(1); setMaxDamage(200); setUnlocalizedName("techreborn.omniTool"); + TextureRegistry.registerItem(this); } @Override @@ -141,4 +145,19 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { return true; } + @Override + public String getTextureName(int damage) { + return "techreborn:items/tool/omnitool"; + } + + @Override + public int getMaxMeta() { + return 1; + } + + @Override + public String getModID() { + return ModInfo.MOD_ID; + } + } diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 33f95609b..e7de8cf44 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -11,15 +11,18 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.api.IItemTexture; +import reborncore.api.TextureRegistry; import reborncore.common.util.Color; import techreborn.api.power.IEnergyItemInfo; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; +import techreborn.lib.ModInfo; import techreborn.powerSystem.PoweredItem; import java.util.List; -public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { +public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, IItemTexture { public static final int maxCharge = ConfigTechReborn.RockCutterCharge; public int cost = 500; @@ -31,6 +34,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); efficiencyOnProperMaterial = 16F; + TextureRegistry.registerItem(this); } @Override @@ -131,4 +135,19 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { public boolean showDurabilityBar(ItemStack stack) { return true; } + + @Override + public String getTextureName(int damage) { + return "techreborn:items/tool/rockcutter"; + } + + @Override + public int getMaxMeta() { + return 1; + } + + @Override + public String getModID() { + return ModInfo.MOD_ID; + } } diff --git a/src/main/java/techreborn/items/tools/ItemTechPda.java b/src/main/java/techreborn/items/tools/ItemTechPda.java index 3b4e043c2..0d38378c7 100644 --- a/src/main/java/techreborn/items/tools/ItemTechPda.java +++ b/src/main/java/techreborn/items/tools/ItemTechPda.java @@ -7,8 +7,9 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; +import techreborn.items.ItemTextureBase; -public class ItemTechPda extends Item { +public class ItemTechPda extends ItemTextureBase { public ItemTechPda() { setCreativeTab(TechRebornCreativeTab.instance); @@ -24,4 +25,14 @@ public class ItemTechPda extends Item { return itemStack; } + @Override + public int getMaxMeta() { + return 1; + } + + @Override + public String getTextureName(int damage) { + return "techreborn:items/tool/pda"; + } + } diff --git a/src/main/resources/assets/techreborn/textures/items/part/dataOrb.png b/src/main/resources/assets/techreborn/textures/items/part/dataOrb.png new file mode 100644 index 0000000000000000000000000000000000000000..f806aae81d861a00d24cdd9051491fa2cb3a97a0 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=1i8!p*QkjN!jh^Ymp4 zH|)82|H=RV|1;LrJ^)HFmIV0)GdMiEkp|=>d%8G=RKz7aF!eMwF(tHBR8}fREV#2+ zMN~y4?onWl7>7_nroK5Fm*KREDKo@ZGf9fRJ$LNsQU|xnof`#bFir{3XY!mXIeofz zE7R9*_1WSpnYJ>wUg>UNa!`li#;{an^LB{Ts5hw4L~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/part/destructoPack.png b/src/main/resources/assets/techreborn/textures/items/part/destructoPack.png new file mode 100644 index 0000000000000000000000000000000000000000..a0a2e88630b80558c958362e9b98e48862482e8a GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=2v!Jbl^14SS9-FxYaSW-53+=njc|d{3^)cJBS&SvjXIYxQ z?C+2k+2#2By|1Rz`|A&%c)IimJbI>hnK@<3f|D&wtJ(w7T7`7?wu?WiGh-;;^X}N5 u2ikvU=k8G}IxLoUM}UDP@5vU&HRf`r^91k2oGCB`Imy%2&t;ucLK6U@w@ae{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/part/diamondGrindingHead.png b/src/main/resources/assets/techreborn/textures/items/part/diamondGrindingHead.png new file mode 100644 index 0000000000000000000000000000000000000000..6a0af7edc3bab33e8f0ad12f39717c9b9d698b1d GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=0-vZx|UF1q1|C{(sdx zec8eddseMlb@Tp{|NsAotQXh{RKQpg%8%Wr`k?&<31vd$@?2>=7(T0Z~) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/part/energyFlowCircuit.png b/src/main/resources/assets/techreborn/textures/items/part/energyFlowCircuit.png new file mode 100644 index 0000000000000000000000000000000000000000..067ea6423b6406c87d0eb3b143b82c869b2bfdb2 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=1j(deX?qsCMfA=IP58 zZrHQ`)c>3JpZx#-|Gn0QQlKnjNswPKgTu2MX+Tbir;B4qMO<=1LPDCEK>`C~TB0+D z^PxpM1zn8GW~eUbYGAo#Wqp}RQliJ&NXzC{P_Lv!uXS&)Z4awN&+TQit;?558B1(0 zou!f8u%u_Xgmih+Qln))S=^>+2@^bCzwzN^k-U*MO@_;8g5wnv3xShCJB%4t+e&kA S)#UC5xz*Fv&t;ucLK6VJ5lw^u literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/part/laserFocus.png b/src/main/resources/assets/techreborn/textures/items/part/laserFocus.png new file mode 100644 index 0000000000000000000000000000000000000000..c14f93f59b3d14dadb4f9c60184ffba9a392d1cc GIT binary patch literal 709 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47=r_RLR|m<|8FMB*WqTJEiE}k zS-Dj~;lHcP_dvh@&MyBw-T!;I@3ydbW@_@)!QsD~|6zOEFWa{L{q}8+w&n~C^{E=F zt8{g?nwvkdvD#~C{&VHZZ%?0Wx3HL{u71+icA~OMpOVr%ZLPyvTK_#f|2ueXH8uKN zS#~Hnd8Ud=zmj6Nl2V(3Vz-LQBrVO2>gs>&Jhq#gTrxFYqN6iML!(bg@u`(XgS=d& zj7+1F;uKAdHR|fm%}f^R>F(3jnWmx9tE5mZCtEBdz2Cw*PgbT$Rdtf0;zJ9EIl6k4 za&mQYat(5Fm2xuq($eXYlJOD}v62$`it?TEaw~K-tCf}WWn~JbrBfs&;>5)w#KaP$ zq|0Sx7ptlls;Xzo$|g%l#!E`Xh>3@YibhFEB*@A&$;!3L$rs5;C&|gBOUuScNrp>G z=1EG{$jH>l$X3b7R?Es%%18qPvsa?yEijY|N`m}=!OZXs2wsB-5cu=&IfU`|?|Uc< zDEJW~_UzeA%_wnb~%{v&F{`~p(m)V6u f)a#AWgslwU+BIT}JNIt_I-bGP)z4*}Q$iB}3@JR< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/part/massHoleDevice.png b/src/main/resources/assets/techreborn/textures/items/part/massHoleDevice.png new file mode 100644 index 0000000000000000000000000000000000000000..4c7707b77689475db3db81c4bd6cf4f0813662c2 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=2tuDk`d>p;293-8_BS z!VPG+&^~Lv1_c3^>Cy%&PQ3RHR51HH z9AwnEagS}?`vjiO;JthPc5z4~p4oADL(7HL*KJybW-SeHSlM)K${+4LdnLw#=c0|Q v@h|V&9FG>e{QS@%=|+cx(yI9)uY1{ldPrn_<84j=TE^h%>gTe~DWM4f=F>