diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index ee2051b4a..f4912a791 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -108,6 +108,7 @@ import mekanism.common.entity.EntityFlame; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.InventoryPersonalChest; +import mekanism.common.item.ItemCraftingFormula; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemSeismicReader; import mekanism.common.item.ItemWalkieTalkie; @@ -171,10 +172,12 @@ import mekanism.common.tile.TileEntityThermalEvaporationController; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSkeleton; import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -184,6 +187,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.IRenderFactory; @@ -420,7 +424,6 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.DirtyDust); registerItemRender(MekanismItems.Configurator); registerItemRender(MekanismItems.NetworkReader); - registerItemRender(MekanismItems.WalkieTalkie); registerItemRender(MekanismItems.Jetpack); registerItemRender(MekanismItems.Dictionary); registerItemRender(MekanismItems.GasMask); @@ -447,12 +450,15 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.FactoryInstaller); registerItemRender(MekanismItems.OtherDust); - ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.OFF); + ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.OFF_MODEL); for(int i = 0; i <= 9; i++) { ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.getModel(i)); } + + ModelBakery.registerItemVariants(MekanismItems.CraftingFormula, ItemCraftingFormula.MODEL, + ItemCraftingFormula.INVALID_MODEL, ItemCraftingFormula.ENCODED_MODEL); Mekanism.logger.info("Render registrations complete."); } @@ -672,6 +678,45 @@ public class ClientProxy extends CommonProxy public void preInit() { MekanismRenderer.init(); + + ModelLoader.setCustomMeshDefinition(MekanismItems.WalkieTalkie, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + if(stack != null && stack.getItem() instanceof ItemWalkieTalkie) + { + ItemWalkieTalkie item = (ItemWalkieTalkie)stack.getItem(); + + if(item.getOn(stack)) + { + return ItemWalkieTalkie.CHANNEL_MODELS.get(item.getChannel(stack)); + } + } + + return ItemWalkieTalkie.OFF_MODEL; + } + }); + + ModelLoader.setCustomMeshDefinition(MekanismItems.CraftingFormula, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + if(stack != null && stack.getItem() instanceof ItemCraftingFormula) + { + ItemCraftingFormula item = (ItemCraftingFormula)stack.getItem(); + + if(item.getInventory(stack) == null) + { + return ItemCraftingFormula.MODEL; + } + else { + return item.isInvalid(stack) ? ItemCraftingFormula.INVALID_MODEL : ItemCraftingFormula.ENCODED_MODEL; + } + } + + return ItemCraftingFormula.MODEL; + } + }); } @Override diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 8ef7beea3..3bf22a5e3 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -160,6 +160,11 @@ public class MekanismRenderer for(int i = 0; i < metaItem.getVariants(); i++) { + if(metaItem.getTexture(i) == null) + { + continue; + } + ModelResourceLocation loc = new ModelResourceLocation(domain + ":" + metaItem.getTexture(i), "inventory"); mesher.register(item, i, loc); variants.add(loc); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 9317ba994..1aa86a6ad 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -44,10 +44,7 @@ import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IModule; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; -import mekanism.common.capabilities.CableOutputter; import mekanism.common.capabilities.Capabilities; -import mekanism.common.capabilities.StrictEnergyAcceptor; -import mekanism.common.capabilities.StrictEnergyStorage; import mekanism.common.chunkloading.ChunkManager; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.entangloporter.InventoryFrequency; @@ -98,19 +95,14 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.Capability.IStorage; -import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.event.world.ChunkEvent; @@ -1288,11 +1280,11 @@ public class Mekanism GasRegistry.register(new OreGas(name.toLowerCase(), "oregas." + name.toLowerCase()).setCleanGas(clean).setVisible(false)); } - Mekanism.proxy.preInit(); - //Register blocks and items MekanismItems.register(); MekanismBlocks.register(); + + Mekanism.proxy.preInit(); //Register infuses InfuseRegistry.registerInfuseType(new InfuseType("CARBON", "mekanism:infuse/Carbon").setUnlocalizedName("carbon")); diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index ff527417b..ad98f2759 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -6,6 +6,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -18,37 +19,14 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemCraftingFormula extends ItemMekanism { -// public IIcon[] icons = new IIcon[3]; - + public static ModelResourceLocation MODEL = new ModelResourceLocation("mekanism:CraftingFormula", "inventory"); + public static ModelResourceLocation INVALID_MODEL = new ModelResourceLocation("mekanism:CraftingFormulaInvalid", "inventory"); + public static ModelResourceLocation ENCODED_MODEL = new ModelResourceLocation("mekanism:CraftingFormulaEncoded", "inventory"); + public ItemCraftingFormula() { super(); } - -/* - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) - { - icons[0] = register.registerIcon("mekanism:CraftingFormula"); - icons[1] = register.registerIcon("mekanism:CraftingFormulaInvalid"); - icons[2] = register.registerIcon("mekanism:CraftingFormulaEncoded"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(ItemStack stack, int pass) - { - return getInventory(stack) == null ? icons[0] : (isInvalid(stack) ? icons[1] : icons[2]); - } - - @Override - @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses() - { - return true; - } -*/ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/common/item/ItemFactoryInstaller.java b/src/main/java/mekanism/common/item/ItemFactoryInstaller.java index d043064d5..30eae740e 100644 --- a/src/main/java/mekanism/common/item/ItemFactoryInstaller.java +++ b/src/main/java/mekanism/common/item/ItemFactoryInstaller.java @@ -1,8 +1,11 @@ package mekanism.common.item; +import java.util.List; + import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FactoryTier; import mekanism.common.base.IFactory.RecipeType; +import mekanism.common.base.IMetaItem; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricMachine; @@ -10,14 +13,16 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityMetallurgicInfuser; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -public class ItemFactoryInstaller extends ItemMekanism +public class ItemFactoryInstaller extends ItemMekanism implements IMetaItem { public ItemFactoryInstaller() { @@ -122,20 +127,16 @@ public class ItemFactoryInstaller extends ItemMekanism return 5+tier.processes+operation; } -/* @Override - public void registerIcons(IIconRegister register) + public String getTexture(int meta) { - for(FactoryTier tier : FactoryTier.values()) - { - icons[tier.ordinal()] = register.registerIcon("mekanism:" + tier.getBaseTier().getName() + "FactoryInstaller"); - } + return FactoryTier.values()[meta].getBaseTier().getName() + "FactoryInstaller"; } @Override - public IIcon getIconFromDamage(int meta) + public int getVariants() { - return icons[meta]; + return FactoryTier.values().length; } @Override @@ -146,7 +147,6 @@ public class ItemFactoryInstaller extends ItemMekanism itemList.add(new ItemStack(item, 1, tier.ordinal())); } } -*/ @Override public String getUnlocalizedName(ItemStack item) diff --git a/src/main/java/mekanism/common/item/ItemOtherDust.java b/src/main/java/mekanism/common/item/ItemOtherDust.java index 85e2b6182..e4f0eab3e 100644 --- a/src/main/java/mekanism/common/item/ItemOtherDust.java +++ b/src/main/java/mekanism/common/item/ItemOtherDust.java @@ -21,9 +21,9 @@ public class ItemOtherDust extends ItemMekanism implements IMetaItem @Override public String getTexture(int meta) { - if(meta > 1) + if(meta == 2) { - meta++; + return null; } return subtypes[meta] + "Dust"; @@ -32,7 +32,7 @@ public class ItemOtherDust extends ItemMekanism implements IMetaItem @Override public int getVariants() { - return subtypes.length-1; + return subtypes.length; } @Override diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 4dba89093..7d89b8e90 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -11,14 +11,12 @@ 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 ModelResourceLocation OFF_MODEL = new ModelResourceLocation("mekanism:WalkieTalkie", "inventory"); - public static Map models = new HashMap(); + public static Map CHANNEL_MODELS = new HashMap(); public ItemWalkieTalkie() { @@ -37,19 +35,13 @@ public class ItemWalkieTalkie extends ItemMekanism public static ModelResourceLocation getModel(int channel) { - if(models.get(channel) == null) + if(CHANNEL_MODELS.get(channel) == null) { - models.put(channel, new ModelResourceLocation("mekanism:WalkieTalkie_ch" + channel, "inventory")); + CHANNEL_MODELS.put(channel, new ModelResourceLocation("mekanism:WalkieTalkie_ch" + channel, "inventory")); } - return models.get(channel); + return CHANNEL_MODELS.get(channel); } - - @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) diff --git a/src/main/resources/assets/mekanism/models/item/AdvancedFactoryInstaller.json b/src/main/resources/assets/mekanism/models/item/AdvancedFactoryInstaller.json new file mode 100644 index 000000000..2c1c831ef --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/AdvancedFactoryInstaller.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/AdvancedFactoryInstaller" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/BasicFactoryInstaller.json b/src/main/resources/assets/mekanism/models/item/BasicFactoryInstaller.json new file mode 100644 index 000000000..0ece2d5fb --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/BasicFactoryInstaller.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/BasicFactoryInstaller" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/FactoryInstaller.json b/src/main/resources/assets/mekanism/models/item/ConfigurationCard.json similarity index 58% rename from src/main/resources/assets/mekanism/models/item/FactoryInstaller.json rename to src/main/resources/assets/mekanism/models/item/ConfigurationCard.json index 426107b94..454143747 100644 --- a/src/main/resources/assets/mekanism/models/item/FactoryInstaller.json +++ b/src/main/resources/assets/mekanism/models/item/ConfigurationCard.json @@ -1,7 +1,7 @@ { "parent": "mekanism:item/standard_item", "textures": { - "layer0": "mekanism:items/FactoryInstaller" + "layer0": "mekanism:items/ConfigurationCard" } } diff --git a/src/main/resources/assets/mekanism/models/item/FilterCard.json b/src/main/resources/assets/mekanism/models/item/CraftingFormula.json similarity index 59% rename from src/main/resources/assets/mekanism/models/item/FilterCard.json rename to src/main/resources/assets/mekanism/models/item/CraftingFormula.json index 187fb1b52..a007ecccf 100644 --- a/src/main/resources/assets/mekanism/models/item/FilterCard.json +++ b/src/main/resources/assets/mekanism/models/item/CraftingFormula.json @@ -1,7 +1,7 @@ { "parent": "mekanism:item/standard_item", "textures": { - "layer0": "mekanism:items/FilterCard" + "layer0": "mekanism:items/CraftingFormula" } } diff --git a/src/main/resources/assets/mekanism/models/item/CraftingFormulaEncoded.json b/src/main/resources/assets/mekanism/models/item/CraftingFormulaEncoded.json new file mode 100644 index 000000000..db2ecec5a --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/CraftingFormulaEncoded.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/CraftingFormulaEncoded" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/CraftingFormulaInvalid.json b/src/main/resources/assets/mekanism/models/item/CraftingFormulaInvalid.json new file mode 100644 index 000000000..e9013c16f --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/CraftingFormulaInvalid.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/CraftingFormulaInvalid" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/EliteFactoryInstaller.json b/src/main/resources/assets/mekanism/models/item/EliteFactoryInstaller.json new file mode 100644 index 000000000..118e33758 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/EliteFactoryInstaller.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/EliteFactoryInstaller" + } +} +