diff --git a/src/main/java/com/hbm/items/ItemRemap.java b/src/main/java/com/hbm/items/ItemRemap.java new file mode 100644 index 000000000..3bea0c93a --- /dev/null +++ b/src/main/java/com/hbm/items/ItemRemap.java @@ -0,0 +1,41 @@ +package com.hbm.items; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class ItemRemap extends Item { + + Item remapItem; + int remapMeta; + + public ItemRemap(Item item, int meta) { + this.remapItem = item; + this.remapMeta = meta; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int meta) { + return this.remapItem.getIconFromDamage(this.remapMeta); + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean held) { + + if(!(entity instanceof EntityPlayer)) return; + + EntityPlayer player = (EntityPlayer) entity; + player.inventory.setInventorySlotContents(slot, new ItemStack(this.remapItem, stack.stackSize, this.remapMeta)); + } + + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int pass) { + return 0xFF8080; + } +} diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 9f093c282..5b8d8db86 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -7922,5 +7922,151 @@ public class ModItems { GameRegistry.registerItem(digamma_up_on_top, digamma_up_on_top.getUnlocalizedName()); GameRegistry.registerItem(mysteryshovel, mysteryshovel.getUnlocalizedName()); GameRegistry.registerItem(memory, memory.getUnlocalizedName()); + + addRemap("ammo_nuke_tots", 5594, ammo_nuke, AmmoFatman.TOTS); + addRemap("ammo_12gauge_incendiary", 5455, ammo_12gauge, Ammo12Gauge.INCENDIARY); + addRemap("ammo_12gauge_shrapnel", 5456, ammo_12gauge, Ammo12Gauge.SHRAPNEL); + addRemap("ammo_stinger_rocket_bones", 5572, ammo_stinger_rocket, AmmoStinger.BONES); + addRemap("ammo_556_flechette_phosphorus", 5515, ammo_556, Ammo556mm.FLECHETTE_PHOSPHORUS); + addRemap("ammo_50ae_chlorophyte", 5527, ammo_50ae, Ammo50AE.CHLOROPHYTE); + addRemap("gun_revolver_nightmare2_ammo", 5440, ammo_357, Ammo357Magnum.NIGHTMARE2); + addRemap("gun_revolver_iron_ammo", 5432, ammo_357, Ammo357Magnum.IRON); + addRemap("ammo_50bmg_star", 5534, ammo_50bmg, Ammo50BMG.STAR); + addRemap("ammo_556_star", 5509, ammo_556, Ammo556mm.STAR); + addRemap("ammo_556_flechette", 5513, ammo_556, Ammo556mm.FLECHETTE); + addRemap("ammo_12gauge_du", 5457, ammo_12gauge, Ammo12Gauge.DU); + addRemap("ammo_shell_apfsds_t", 5586, ammo_shell, Ammo240Shell.APFSDS_T); + addRemap("ammo_4gauge_void", 5481, ammo_4gauge, Ammo4Gauge.VOID); + addRemap("ammo_shell_apfsds_du", 5587, ammo_shell, Ammo240Shell.APFSDS_DU); + addRemap("ammo_fireext_foam", 5549, ammo_fireext, AmmoFireExt.FOAM); + addRemap("ammo_556_flechette_chlorophyte", 5517, ammo_556, Ammo556mm.FLECHETTE_CHLOROPHYTE); + addRemap("ammo_fuel_vaporizer", 5546, ammo_fuel, AmmoFlamethrower.VAPORIZER); + addRemap("ammo_4gauge_titan", 5482, ammo_4gauge, Ammo4Gauge.QUACK); + addRemap("ammo_556_phosphorus", 5506, ammo_556, Ammo556mm.PHOSPHORUS); + addRemap("ammo_4gauge_flechette_phosphorus", 5473, ammo_4gauge, Ammo4Gauge.FLECHETTE_PHOSPHORUS); + addRemap("ammo_shell_w9", 5588, ammo_shell, Ammo240Shell.W9); + addRemap("gun_revolver_gold_ammo", 5434, ammo_357, Ammo357Magnum.GOLD); + addRemap("ammo_556_flechette_du", 5516, ammo_556, Ammo556mm.FLECHETTE_DU); + addRemap("ammo_20gauge_incendiary", 5463, ammo_20gauge, Ammo20Gauge.INCENDIARY); + addRemap("ammo_shell_explosive", 5585, ammo_shell, Ammo240Shell.EXPLOSIVE); + addRemap("ammo_20gauge_explosive", 5465, ammo_20gauge, Ammo20Gauge.EXPLOSIVE); + addRemap("ammo_556_k", 5519, ammo_556, Ammo556mm.K); + addRemap("ammo_44_phosphorus", 5487, ammo_44, Ammo44Magnum.PHOSPHORUS); + addRemap("gun_revolver_cursed_ammo", 5437, ammo_357, Ammo357Magnum.STEEL); + addRemap("ammo_556_flechette_incendiary", 5514, ammo_556, Ammo556mm.FLECHETTE_INCENDIARY); + addRemap("ammo_75bolt_he", 5542, ammo_75bolt, Ammo75Bolt.HE); + addRemap("ammo_20gauge_flechette", 5462, ammo_20gauge, Ammo20Gauge.FLECHETTE); + addRemap("ammo_rocket_shrapnel", 5559, ammo_rocket, AmmoRocket.SHRAPNEL); + addRemap("ammo_556_chlorophyte", 5510, ammo_556, Ammo556mm.CHLOROPHYTE); + addRemap("ammo_12gauge_marauder", 5459, ammo_12gauge, Ammo12Gauge.MARAUDER); + addRemap("ammo_50bmg_chlorophyte", 5535, ammo_50bmg, Ammo50BMG.CHLOROPHYTE); + addRemap("ammo_rocket_emp", 5560, ammo_rocket, AmmoRocket.EMP); + addRemap("ammo_4gauge_vampire", 5480, ammo_4gauge, Ammo4Gauge.VAMPIRE); + addRemap("ammo_5mm_du", 5496, ammo_5mm, Ammo5mm.DU); + addRemap("ammo_9mm_rocket", 5503, ammo_9mm, Ammo9mm.ROCKET); + addRemap("gun_revolver_ammo", 5433, ammo_357, Ammo357Magnum.LEAD); + addRemap("ammo_grenade_sleek", 5580, ammo_grenade, AmmoGrenade.SLEEK); + addRemap("ammo_4gauge_slug", 5471, ammo_4gauge, Ammo4Gauge.SLUG); + addRemap("ammo_4gauge_kampf", 5477, ammo_4gauge, Ammo4Gauge.KAMPF); + addRemap("ammo_20gauge_shrapnel", 5464, ammo_20gauge, Ammo20Gauge.SHRAPNEL); + addRemap("ammo_5mm_explosive", 5495, ammo_5mm, Ammo5mm.EXPLOSIVE); + addRemap("gun_revolver_nightmare_ammo", 5438, ammo_357, Ammo357Magnum.NIGHTMARE1); + addRemap("ammo_stinger_rocket_he", 5569, ammo_stinger_rocket, AmmoStinger.HE); + addRemap("ammo_20gauge_caustic", 5466, ammo_20gauge, Ammo20Gauge.CAUSTIC); + addRemap("ammo_4gauge_semtex", 5475, ammo_4gauge, Ammo4Gauge.MINING); + addRemap("ammo_grenade_kampf", 5583, ammo_grenade, AmmoGrenade.KAMPF); + addRemap("ammo_556_flechette_sleek", 5518, ammo_556, Ammo556mm.FLECHETTE_SLEEK); + addRemap("ammo_mirv_special", 5602, ammo_nuke, AmmoFatman.MIRV_SPECIAL); + addRemap("ammo_50bmg_flechette", 5536, ammo_50bmg, Ammo50BMG.FLECHETTE); + addRemap("ammo_556_sleek", 5511, ammo_556, Ammo556mm.SLEEK); + addRemap("ammo_9mm_chlorophyte", 5502, ammo_9mm, Ammo9mm.CHLOROPHYTE); + addRemap("ammo_nuke_barrel", 5597, ammo_nuke, AmmoFatman.BARREL); + addRemap("ammo_nuke_low", 5592, ammo_nuke, AmmoFatman.LOW); + addRemap("ammo_fireext_sand", 5550, ammo_fireext, AmmoFireExt.SAND); + addRemap("ammo_44_silver", 5492, ammo_44, Ammo44Magnum.SILVER); + addRemap("ammo_grenade_concussion", 5578, ammo_grenade, AmmoGrenade.CONCUSSION); + addRemap("ammo_20gauge_shock", 5467, ammo_20gauge, Ammo20Gauge.SHOCK); + addRemap("ammo_4gauge_flechette", 5472, ammo_4gauge, Ammo4Gauge.FLECHETTE); + addRemap("ammo_rocket_toxic", 5562, ammo_rocket, AmmoRocket.CHLORINE); + addRemap("ammo_50bmg_explosive", 5531, ammo_50bmg, Ammo50BMG.EXPLOSIVE); + addRemap("ammo_grenade_finned", 5579, ammo_grenade, AmmoGrenade.FINNED); + addRemap("ammo_dart_nuclear", 5553, ammo_dart, AmmoDart.NUCLEAR); + addRemap("ammo_grenade_phosphorus", 5576, ammo_grenade, AmmoGrenade.PHOSPHORUS); + addRemap("ammo_5mm_star", 5497, ammo_5mm, Ammo5mm.STAR); + addRemap("ammo_4gauge_sleek", 5483, ammo_4gauge, Ammo4Gauge.SLEEK); + addRemap("ammo_mirv_high", 5600, ammo_nuke, AmmoFatman.MIRV_HIGH); + addRemap("ammo_5mm_chlorophyte", 5498, ammo_5mm, Ammo5mm.CHLOROPHYTE); + addRemap("ammo_50bmg_flechette_po", 5538, ammo_50bmg, Ammo50BMG.FLECHETTE_PO); + addRemap("ammo_50ae_star", 5526, ammo_50ae, Ammo50AE.STAR); + addRemap("ammo_50bmg_flechette_am", 5537, ammo_50bmg, Ammo50BMG.FLECHETTE_AM); + addRemap("ammo_9mm_ap", 5500, ammo_9mm, Ammo9mm.AP); + addRemap("ammo_mirv", 5598, ammo_nuke, AmmoFatman.MIRV); + addRemap("ammo_4gauge_claw", 5479, ammo_4gauge, Ammo4Gauge.CLAW); + addRemap("ammo_rocket_glare", 5561, ammo_rocket, AmmoRocket.GLARE); + addRemap("ammo_stinger_rocket_incendiary", 5570, ammo_stinger_rocket, AmmoStinger.INCENDIARY); + addRemap("ammo_rocket_incendiary", 5557, ammo_rocket, AmmoRocket.INCENDIARY); + addRemap("ammo_50ae_ap", 5524, ammo_50ae, Ammo50AE.AP); + addRemap("ammo_mirv_safe", 5601, ammo_nuke, AmmoFatman.MIRV_SAFE); + addRemap("ammo_4gauge_canister", 5478, ammo_4gauge, Ammo4Gauge.CANISTER); + addRemap("ammo_50ae_du", 5525, ammo_50ae, Ammo50AE.DU); + addRemap("ammo_44_ap", 5485, ammo_44, Ammo44Magnum.AP); + addRemap("ammo_44_bj", 5491, ammo_44, Ammo44Magnum.BJ); + addRemap("ammo_rocket_sleek", 5564, ammo_rocket, AmmoRocket.SLEEK); + addRemap("ammo_nuke_high", 5593, ammo_nuke, AmmoFatman.HIGH); + addRemap("ammo_grenade_incendiary", 5575, ammo_grenade, AmmoGrenade.INCENDIARY); + addRemap("ammo_44_du", 5486, ammo_44, Ammo44Magnum.DU); + addRemap("ammo_50bmg_ap", 5532, ammo_50bmg, Ammo50BMG.AP); + addRemap("ammo_50bmg_du", 5533, ammo_50bmg, Ammo50BMG.DU); + addRemap("ammo_9mm_du", 5501, ammo_9mm, Ammo9mm.DU); + addRemap("ammo_20gauge_slug", 5461, ammo_20gauge, Ammo20Gauge.SLUG); + addRemap("ammo_grenade_tracer", 5582, ammo_grenade, AmmoGrenade.TRACER); + addRemap("ammo_fuel_phosphorus", 5545, ammo_fuel, AmmoFlamethrower.PHOSPHORUS); + addRemap("ammo_44_pip", 5490, ammo_44, Ammo44Magnum.PIP); + addRemap("ammo_grenade_toxic", 5577, ammo_grenade, AmmoGrenade.CHLORINE); + addRemap("ammo_nuke_safe", 5595, ammo_nuke, AmmoFatman.SAFE); + addRemap("gun_mp_ammo", 5505, ammo_556, Ammo556mm.GOLD); + addRemap("gun_revolver_lead_ammo", 5435, ammo_357, Ammo357Magnum.NUCLEAR); + addRemap("ammo_stinger_rocket_nuclear", 5571, ammo_stinger_rocket, AmmoStinger.NUCLEAR); + addRemap("ammo_grenade_nuclear", 5581, ammo_grenade, AmmoGrenade.NUCLEAR); + addRemap("ammo_rocket_digamma", 5567, ammo_rocket, AmmoRocket.DIGAMMA); + addRemap("ammo_rocket_nuclear", 5565, ammo_rocket, AmmoRocket.NUCLEAR); + addRemap("ammo_mirv_low", 5599, ammo_nuke, AmmoFatman.MIRV_LOW); + addRemap("ammo_44_chlorophyte", 5489, ammo_44, Ammo44Magnum.CHLOROPHYTE); + addRemap("ammo_22lr_chlorophyte", 5522, ammo_22lr, Ammo22LR.CHLOROPHYTE); + addRemap("ammo_12gauge_sleek", 5458, ammo_12gauge, Ammo12Gauge.SLEEK); + addRemap("ammo_20gauge_sleek", 5469, ammo_20gauge, Ammo20Gauge.SLEEK); + addRemap("ammo_4gauge_explosive", 5474, ammo_4gauge, Ammo4Gauge.EXPLOSIVE); + addRemap("ammo_50bmg_incendiary", 5529, ammo_50bmg, Ammo50BMG.INCENDIARY); + addRemap("ammo_556_du", 5508, ammo_556, Ammo556mm.DU); + addRemap("ammo_fuel_napalm", 5544, ammo_fuel, AmmoFlamethrower.NAPALM); + addRemap("gun_revolver_schrabidium_ammo", 5436, ammo_357, Ammo357Magnum.SCHRABIDIUM); + addRemap("ammo_556_ap", 5507, ammo_556, Ammo556mm.AP); + addRemap("ammo_20gauge_wither", 5468, ammo_20gauge, Ammo20Gauge.WITHER); + addRemap("ammo_rocket_rpc", 5566, ammo_rocket, AmmoRocket.RPC); + addRemap("ammo_fuel_gas", 5547, ammo_fuel, AmmoFlamethrower.CHLORINE); + addRemap("ammo_22lr_ap", 5521, ammo_22lr, Ammo22LR.AP); + addRemap("ammo_grenade_he", 5574, ammo_grenade, AmmoGrenade.HE); + addRemap("ammo_4gauge_balefire", 5476, ammo_4gauge, Ammo4Gauge.BALEFIRE); + addRemap("ammo_357_desh", 5439, ammo_357, Ammo357Magnum.DESH); + addRemap("ammo_nuke_pumpkin", 5596, ammo_nuke, AmmoFatman.PUMPKIN); + addRemap("ammo_44_star", 5488, ammo_44, Ammo44Magnum.STAR); + addRemap("ammo_50bmg_sleek", 5539, ammo_50bmg, Ammo50BMG.SLEEK); + addRemap("ammo_dart_nerf", 5554, ammo_dart, AmmoDart.NERF); + addRemap("ammo_50bmg_phosphorus", 5530, ammo_50bmg, Ammo50BMG.PHOSPHORUS); + addRemap("ammo_44_rocket", 5493, ammo_44, Ammo44Magnum.ROCKET); + addRemap("ammo_rocket_he", 5556, ammo_rocket, AmmoRocket.HE); + addRemap("ammo_556_tracer", 5512, ammo_556, Ammo556mm.TRACER); + addRemap("ammo_75bolt_incendiary", 5541, ammo_75bolt, Ammo75Bolt.INCENDIARY); + addRemap("ammo_rocket_canister", 5563, ammo_rocket, AmmoRocket.CANISTER); + addRemap("ammo_rocket_phosphorus", 5558, ammo_rocket, AmmoRocket.PHOSPHORUS); + } + + public static void addRemap(String unloc, int removoingTheseWouldTakeForever, Item item, Enum sub) { + addRemap(unloc, item, sub.ordinal()); + } + + public static void addRemap(String unloc, Item item, int meta) { + Item remap = new ItemRemap(item, meta).setUnlocalizedName(unloc).setTextureName(RefStrings.MODID + ":plate_armor_titanium");; + GameRegistry.registerItem(remap, remap.getUnlocalizedName()); } } diff --git a/src/main/java/com/hbm/items/weapon/ItemGrenadeEnum.java b/src/main/java/com/hbm/items/weapon/ItemGrenadeEnum.java index d2954cbaf..8d683b733 100644 --- a/src/main/java/com/hbm/items/weapon/ItemGrenadeEnum.java +++ b/src/main/java/com/hbm/items/weapon/ItemGrenadeEnum.java @@ -29,6 +29,9 @@ import com.hbm.potion.HbmPotion; import com.hbm.util.EnumUtil; import com.hbm.util.I18nUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.effect.EntityLightningBolt; @@ -39,6 +42,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; import net.minecraft.world.World; public class ItemGrenadeEnum extends ItemEnumMulti @@ -414,6 +418,23 @@ public class ItemGrenadeEnum extends ItemEnumMulti return stack; } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister reg) { + + if(multiTexture) { + Enum[] enums = theEnum.getEnumConstants(); + this.icons = new IIcon[enums.length]; + + for(int i = 0; i < icons.length; i++) { + Enum num = enums[i]; + this.icons[i] = reg.registerIcon(this.getIconString() + "_" + num.name().toLowerCase()); + } + } else { + this.itemIcon = reg.registerIcon(this.getIconString()); + } + } public static Map getLogicMap() { diff --git a/src/main/resources/assets/hbm/textures/items/ammo_arty.classic.png b/src/main/resources/assets/hbm/textures/items/ammo_arty_classic.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/ammo_arty.classic.png rename to src/main/resources/assets/hbm/textures/items/ammo_arty_classic.png diff --git a/src/main/resources/assets/hbm/textures/items/ammo_arty.he.png b/src/main/resources/assets/hbm/textures/items/ammo_arty_he.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/ammo_arty.he.png rename to src/main/resources/assets/hbm/textures/items/ammo_arty_he.png diff --git a/src/main/resources/assets/hbm/textures/items/ammo_arty.mini_nuke.png b/src/main/resources/assets/hbm/textures/items/ammo_arty_mini_nuke.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/ammo_arty.mini_nuke.png rename to src/main/resources/assets/hbm/textures/items/ammo_arty_mini_nuke.png diff --git a/src/main/resources/assets/hbm/textures/items/ammo_arty.mini_nuke_multi.png b/src/main/resources/assets/hbm/textures/items/ammo_arty_mini_nuke_multi.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/ammo_arty.mini_nuke_multi.png rename to src/main/resources/assets/hbm/textures/items/ammo_arty_mini_nuke_multi.png diff --git a/src/main/resources/assets/hbm/textures/items/ammo_arty.nuke.png b/src/main/resources/assets/hbm/textures/items/ammo_arty_nuke.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/ammo_arty.nuke.png rename to src/main/resources/assets/hbm/textures/items/ammo_arty_nuke.png diff --git a/src/main/resources/assets/hbm/textures/items/ammo_arty.phosphorus.png b/src/main/resources/assets/hbm/textures/items/ammo_arty_phosphorus.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/ammo_arty.phosphorus.png rename to src/main/resources/assets/hbm/textures/items/ammo_arty_phosphorus.png diff --git a/src/main/resources/assets/hbm/textures/items/ammo_arty.phosphorus_multi.png b/src/main/resources/assets/hbm/textures/items/ammo_arty_phosphorus_multi.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/ammo_arty.phosphorus_multi.png rename to src/main/resources/assets/hbm/textures/items/ammo_arty_phosphorus_multi.png diff --git a/src/main/resources/assets/hbm/textures/items/stick_dynamite.png b/src/main/resources/assets/hbm/textures/items/grenade_dynamite.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/stick_dynamite.png rename to src/main/resources/assets/hbm/textures/items/grenade_dynamite.png diff --git a/src/main/resources/assets/hbm/textures/items/grenade_mk2.png b/src/main/resources/assets/hbm/textures/items/grenade_mk2.png deleted file mode 100644 index 0a6da1a30..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_mk2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_mk2_alt.png b/src/main/resources/assets/hbm/textures/items/grenade_pineapple.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/grenade_mk2_alt.png rename to src/main/resources/assets/hbm/textures/items/grenade_pineapple.png diff --git a/src/main/resources/assets/hbm/textures/items/nuclear_waste_pearl.png b/src/main/resources/assets/hbm/textures/items/grenade_waste_pearl.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/nuclear_waste_pearl.png rename to src/main/resources/assets/hbm/textures/items/grenade_waste_pearl.png