From 2ac38b5016eb565b539a8e8949eae88e6b245fe1 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 3 May 2016 23:43:07 -0400 Subject: [PATCH] Walkie Talkie textures! --- .../java/mekanism/client/ClientProxy.java | 10 +++- .../mekanism/client/MekanismKeyHandler.java | 5 +- .../mekanism/common/item/ItemMekanism.java | 8 --- .../common/item/ItemWalkieTalkie.java | 47 ++++++++++-------- .../tile/component/TileComponentConfig.java | 2 +- .../models/item/WalkieTalkie_ch1.json | 7 +++ .../models/item/WalkieTalkie_ch2.json | 7 +++ .../models/item/WalkieTalkie_ch3.json | 7 +++ .../models/item/WalkieTalkie_ch4.json | 7 +++ .../models/item/WalkieTalkie_ch5.json | 7 +++ .../models/item/WalkieTalkie_ch6.json | 7 +++ .../models/item/WalkieTalkie_ch7.json | 7 +++ .../models/item/WalkieTalkie_ch8.json | 7 +++ .../models/item/WalkieTalkie_ch9.json | 7 +++ .../{WalkieTalkieOff.png => WalkieTalkie.png} | Bin 15 files changed, 101 insertions(+), 34 deletions(-) create mode 100644 src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch1.json create mode 100644 src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch2.json create mode 100644 src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch3.json create mode 100644 src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch4.json create mode 100644 src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch5.json create mode 100644 src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch6.json create mode 100644 src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch7.json create mode 100644 src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch8.json create mode 100644 src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch9.json rename src/main/resources/assets/mekanism/textures/items/{WalkieTalkieOff.png => WalkieTalkie.png} (100%) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 3075a6230..daf7b2cfc 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -113,6 +113,7 @@ import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.InventoryPersonalChest; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemSeismicReader; +import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; import mekanism.common.tile.TileEntityAdvancedElectricMachine; @@ -450,6 +451,13 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.GaugeDropper); registerItemRender(MekanismItems.FactoryInstaller); registerItemRender(MekanismItems.OtherDust); + + ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.OFF); + + for(int i = 0; i <= 9; i++) + { + ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.getModel(i)); + } Mekanism.logger.info("Render registrations complete."); } @@ -471,8 +479,6 @@ public class ClientProxy extends CommonProxy ModelBakery.addVariantName(item, "mekanism:" + metaItem.getTexture(i)); } - //ModelBakery.registerItemVariants(item, variants.toArray(new ModelResourceLocation[] {})); - return; } diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 484be013f..6e3b327fd 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -30,9 +30,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; - -import org.lwjgl.input.Keyboard; - import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -41,6 +38,8 @@ import net.minecraftforge.fml.common.gameevent.InputEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; + @SideOnly(Side.CLIENT) public class MekanismKeyHandler extends MekKeyHandler { diff --git a/src/main/java/mekanism/common/item/ItemMekanism.java b/src/main/java/mekanism/common/item/ItemMekanism.java index cbcaf7267..1604f219e 100644 --- a/src/main/java/mekanism/common/item/ItemMekanism.java +++ b/src/main/java/mekanism/common/item/ItemMekanism.java @@ -10,12 +10,4 @@ public class ItemMekanism extends Item super(); setCreativeTab(Mekanism.tabMekanism); } - -/* - @Override - public void registerIcons(IIconRegister register) - { - itemIcon = register.registerIcon("mekanism:" + getUnlocalizedName().replace("item.", "")); - } -*/ } diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 4a2caa422..4dba89093 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -1,16 +1,25 @@ package mekanism.common.item; +import java.util.HashMap; import java.util.List; +import java.util.Map; import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemWalkieTalkie extends ItemMekanism { + public static ModelResourceLocation OFF = new ModelResourceLocation("mekanism:WalkieTalkie", "inventory"); + + public static Map models = new HashMap(); + public ItemWalkieTalkie() { super(); @@ -25,30 +34,22 @@ public class ItemWalkieTalkie extends ItemMekanism list.add((getOn(itemstack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.localize("gui." + (getOn(itemstack) ? "on" : "off"))); list.add(EnumColor.DARK_AQUA + LangUtils.localize("tooltip.channel") + ": " + EnumColor.GREY + getChannel(itemstack)); } - -/* - @Override - public IIcon getIconIndex(ItemStack itemStack) + + public static ModelResourceLocation getModel(int channel) { - if(!getOn(itemStack)) + if(models.get(channel) == null) { - return icons[0]; + models.put(channel, new ModelResourceLocation("mekanism:WalkieTalkie_ch" + channel, "inventory")); } - - return icons[getChannel(itemStack)]; + + return models.get(channel); } - - @Override - public void registerIcons(IIconRegister register) - { - icons[0] = register.registerIcon("mekanism:WalkieTalkieOff"); - - for(int i = 1; i <= 9; i++) - { - icons[i] = register.registerIcon("mekanism:WalkieTalkie_ch" + i); - } - } -*/ + + @SideOnly(Side.CLIENT) + public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) + { + return getOn(stack) ? getModel(getChannel(stack)) : OFF; + } @Override public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) @@ -60,6 +61,12 @@ public class ItemWalkieTalkie extends ItemMekanism return itemStack; } + + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) + { + return !ItemStack.areItemsEqual(oldStack, newStack); + } public void setOn(ItemStack itemStack, boolean on) { diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index 1a5f3b673..65dafc84b 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -151,7 +151,7 @@ public class TileComponentConfig implements ITileComponent } else if(index > getOutputs(type).size()-1) { - index = getConfig(type)[side] = 0; + index = getConfig(type)[side.ordinal()] = 0; } return getOutputs(type).get(index); diff --git a/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch1.json b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch1.json new file mode 100644 index 000000000..66046ac37 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch1.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/WalkieTalkie_ch1" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch2.json b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch2.json new file mode 100644 index 000000000..791afea10 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch2.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/WalkieTalkie_ch2" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch3.json b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch3.json new file mode 100644 index 000000000..331e3c38d --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch3.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/WalkieTalkie_ch3" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch4.json b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch4.json new file mode 100644 index 000000000..4d4df352c --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch4.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/WalkieTalkie_ch4" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch5.json b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch5.json new file mode 100644 index 000000000..cdc33574f --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch5.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/WalkieTalkie_ch5" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch6.json b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch6.json new file mode 100644 index 000000000..92546f0e8 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch6.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/WalkieTalkie_ch6" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch7.json b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch7.json new file mode 100644 index 000000000..2dadc039a --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch7.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/WalkieTalkie_ch7" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch8.json b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch8.json new file mode 100644 index 000000000..1b18d84d7 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch8.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/WalkieTalkie_ch8" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch9.json b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch9.json new file mode 100644 index 000000000..a1db8ebe8 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/WalkieTalkie_ch9.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/WalkieTalkie_ch9" + } +} + diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkieOff.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/items/WalkieTalkieOff.png rename to src/main/resources/assets/mekanism/textures/items/WalkieTalkie.png