diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index e4a4ade1e..3075a6230 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -1,6 +1,8 @@ package mekanism.client; import java.io.File; +import java.util.ArrayList; +import java.util.List; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.client; @@ -91,7 +93,6 @@ import mekanism.client.render.tileentity.RenderPersonalChest; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; import mekanism.client.render.tileentity.RenderQuantumEntangloporter; import mekanism.client.render.tileentity.RenderResistiveHeater; -import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.tileentity.RenderSecurityDesk; import mekanism.client.render.tileentity.RenderSeismicVibrator; import mekanism.client.render.tileentity.RenderTeleporter; @@ -99,11 +100,10 @@ import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.tileentity.RenderThermoelectricBoiler; import mekanism.common.CommonProxy; import mekanism.common.Mekanism; -import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; +import mekanism.common.base.IMetaItem; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; -import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; @@ -173,9 +173,11 @@ 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.ItemModelMesher; 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; @@ -186,7 +188,6 @@ 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.obj.OBJLoader; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.IRenderFactory; @@ -403,6 +404,7 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.SpeedUpgrade); registerItemRender(MekanismItems.EnergyUpgrade); registerItemRender(MekanismItems.FilterUpgrade); + registerItemRender(MekanismItems.MufflingUpgrade); registerItemRender(MekanismItems.GasUpgrade); registerItemRender(MekanismItems.Robit); registerItemRender(MekanismItems.AtomicDisassembler); @@ -454,7 +456,27 @@ public class ClientProxy extends CommonProxy public void registerItemRender(Item item) { - Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory")); + ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); + + if(item instanceof IMetaItem) + { + IMetaItem metaItem = (IMetaItem)item; + List variants = new ArrayList(); + + for(int i = 0; i < metaItem.getVariants(); i++) + { + ModelResourceLocation loc = new ModelResourceLocation("mekanism:" + metaItem.getTexture(i), "inventory"); + mesher.register(item, i, loc); + variants.add(loc); + ModelBakery.addVariantName(item, "mekanism:" + metaItem.getTexture(i)); + } + + //ModelBakery.registerItemVariants(item, variants.toArray(new ModelResourceLocation[] {})); + + return; + } + + mesher.register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory")); } @Override diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index ffd4e6046..a208577fe 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -94,7 +94,6 @@ import mekanism.common.tile.TileEntityThermalEvaporationValve; import mekanism.common.util.MekanismUtils; import mekanism.common.voice.VoiceServerManager; import mekanism.common.world.GenHandler; - import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -120,18 +119,6 @@ import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import rebelkeithy.mods.metallurgy.api.IOreInfo; -import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; - -import com.mojang.authlib.GameProfile; - import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.IFuelHandler; @@ -151,6 +138,17 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.registry.EntityRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.RecipeSorter.Category; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import rebelkeithy.mods.metallurgy.api.IOreInfo; +import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; + +import com.mojang.authlib.GameProfile; /** * Mekanism - a Minecraft mod @@ -1052,7 +1050,7 @@ public class Mekanism OreDictionary.registerOre("dustDiamond", new ItemStack(MekanismItems.OtherDust, 1, 0)); OreDictionary.registerOre("dustSteel", new ItemStack(MekanismItems.OtherDust, 1, 1)); - OreDictionary.registerOre("dustLead", new ItemStack(MekanismItems.OtherDust, 1, 2)); + //Lead was once here OreDictionary.registerOre("dustSulfur", new ItemStack(MekanismItems.OtherDust, 1, 3)); OreDictionary.registerOre("dustLithium", new ItemStack(MekanismItems.OtherDust, 1, 4)); OreDictionary.registerOre("dustRefinedObsidian", new ItemStack(MekanismItems.OtherDust, 1, 5)); diff --git a/src/main/java/mekanism/common/base/IMetaItem.java b/src/main/java/mekanism/common/base/IMetaItem.java new file mode 100644 index 000000000..a2c49c046 --- /dev/null +++ b/src/main/java/mekanism/common/base/IMetaItem.java @@ -0,0 +1,8 @@ +package mekanism.common.base; + +public interface IMetaItem +{ + public String getTexture(int meta); + + public int getVariants(); +} diff --git a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java index 603d14b17..e3843b14c 100644 --- a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java +++ b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java @@ -14,8 +14,8 @@ import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.IFluidBlock; import net.minecraft.util.BlockPos; +import net.minecraftforge.fluids.IFluidBlock; public class ThreadMinerSearch extends Thread { diff --git a/src/main/java/mekanism/common/item/ItemClump.java b/src/main/java/mekanism/common/item/ItemClump.java index be8e15d1e..7ac776fcc 100644 --- a/src/main/java/mekanism/common/item/ItemClump.java +++ b/src/main/java/mekanism/common/item/ItemClump.java @@ -1,30 +1,31 @@ package mekanism.common.item; +import java.util.List; + import mekanism.common.Resource; +import mekanism.common.base.IMetaItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemClump extends ItemMekanism +public class ItemClump extends ItemMekanism implements IMetaItem { public ItemClump() { super(); setHasSubtypes(true); } - -/* + @Override - public void registerIcons(IIconRegister register) + public String getTexture(int meta) { - for(int i = 0; i < Resource.values().length; i++) - { - icons[i] = register.registerIcon("mekanism:" + Resource.values()[i].getName() + "Clump"); - } + return Resource.values()[meta].getName() + "Clump"; } - + @Override - public IIcon getIconFromDamage(int meta) + public int getVariants() { - return icons[meta]; + return Resource.values().length; } @Override @@ -35,7 +36,6 @@ public class ItemClump extends ItemMekanism itemList.add(new ItemStack(this, 1, counter)); } } -*/ @Override public String getUnlocalizedName(ItemStack item) diff --git a/src/main/java/mekanism/common/item/ItemCrystal.java b/src/main/java/mekanism/common/item/ItemCrystal.java index cc222f523..5f2a10a02 100644 --- a/src/main/java/mekanism/common/item/ItemCrystal.java +++ b/src/main/java/mekanism/common/item/ItemCrystal.java @@ -1,30 +1,31 @@ package mekanism.common.item; +import java.util.List; + import mekanism.common.Resource; +import mekanism.common.base.IMetaItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemCrystal extends ItemMekanism +public class ItemCrystal extends ItemMekanism implements IMetaItem { public ItemCrystal() { super(); setHasSubtypes(true); } - -/* + @Override - public void registerIcons(IIconRegister register) + public String getTexture(int meta) { - for(int i = 0; i < Resource.values().length; i++) - { - icons[i] = register.registerIcon("mekanism:" + Resource.values()[i].getName() + "Crystal"); - } + return Resource.values()[meta].getName() + "Crystal"; } - + @Override - public IIcon getIconFromDamage(int meta) + public int getVariants() { - return icons[meta]; + return Resource.values().length; } @Override @@ -35,7 +36,6 @@ public class ItemCrystal extends ItemMekanism itemList.add(new ItemStack(item, 1, counter)); } } -*/ @Override public String getUnlocalizedName(ItemStack item) diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java index cc589df93..002f60bb3 100644 --- a/src/main/java/mekanism/common/item/ItemDirtyDust.java +++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java @@ -1,10 +1,15 @@ package mekanism.common.item; +import java.util.List; + import mekanism.common.Mekanism; import mekanism.common.Resource; +import mekanism.common.base.IMetaItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemDirtyDust extends ItemMekanism +public class ItemDirtyDust extends ItemMekanism implements IMetaItem { public ItemDirtyDust() { @@ -12,21 +17,17 @@ public class ItemDirtyDust extends ItemMekanism setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } - -/* + @Override - public void registerIcons(IIconRegister register) + public String getTexture(int meta) { - for(int i = 0; i < Resource.values().length; i++) - { - icons[i] = register.registerIcon("mekanism:Dirty" + Resource.values()[i].getName() + "Dust"); - } + return "Dirty" + Resource.values()[meta].getName() + "Dust"; } - + @Override - public IIcon getIconFromDamage(int meta) + public int getVariants() { - return icons[meta]; + return Resource.values().length; } @Override @@ -37,7 +38,6 @@ public class ItemDirtyDust extends ItemMekanism itemList.add(new ItemStack(item, 1, counter)); } } -*/ @Override public String getUnlocalizedName(ItemStack item) diff --git a/src/main/java/mekanism/common/item/ItemDust.java b/src/main/java/mekanism/common/item/ItemDust.java index 90645caea..c65b0dd25 100644 --- a/src/main/java/mekanism/common/item/ItemDust.java +++ b/src/main/java/mekanism/common/item/ItemDust.java @@ -1,30 +1,31 @@ package mekanism.common.item; +import java.util.List; + import mekanism.common.Resource; +import mekanism.common.base.IMetaItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemDust extends ItemMekanism +public class ItemDust extends ItemMekanism implements IMetaItem { public ItemDust() { super(); setHasSubtypes(true); } - -/* + @Override - public void registerIcons(IIconRegister register) + public String getTexture(int meta) { - for(int i = 0; i < Resource.values().length; i++) - { - icons[i] = register.registerIcon("mekanism:" + Resource.values()[i].getName() + "Dust"); - } + return Resource.values()[meta].getName() + "Dust"; } - + @Override - public IIcon getIconFromDamage(int meta) + public int getVariants() { - return icons[meta]; + return Resource.values().length; } @Override @@ -35,7 +36,6 @@ public class ItemDust extends ItemMekanism itemList.add(new ItemStack(this, 1, counter)); } } -*/ @Override public String getUnlocalizedName(ItemStack item) diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java index 0c6424d57..e0a87d3f8 100644 --- a/src/main/java/mekanism/common/item/ItemIngot.java +++ b/src/main/java/mekanism/common/item/ItemIngot.java @@ -2,11 +2,12 @@ package mekanism.common.item; import java.util.List; +import mekanism.common.base.IMetaItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemIngot extends ItemMekanism +public class ItemIngot extends ItemMekanism implements IMetaItem { public static String[] en_USNames = {"Obsidian", "Osmium", "Bronze", "Glowstone", "Steel", "Copper", @@ -17,23 +18,18 @@ public class ItemIngot extends ItemMekanism super(); setHasSubtypes(true); } - -/* + @Override - public void registerIcons(IIconRegister register) + public String getTexture(int meta) { - for(int i = 0; i <= 6; i++) - { - icons[i] = register.registerIcon("mekanism:" + en_USNames[i] + "Ingot"); - } + return en_USNames[meta] + "Ingot"; } - + @Override - public IIcon getIconFromDamage(int meta) + public int getVariants() { - return icons[meta]; + return en_USNames.length; } -*/ @Override public void getSubItems(Item item, CreativeTabs tabs, List itemList) diff --git a/src/main/java/mekanism/common/item/ItemOtherDust.java b/src/main/java/mekanism/common/item/ItemOtherDust.java index bab70ca6c..85e2b6182 100644 --- a/src/main/java/mekanism/common/item/ItemOtherDust.java +++ b/src/main/java/mekanism/common/item/ItemOtherDust.java @@ -2,15 +2,15 @@ package mekanism.common.item; import java.util.List; +import mekanism.common.base.IMetaItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemOtherDust extends ItemMekanism +public class ItemOtherDust extends ItemMekanism implements IMetaItem { - public static String[] subtypes = {"Diamond", "Steel", "Lead", - "Sulfur", "Lithium", "RefinedObsidian", - "Obsidian"}; + public static String[] subtypes = {"Diamond", "Steel", "null", "Sulfur", + "Lithium", "RefinedObsidian", "Obsidian"}; public ItemOtherDust() { @@ -18,29 +18,32 @@ public class ItemOtherDust extends ItemMekanism setHasSubtypes(true); } -/* @Override - public void registerIcons(IIconRegister register) + public String getTexture(int meta) { - for(int i = 0; i < subtypes.length; i++) + if(meta > 1) { - icons[i] = register.registerIcon("mekanism:" + subtypes[i] + "Dust"); + meta++; } + + return subtypes[meta] + "Dust"; } - + @Override - public IIcon getIconFromDamage(int meta) + public int getVariants() { - return icons[meta]; + return subtypes.length-1; } -*/ @Override public void getSubItems(Item item, CreativeTabs tabs, List itemList) { for(int counter = 0; counter < subtypes.length; counter++) { - itemList.add(new ItemStack(this, 1, counter)); + if(counter != 2) + { + itemList.add(new ItemStack(this, 1, counter)); + } } } diff --git a/src/main/java/mekanism/common/item/ItemShard.java b/src/main/java/mekanism/common/item/ItemShard.java index a96b60caa..2e10a282e 100644 --- a/src/main/java/mekanism/common/item/ItemShard.java +++ b/src/main/java/mekanism/common/item/ItemShard.java @@ -1,9 +1,14 @@ package mekanism.common.item; +import java.util.List; + import mekanism.common.Resource; +import mekanism.common.base.IMetaItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemShard extends ItemMekanism +public class ItemShard extends ItemMekanism implements IMetaItem { public ItemShard() { @@ -11,20 +16,16 @@ public class ItemShard extends ItemMekanism setHasSubtypes(true); } -/* @Override - public void registerIcons(IIconRegister register) + public String getTexture(int meta) { - for(int i = 0; i < Resource.values().length; i++) - { - icons[i] = register.registerIcon("mekanism:" + Resource.values()[i].getName() + "Shard"); - } + return Resource.values()[meta].getName() + "Shard"; } - + @Override - public IIcon getIconFromDamage(int meta) + public int getVariants() { - return icons[meta]; + return Resource.values().length; } @Override @@ -35,7 +36,6 @@ public class ItemShard extends ItemMekanism itemList.add(new ItemStack(item, 1, counter)); } } -*/ @Override public String getUnlocalizedName(ItemStack item) diff --git a/src/main/resources/assets/mekanism/models/block/security_desk.json b/src/main/resources/assets/mekanism/models/block/security_desk.json index 064f57cea..4c616be43 100644 --- a/src/main/resources/assets/mekanism/models/block/security_desk.json +++ b/src/main/resources/assets/mekanism/models/block/security_desk.json @@ -132,7 +132,7 @@ } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/security_desk", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/entity/Balloon.json b/src/main/resources/assets/mekanism/models/entity/Balloon.json new file mode 100755 index 000000000..3ed2673d9 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/entity/Balloon.json @@ -0,0 +1,73 @@ +{ + "elements": [ + { + "__comment": "String", + "from": [7.5, 8.5, 7.5], + "to": [8.5, 19.5, 8.5], + "faces": { + "down": {"uv": [9, 0, 9.25, 0.25], "texture": "#all"}, + "up": {"uv": [8.75, 0, 9, 0.25], "texture": "#all"}, + "north": {"uv": [8.75, 0.25, 9, 3], "texture": "#all"}, + "south": {"uv": [9.25, 0.25, 9.5, 3], "texture": "#all"}, + "west": {"uv": [9, 0.25, 9.25, 3], "texture": "#all"}, + "east": {"uv": [8.5, 0.25, 8.75, 3], "texture": "#all"} + } + }, + { + "__comment": "Balloonnub", + "from": [7.5, 19.5, 7.5], + "to": [8.5, 20.5, 8.5], + "faces": { + "down": {"uv": [5, 2.25, 5.25, 2.5], "texture": "#all"}, + "up": {"uv": [4.75, 2.25, 5, 2.5], "texture": "#all"}, + "north": {"uv": [4.75, 2.5, 5, 2.75], "texture": "#all"}, + "south": {"uv": [5.25, 2.5, 5.5, 2.75], "texture": "#all"}, + "west": {"uv": [5, 2.5, 5.25, 2.75], "texture": "#all"}, + "east": {"uv": [4.5, 2.5, 4.75, 2.75], "texture": "#all"} + } + }, + { + "__comment": "Balloon3", + "from": [6, 20.5, 6], + "to": [10, 25.5, 10], + "faces": { + "down": {"uv": [6.5, 0, 7.5, 1], "texture": "#all"}, + "up": {"uv": [5.5, 0, 6.5, 1], "texture": "#all"}, + "north": {"uv": [5.5, 1, 6.5, 2.25], "texture": "#all"}, + "south": {"uv": [7.5, 1, 8.5, 2.25], "texture": "#all"}, + "west": {"uv": [6.5, 1, 7.5, 2.25], "texture": "#all"}, + "east": {"uv": [4.5, 1, 5.5, 2.25], "texture": "#all"} + } + }, + { + "__comment": "Balloon1", + "from": [6, 21, 5.5], + "to": [10, 25, 10.5], + "faces": { + "down": {"uv": [2.25, 2, 3.25, 3.25], "texture": "#all"}, + "up": {"uv": [1.25, 2, 2.25, 3.25], "texture": "#all"}, + "north": {"uv": [1.25, 3.25, 2.25, 4.25], "texture": "#all"}, + "south": {"uv": [3.5, 3.25, 4.5, 4.25], "texture": "#all"}, + "west": {"uv": [2.25, 3.25, 3.5, 4.25], "texture": "#all"}, + "east": {"uv": [0, 3.25, 1.25, 4.25], "texture": "#all"} + } + }, + { + "__comment": "Balloon2", + "from": [5.5, 21, 6], + "to": [10.5, 25, 10], + "faces": { + "down": {"uv": [2.25, 0, 3.5, 1], "texture": "#all"}, + "up": {"uv": [1, 0, 2.25, 1], "texture": "#all"}, + "north": {"uv": [1, 1, 2.25, 2], "texture": "#all"}, + "south": {"uv": [3.25, 1, 4.5, 2], "texture": "#all"}, + "west": {"uv": [2.25, 1, 3.25, 2], "texture": "#all"}, + "east": {"uv": [0, 1, 1, 2], "texture": "#all"} + } + } + ], + "textures": { + "all": "...", + "particle": "..." + } +} diff --git a/src/main/resources/assets/mekanism/models/item/AtomicDisassembler.json b/src/main/resources/assets/mekanism/models/item/AtomicDisassembler.json index 027ca7106..5e9e3a8bd 100644 --- a/src/main/resources/assets/mekanism/models/item/AtomicDisassembler.json +++ b/src/main/resources/assets/mekanism/models/item/AtomicDisassembler.json @@ -1,7 +1,216 @@ { - "parent": "mekanism:item/standard_item", - "textures": { - "layer0": "mekanism:items/AtomicDisassembler" + "elements": [ + { + "__comment": "Shape6", + "from": [3, 25.7, 2.5], + "to": [6, 28.7, 8.5], + "faces": { + "down": {"uv": [8.25, 0, 9, 1.5], "texture": "#all"}, + "up": {"uv": [7.5, 0, 8.25, 1.5], "texture": "#all"}, + "north": {"uv": [7.5, 1.5, 8.25, 2.25], "texture": "#all"}, + "south": {"uv": [9.75, 1.5, 10.5, 2.25], "texture": "#all"}, + "west": {"uv": [8.25, 1.5, 9.75, 2.25], "texture": "#all"}, + "east": {"uv": [6, 1.5, 7.5, 2.25], "texture": "#all"} + } + }, + { + "__comment": "Shape13", + "from": [8, 27.3, 8], + "to": [9, 28.3, 15], + "faces": { + "down": {"uv": [3, 2.5, 3.25, 4.25], "texture": "#all"}, + "up": {"uv": [2.75, 2.5, 3, 4.25], "texture": "#all"}, + "north": {"uv": [2.75, 4.25, 3, 4.5], "texture": "#all"}, + "south": {"uv": [4.75, 4.25, 5, 4.5], "texture": "#all"}, + "west": {"uv": [3, 4.25, 4.75, 4.5], "texture": "#all"}, + "east": {"uv": [1, 4.25, 2.75, 4.5], "texture": "#all"} + } + }, + { + "__comment": "Shape12", + "from": [7.5, 26.5, 9.5], + "to": [9.5, 27.5, 10.5], + "faces": { + "down": {"uv": [11.25, 3, 11.75, 3.25], "texture": "#all"}, + "up": {"uv": [10.75, 3, 11.25, 3.25], "texture": "#all"}, + "north": {"uv": [10.75, 3.25, 11.25, 3.5], "texture": "#all"}, + "south": {"uv": [11.5, 3.25, 12, 3.5], "texture": "#all"}, + "west": {"uv": [11.25, 3.25, 11.5, 3.5], "texture": "#all"}, + "east": {"uv": [10.5, 3.25, 10.75, 3.5], "texture": "#all"} + } + }, + { + "__comment": "Shape2", + "from": [7.5, 21.5, 4.5], + "to": [9.5, 26.5, 6.5], + "faces": { + "down": {"uv": [9.5, 2.25, 10, 2.75], "texture": "#all"}, + "up": {"uv": [9, 2.25, 9.5, 2.75], "texture": "#all"}, + "north": {"uv": [9, 2.75, 9.5, 4], "texture": "#all"}, + "south": {"uv": [10, 2.75, 10.5, 4], "texture": "#all"}, + "west": {"uv": [9.5, 2.75, 10, 4], "texture": "#all"}, + "east": {"uv": [8.5, 2.75, 9, 4], "texture": "#all"} + } + }, + { + "__comment": "Shape11", + "from": [7.5, 26.5, 11.5], + "to": [9.5, 27.5, 12.5], + "faces": { + "down": {"uv": [11.25, 3.5, 11.75, 3.75], "texture": "#all"}, + "up": {"uv": [10.75, 3.5, 11.25, 3.75], "texture": "#all"}, + "north": {"uv": [10.75, 3.75, 11.25, 4], "texture": "#all"}, + "south": {"uv": [11.5, 3.75, 12, 4], "texture": "#all"}, + "west": {"uv": [11.25, 3.75, 11.5, 4], "texture": "#all"}, + "east": {"uv": [10.5, 3.75, 10.75, 4], "texture": "#all"} + } + }, + { + "__comment": "Shape10", + "from": [7.5, 30.2, 5.5], + "to": [9.5, 31.2, 6.5], + "faces": { + "down": {"uv": [3.75, 0, 4.25, 0.25], "texture": "#all"}, + "up": {"uv": [3.25, 0, 3.75, 0.25], "texture": "#all"}, + "north": {"uv": [3.25, 0.25, 3.75, 0.5], "texture": "#all"}, + "south": {"uv": [4, 0.25, 4.5, 0.5], "texture": "#all"}, + "west": {"uv": [3.75, 0.25, 4, 0.5], "texture": "#all"}, + "east": {"uv": [3, 0.25, 3.25, 0.5], "texture": "#all"} + } + }, + { + "__comment": "Shape3", + "from": [8, 23.44, 1.93], + "to": [9, 25.44, 4.93], + "faces": { + "down": {"uv": [15, 0, 15.25, 0.75], "texture": "#all"}, + "up": {"uv": [14.75, 0, 15, 0.75], "texture": "#all"}, + "north": {"uv": [14.75, 0.75, 15, 1.25], "texture": "#all"}, + "south": {"uv": [15.75, 0.75, 16, 1.25], "texture": "#all"}, + "west": {"uv": [15, 0.75, 15.75, 1.25], "texture": "#all"}, + "east": {"uv": [14, 0.75, 14.75, 1.25], "texture": "#all"} + } + }, + { + "__comment": "Shape9", + "from": [8, 20.5333334, -1.6], + "to": [9, 23.5333334, -0.6], + "faces": { + "down": {"uv": [15.5, 0, 15.75, 0.25], "texture": "#all"}, + "up": {"uv": [15.25, 0, 15.5, 0.25], "texture": "#all"}, + "north": {"uv": [15.25, 0.25, 15.5, 1], "texture": "#all"}, + "south": {"uv": [15.75, 0.25, 16, 1], "texture": "#all"}, + "west": {"uv": [15.5, 0.25, 15.75, 1], "texture": "#all"}, + "east": {"uv": [15, 0.25, 15.25, 1], "texture": "#all"} + } + }, + { + "__comment": "Shape15", + "from": [7.5, 4, 4.5], + "to": [9.5, 8, 6.5], + "faces": { + "down": {"uv": [7.5, 2.25, 8, 2.75], "texture": "#all"}, + "up": {"uv": [7, 2.25, 7.5, 2.75], "texture": "#all"}, + "north": {"uv": [7, 2.75, 7.5, 3.75], "texture": "#all"}, + "south": {"uv": [8, 2.75, 8.5, 3.75], "texture": "#all"}, + "west": {"uv": [7.5, 2.75, 8, 3.75], "texture": "#all"}, + "east": {"uv": [6.5, 2.75, 7, 3.75], "texture": "#all"} + } + }, + { + "__comment": "Shape16", + "from": [8, 27.58, 4], + "to": [9, 32.58, 6], + "faces": { + "down": {"uv": [15.25, 0, 15.5, 0.5], "texture": "#all"}, + "up": {"uv": [15, 0, 15.25, 0.5], "texture": "#all"}, + "north": {"uv": [15, 0.5, 15.25, 1.75], "texture": "#all"}, + "south": {"uv": [15.75, 0.5, 16, 1.75], "texture": "#all"}, + "west": {"uv": [15.25, 0.5, 15.75, 1.75], "texture": "#all"}, + "east": {"uv": [14.5, 0.5, 15, 1.75], "texture": "#all"} + } + }, + { + "__comment": "Shape14", + "from": [8, 26, 14], + "to": [9, 27, 15], + "faces": { + "down": {"uv": [15.5, 0, 15.75, 0.25], "texture": "#all"}, + "up": {"uv": [15.25, 0, 15.5, 0.25], "texture": "#all"}, + "north": {"uv": [15.25, 0.25, 15.5, 0.5], "texture": "#all"}, + "south": {"uv": [15.75, 0.25, 16, 0.5], "texture": "#all"}, + "west": {"uv": [15.5, 0.25, 15.75, 0.5], "texture": "#all"}, + "east": {"uv": [15, 0.25, 15.25, 0.5], "texture": "#all"} + } + }, + { + "__comment": "Shape7", + "from": [7.5, 27, 1], + "to": [9.5, 29, 9], + "faces": { + "down": {"uv": [2.5, 0, 3, 2], "texture": "#all"}, + "up": {"uv": [2, 0, 2.5, 2], "texture": "#all"}, + "north": {"uv": [2, 2, 2.5, 2.5], "texture": "#all"}, + "south": {"uv": [4.5, 2, 5, 2.5], "texture": "#all"}, + "west": {"uv": [2.5, 2, 4.5, 2.5], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.5], "texture": "#all"} + } + }, + { + "__comment": "Shape1", + "from": [8, 8, 5], + "to": [9, 24, 6], + "faces": { + "down": {"uv": [0.5, 2.5, 0.75, 2.75], "texture": "#all"}, + "up": {"uv": [0.25, 2.5, 0.5, 2.75], "texture": "#all"}, + "north": {"uv": [0.25, 2.75, 0.5, 6.75], "texture": "#all"}, + "south": {"uv": [0.75, 2.75, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.5, 2.75, 0.75, 6.75], "texture": "#all"}, + "east": {"uv": [0, 2.75, 0.25, 6.75], "texture": "#all"} + } + }, + { + "__comment": "Shape4", + "from": [7.5, 25.5, 6.5], + "to": [9.5, 26.5, 10.5], + "faces": { + "down": {"uv": [9, 4, 9.5, 5], "texture": "#all"}, + "up": {"uv": [8.5, 4, 9, 5], "texture": "#all"}, + "north": {"uv": [8.5, 5, 9, 5.25], "texture": "#all"}, + "south": {"uv": [10, 5, 10.5, 5.25], "texture": "#all"}, + "west": {"uv": [9, 5, 10, 5.25], "texture": "#all"}, + "east": {"uv": [7.5, 5, 8.5, 5.25], "texture": "#all"} + } + }, + { + "__comment": "Shape8", + "from": [8, 21, 6], + "to": [9, 25, 7], + "faces": { + "down": {"uv": [9.75, 0, 10, 0.25], "texture": "#all"}, + "up": {"uv": [9.5, 0, 9.75, 0.25], "texture": "#all"}, + "north": {"uv": [9.5, 0.25, 9.75, 1.25], "texture": "#all"}, + "south": {"uv": [10, 0.25, 10.25, 1.25], "texture": "#all"}, + "west": {"uv": [9.75, 0.25, 10, 1.25], "texture": "#all"}, + "east": {"uv": [9.25, 0.25, 9.5, 1.25], "texture": "#all"} + } + }, + { + "__comment": "Shape5", + "from": [8, 25, 4], + "to": [9, 27, 14], + "faces": { + "down": {"uv": [13.25, 0, 13.5, 2.5], "texture": "#all"}, + "up": {"uv": [13, 0, 13.25, 2.5], "texture": "#all"}, + "north": {"uv": [13, 2.5, 13.25, 3], "texture": "#all"}, + "south": {"uv": [15.75, 2.5, 16, 3], "texture": "#all"}, + "west": {"uv": [13.25, 2.5, 15.75, 3], "texture": "#all"}, + "east": {"uv": [10.5, 2.5, 13, 3], "texture": "#all"} + } + } + ], + "textures": { + "all": "...", + "particle": "..." } } - diff --git a/src/main/resources/assets/mekanism/models/item/BronzeIngot.json b/src/main/resources/assets/mekanism/models/item/BronzeIngot.json new file mode 100644 index 000000000..04c12e034 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/BronzeIngot.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/BronzeIngot" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/CopperClump.json b/src/main/resources/assets/mekanism/models/item/CopperClump.json new file mode 100644 index 000000000..fa023df9a --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/CopperClump.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/CopperClump" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/CopperCrystal.json b/src/main/resources/assets/mekanism/models/item/CopperCrystal.json new file mode 100644 index 000000000..31aed5f01 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/CopperCrystal.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/CopperCrystal" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/CopperDust.json b/src/main/resources/assets/mekanism/models/item/CopperDust.json new file mode 100644 index 000000000..9d6f7d078 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/CopperDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/CopperDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/CopperIngot.json b/src/main/resources/assets/mekanism/models/item/CopperIngot.json new file mode 100644 index 000000000..d21f76b4d --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/CopperIngot.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/CopperIngot" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/DiamondDust.json b/src/main/resources/assets/mekanism/models/item/DiamondDust.json new file mode 100644 index 000000000..5db7467bf --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/DiamondDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/DiamondDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/DirtyCopperDust.json b/src/main/resources/assets/mekanism/models/item/DirtyCopperDust.json new file mode 100644 index 000000000..151c78d0d --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/DirtyCopperDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/DirtyCopperDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/DirtyGoldDust.json b/src/main/resources/assets/mekanism/models/item/DirtyGoldDust.json new file mode 100644 index 000000000..37fcbe866 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/DirtyGoldDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/DirtyGoldDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/DirtyIronDust.json b/src/main/resources/assets/mekanism/models/item/DirtyIronDust.json new file mode 100644 index 000000000..b1734d9e2 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/DirtyIronDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/DirtyIronDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/DirtyLeadDust.json b/src/main/resources/assets/mekanism/models/item/DirtyLeadDust.json new file mode 100644 index 000000000..6c718fcd7 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/DirtyLeadDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/DirtyLeadDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/DirtyOsmiumDust.json b/src/main/resources/assets/mekanism/models/item/DirtyOsmiumDust.json new file mode 100644 index 000000000..2fb5afeb4 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/DirtyOsmiumDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/DirtyOsmiumDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/DirtySilverDust.json b/src/main/resources/assets/mekanism/models/item/DirtySilverDust.json new file mode 100644 index 000000000..ee978e559 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/DirtySilverDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/DirtySilverDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/DirtyTinDust.json b/src/main/resources/assets/mekanism/models/item/DirtyTinDust.json new file mode 100644 index 000000000..db00b9e4c --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/DirtyTinDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/DirtyTinDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/GlowstoneIngot.json b/src/main/resources/assets/mekanism/models/item/GlowstoneIngot.json new file mode 100644 index 000000000..4811473a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/GlowstoneIngot.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/GlowstoneIngot" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/DirtyDust.json b/src/main/resources/assets/mekanism/models/item/GoldClump.json similarity index 62% rename from src/main/resources/assets/mekanism/models/item/DirtyDust.json rename to src/main/resources/assets/mekanism/models/item/GoldClump.json index 7f479ec3a..f2fca3456 100644 --- a/src/main/resources/assets/mekanism/models/item/DirtyDust.json +++ b/src/main/resources/assets/mekanism/models/item/GoldClump.json @@ -1,7 +1,7 @@ { "parent": "mekanism:item/standard_item", "textures": { - "layer0": "mekanism:items/DirtyDust" + "layer0": "mekanism:items/GoldClump" } } diff --git a/src/main/resources/assets/mekanism/models/item/GoldCrystal.json b/src/main/resources/assets/mekanism/models/item/GoldCrystal.json new file mode 100644 index 000000000..2ec928981 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/GoldCrystal.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/GoldCrystal" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/Crystal.json b/src/main/resources/assets/mekanism/models/item/GoldDust.json similarity index 63% rename from src/main/resources/assets/mekanism/models/item/Crystal.json rename to src/main/resources/assets/mekanism/models/item/GoldDust.json index 78f6d3b88..d5f4debb1 100644 --- a/src/main/resources/assets/mekanism/models/item/Crystal.json +++ b/src/main/resources/assets/mekanism/models/item/GoldDust.json @@ -1,7 +1,7 @@ { "parent": "mekanism:item/standard_item", "textures": { - "layer0": "mekanism:items/Crystal" + "layer0": "mekanism:items/GoldDust" } } diff --git a/src/main/resources/assets/mekanism/models/item/IronClump.json b/src/main/resources/assets/mekanism/models/item/IronClump.json new file mode 100644 index 000000000..4a9909779 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/IronClump.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/IronClump" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/IronCrystal.json b/src/main/resources/assets/mekanism/models/item/IronCrystal.json new file mode 100644 index 000000000..5cdd51ba5 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/IronCrystal.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/IronCrystal" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/Ingot.json b/src/main/resources/assets/mekanism/models/item/IronDust.json similarity index 63% rename from src/main/resources/assets/mekanism/models/item/Ingot.json rename to src/main/resources/assets/mekanism/models/item/IronDust.json index 4249a9514..6a7886d73 100644 --- a/src/main/resources/assets/mekanism/models/item/Ingot.json +++ b/src/main/resources/assets/mekanism/models/item/IronDust.json @@ -1,7 +1,7 @@ { "parent": "mekanism:item/standard_item", "textures": { - "layer0": "mekanism:items/Ingot" + "layer0": "mekanism:items/IronDust" } } diff --git a/src/main/resources/assets/mekanism/models/item/LeadClump.json b/src/main/resources/assets/mekanism/models/item/LeadClump.json new file mode 100644 index 000000000..4d93c30df --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/LeadClump.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/LeadClump" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/LeadCrystal.json b/src/main/resources/assets/mekanism/models/item/LeadCrystal.json new file mode 100644 index 000000000..13a3afe8a --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/LeadCrystal.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/LeadCrystal" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/Dust.json b/src/main/resources/assets/mekanism/models/item/LeadDust.json similarity index 63% rename from src/main/resources/assets/mekanism/models/item/Dust.json rename to src/main/resources/assets/mekanism/models/item/LeadDust.json index 43f3f0d15..875d144f9 100644 --- a/src/main/resources/assets/mekanism/models/item/Dust.json +++ b/src/main/resources/assets/mekanism/models/item/LeadDust.json @@ -1,7 +1,7 @@ { "parent": "mekanism:item/standard_item", "textures": { - "layer0": "mekanism:items/Dust" + "layer0": "mekanism:items/LeadDust" } } diff --git a/src/main/resources/assets/mekanism/models/item/LithiumDust.json b/src/main/resources/assets/mekanism/models/item/LithiumDust.json new file mode 100644 index 000000000..c3837d2b7 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/LithiumDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/LithiumDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/MufflingUpgrade.json b/src/main/resources/assets/mekanism/models/item/MufflingUpgrade.json new file mode 100644 index 000000000..0c04996e1 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/MufflingUpgrade.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/MufflingUpgrade" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/ObsidianDust.json b/src/main/resources/assets/mekanism/models/item/ObsidianDust.json new file mode 100644 index 000000000..e342a8f97 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/ObsidianDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/ObsidianDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/ObsidianIngot.json b/src/main/resources/assets/mekanism/models/item/ObsidianIngot.json new file mode 100644 index 000000000..905e36fc3 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/ObsidianIngot.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/ObsidianIngot" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/OsmiumClump.json b/src/main/resources/assets/mekanism/models/item/OsmiumClump.json new file mode 100644 index 000000000..d283894ed --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/OsmiumClump.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/OsmiumClump" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/OsmiumCrystal.json b/src/main/resources/assets/mekanism/models/item/OsmiumCrystal.json new file mode 100644 index 000000000..1e40398dc --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/OsmiumCrystal.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/OsmiumCrystal" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/OsmiumDust.json b/src/main/resources/assets/mekanism/models/item/OsmiumDust.json new file mode 100644 index 000000000..f330e2048 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/OsmiumDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/OsmiumDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/OsmiumIngot.json b/src/main/resources/assets/mekanism/models/item/OsmiumIngot.json new file mode 100644 index 000000000..e9c772e07 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/OsmiumIngot.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/OsmiumIngot" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/OtherDust.json b/src/main/resources/assets/mekanism/models/item/OtherDust.json deleted file mode 100644 index a59de2ffa..000000000 --- a/src/main/resources/assets/mekanism/models/item/OtherDust.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "mekanism:item/standard_item", - "textures": { - "layer0": "mekanism:items/OtherDust" - } -} - diff --git a/src/main/resources/assets/mekanism/models/item/RefinedObsidianDust.json b/src/main/resources/assets/mekanism/models/item/RefinedObsidianDust.json new file mode 100644 index 000000000..33882357b --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/RefinedObsidianDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/RefinedObsidianDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/SilverClump.json b/src/main/resources/assets/mekanism/models/item/SilverClump.json new file mode 100644 index 000000000..7dff43d7a --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/SilverClump.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/SilverClump" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/SilverCrystal.json b/src/main/resources/assets/mekanism/models/item/SilverCrystal.json new file mode 100644 index 000000000..d7678a14b --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/SilverCrystal.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/SilverCrystal" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/SilverDust.json b/src/main/resources/assets/mekanism/models/item/SilverDust.json new file mode 100644 index 000000000..ef10774a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/SilverDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/SilverDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/SteelDust.json b/src/main/resources/assets/mekanism/models/item/SteelDust.json new file mode 100644 index 000000000..a66e1b2f2 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/SteelDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/SteelDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/SteelIngot.json b/src/main/resources/assets/mekanism/models/item/SteelIngot.json new file mode 100644 index 000000000..514e7bde6 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/SteelIngot.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/SteelIngot" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/SulfurDust.json b/src/main/resources/assets/mekanism/models/item/SulfurDust.json new file mode 100644 index 000000000..8e5b77927 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/SulfurDust.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/SulfurDust" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/TinClump.json b/src/main/resources/assets/mekanism/models/item/TinClump.json new file mode 100644 index 000000000..a6f759baa --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/TinClump.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/TinClump" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/TinCrystal.json b/src/main/resources/assets/mekanism/models/item/TinCrystal.json new file mode 100644 index 000000000..2d93f915f --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/TinCrystal.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/TinCrystal" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/Clump.json b/src/main/resources/assets/mekanism/models/item/TinDust.json similarity index 63% rename from src/main/resources/assets/mekanism/models/item/Clump.json rename to src/main/resources/assets/mekanism/models/item/TinDust.json index 6ca9123db..2c66966f7 100644 --- a/src/main/resources/assets/mekanism/models/item/Clump.json +++ b/src/main/resources/assets/mekanism/models/item/TinDust.json @@ -1,7 +1,7 @@ { "parent": "mekanism:item/standard_item", "textures": { - "layer0": "mekanism:items/Clump" + "layer0": "mekanism:items/TinDust" } } diff --git a/src/main/resources/assets/mekanism/models/item/TinIngot.json b/src/main/resources/assets/mekanism/models/item/TinIngot.json new file mode 100644 index 000000000..689203952 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/TinIngot.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/TinIngot" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/atomic_disassembler.json b/src/main/resources/assets/mekanism/models/item/atomic_disassembler.json deleted file mode 100644 index 5e9e3a8bd..000000000 --- a/src/main/resources/assets/mekanism/models/item/atomic_disassembler.json +++ /dev/null @@ -1,216 +0,0 @@ -{ - "elements": [ - { - "__comment": "Shape6", - "from": [3, 25.7, 2.5], - "to": [6, 28.7, 8.5], - "faces": { - "down": {"uv": [8.25, 0, 9, 1.5], "texture": "#all"}, - "up": {"uv": [7.5, 0, 8.25, 1.5], "texture": "#all"}, - "north": {"uv": [7.5, 1.5, 8.25, 2.25], "texture": "#all"}, - "south": {"uv": [9.75, 1.5, 10.5, 2.25], "texture": "#all"}, - "west": {"uv": [8.25, 1.5, 9.75, 2.25], "texture": "#all"}, - "east": {"uv": [6, 1.5, 7.5, 2.25], "texture": "#all"} - } - }, - { - "__comment": "Shape13", - "from": [8, 27.3, 8], - "to": [9, 28.3, 15], - "faces": { - "down": {"uv": [3, 2.5, 3.25, 4.25], "texture": "#all"}, - "up": {"uv": [2.75, 2.5, 3, 4.25], "texture": "#all"}, - "north": {"uv": [2.75, 4.25, 3, 4.5], "texture": "#all"}, - "south": {"uv": [4.75, 4.25, 5, 4.5], "texture": "#all"}, - "west": {"uv": [3, 4.25, 4.75, 4.5], "texture": "#all"}, - "east": {"uv": [1, 4.25, 2.75, 4.5], "texture": "#all"} - } - }, - { - "__comment": "Shape12", - "from": [7.5, 26.5, 9.5], - "to": [9.5, 27.5, 10.5], - "faces": { - "down": {"uv": [11.25, 3, 11.75, 3.25], "texture": "#all"}, - "up": {"uv": [10.75, 3, 11.25, 3.25], "texture": "#all"}, - "north": {"uv": [10.75, 3.25, 11.25, 3.5], "texture": "#all"}, - "south": {"uv": [11.5, 3.25, 12, 3.5], "texture": "#all"}, - "west": {"uv": [11.25, 3.25, 11.5, 3.5], "texture": "#all"}, - "east": {"uv": [10.5, 3.25, 10.75, 3.5], "texture": "#all"} - } - }, - { - "__comment": "Shape2", - "from": [7.5, 21.5, 4.5], - "to": [9.5, 26.5, 6.5], - "faces": { - "down": {"uv": [9.5, 2.25, 10, 2.75], "texture": "#all"}, - "up": {"uv": [9, 2.25, 9.5, 2.75], "texture": "#all"}, - "north": {"uv": [9, 2.75, 9.5, 4], "texture": "#all"}, - "south": {"uv": [10, 2.75, 10.5, 4], "texture": "#all"}, - "west": {"uv": [9.5, 2.75, 10, 4], "texture": "#all"}, - "east": {"uv": [8.5, 2.75, 9, 4], "texture": "#all"} - } - }, - { - "__comment": "Shape11", - "from": [7.5, 26.5, 11.5], - "to": [9.5, 27.5, 12.5], - "faces": { - "down": {"uv": [11.25, 3.5, 11.75, 3.75], "texture": "#all"}, - "up": {"uv": [10.75, 3.5, 11.25, 3.75], "texture": "#all"}, - "north": {"uv": [10.75, 3.75, 11.25, 4], "texture": "#all"}, - "south": {"uv": [11.5, 3.75, 12, 4], "texture": "#all"}, - "west": {"uv": [11.25, 3.75, 11.5, 4], "texture": "#all"}, - "east": {"uv": [10.5, 3.75, 10.75, 4], "texture": "#all"} - } - }, - { - "__comment": "Shape10", - "from": [7.5, 30.2, 5.5], - "to": [9.5, 31.2, 6.5], - "faces": { - "down": {"uv": [3.75, 0, 4.25, 0.25], "texture": "#all"}, - "up": {"uv": [3.25, 0, 3.75, 0.25], "texture": "#all"}, - "north": {"uv": [3.25, 0.25, 3.75, 0.5], "texture": "#all"}, - "south": {"uv": [4, 0.25, 4.5, 0.5], "texture": "#all"}, - "west": {"uv": [3.75, 0.25, 4, 0.5], "texture": "#all"}, - "east": {"uv": [3, 0.25, 3.25, 0.5], "texture": "#all"} - } - }, - { - "__comment": "Shape3", - "from": [8, 23.44, 1.93], - "to": [9, 25.44, 4.93], - "faces": { - "down": {"uv": [15, 0, 15.25, 0.75], "texture": "#all"}, - "up": {"uv": [14.75, 0, 15, 0.75], "texture": "#all"}, - "north": {"uv": [14.75, 0.75, 15, 1.25], "texture": "#all"}, - "south": {"uv": [15.75, 0.75, 16, 1.25], "texture": "#all"}, - "west": {"uv": [15, 0.75, 15.75, 1.25], "texture": "#all"}, - "east": {"uv": [14, 0.75, 14.75, 1.25], "texture": "#all"} - } - }, - { - "__comment": "Shape9", - "from": [8, 20.5333334, -1.6], - "to": [9, 23.5333334, -0.6], - "faces": { - "down": {"uv": [15.5, 0, 15.75, 0.25], "texture": "#all"}, - "up": {"uv": [15.25, 0, 15.5, 0.25], "texture": "#all"}, - "north": {"uv": [15.25, 0.25, 15.5, 1], "texture": "#all"}, - "south": {"uv": [15.75, 0.25, 16, 1], "texture": "#all"}, - "west": {"uv": [15.5, 0.25, 15.75, 1], "texture": "#all"}, - "east": {"uv": [15, 0.25, 15.25, 1], "texture": "#all"} - } - }, - { - "__comment": "Shape15", - "from": [7.5, 4, 4.5], - "to": [9.5, 8, 6.5], - "faces": { - "down": {"uv": [7.5, 2.25, 8, 2.75], "texture": "#all"}, - "up": {"uv": [7, 2.25, 7.5, 2.75], "texture": "#all"}, - "north": {"uv": [7, 2.75, 7.5, 3.75], "texture": "#all"}, - "south": {"uv": [8, 2.75, 8.5, 3.75], "texture": "#all"}, - "west": {"uv": [7.5, 2.75, 8, 3.75], "texture": "#all"}, - "east": {"uv": [6.5, 2.75, 7, 3.75], "texture": "#all"} - } - }, - { - "__comment": "Shape16", - "from": [8, 27.58, 4], - "to": [9, 32.58, 6], - "faces": { - "down": {"uv": [15.25, 0, 15.5, 0.5], "texture": "#all"}, - "up": {"uv": [15, 0, 15.25, 0.5], "texture": "#all"}, - "north": {"uv": [15, 0.5, 15.25, 1.75], "texture": "#all"}, - "south": {"uv": [15.75, 0.5, 16, 1.75], "texture": "#all"}, - "west": {"uv": [15.25, 0.5, 15.75, 1.75], "texture": "#all"}, - "east": {"uv": [14.5, 0.5, 15, 1.75], "texture": "#all"} - } - }, - { - "__comment": "Shape14", - "from": [8, 26, 14], - "to": [9, 27, 15], - "faces": { - "down": {"uv": [15.5, 0, 15.75, 0.25], "texture": "#all"}, - "up": {"uv": [15.25, 0, 15.5, 0.25], "texture": "#all"}, - "north": {"uv": [15.25, 0.25, 15.5, 0.5], "texture": "#all"}, - "south": {"uv": [15.75, 0.25, 16, 0.5], "texture": "#all"}, - "west": {"uv": [15.5, 0.25, 15.75, 0.5], "texture": "#all"}, - "east": {"uv": [15, 0.25, 15.25, 0.5], "texture": "#all"} - } - }, - { - "__comment": "Shape7", - "from": [7.5, 27, 1], - "to": [9.5, 29, 9], - "faces": { - "down": {"uv": [2.5, 0, 3, 2], "texture": "#all"}, - "up": {"uv": [2, 0, 2.5, 2], "texture": "#all"}, - "north": {"uv": [2, 2, 2.5, 2.5], "texture": "#all"}, - "south": {"uv": [4.5, 2, 5, 2.5], "texture": "#all"}, - "west": {"uv": [2.5, 2, 4.5, 2.5], "texture": "#all"}, - "east": {"uv": [0, 2, 2, 2.5], "texture": "#all"} - } - }, - { - "__comment": "Shape1", - "from": [8, 8, 5], - "to": [9, 24, 6], - "faces": { - "down": {"uv": [0.5, 2.5, 0.75, 2.75], "texture": "#all"}, - "up": {"uv": [0.25, 2.5, 0.5, 2.75], "texture": "#all"}, - "north": {"uv": [0.25, 2.75, 0.5, 6.75], "texture": "#all"}, - "south": {"uv": [0.75, 2.75, 1, 6.75], "texture": "#all"}, - "west": {"uv": [0.5, 2.75, 0.75, 6.75], "texture": "#all"}, - "east": {"uv": [0, 2.75, 0.25, 6.75], "texture": "#all"} - } - }, - { - "__comment": "Shape4", - "from": [7.5, 25.5, 6.5], - "to": [9.5, 26.5, 10.5], - "faces": { - "down": {"uv": [9, 4, 9.5, 5], "texture": "#all"}, - "up": {"uv": [8.5, 4, 9, 5], "texture": "#all"}, - "north": {"uv": [8.5, 5, 9, 5.25], "texture": "#all"}, - "south": {"uv": [10, 5, 10.5, 5.25], "texture": "#all"}, - "west": {"uv": [9, 5, 10, 5.25], "texture": "#all"}, - "east": {"uv": [7.5, 5, 8.5, 5.25], "texture": "#all"} - } - }, - { - "__comment": "Shape8", - "from": [8, 21, 6], - "to": [9, 25, 7], - "faces": { - "down": {"uv": [9.75, 0, 10, 0.25], "texture": "#all"}, - "up": {"uv": [9.5, 0, 9.75, 0.25], "texture": "#all"}, - "north": {"uv": [9.5, 0.25, 9.75, 1.25], "texture": "#all"}, - "south": {"uv": [10, 0.25, 10.25, 1.25], "texture": "#all"}, - "west": {"uv": [9.75, 0.25, 10, 1.25], "texture": "#all"}, - "east": {"uv": [9.25, 0.25, 9.5, 1.25], "texture": "#all"} - } - }, - { - "__comment": "Shape5", - "from": [8, 25, 4], - "to": [9, 27, 14], - "faces": { - "down": {"uv": [13.25, 0, 13.5, 2.5], "texture": "#all"}, - "up": {"uv": [13, 0, 13.25, 2.5], "texture": "#all"}, - "north": {"uv": [13, 2.5, 13.25, 3], "texture": "#all"}, - "south": {"uv": [15.75, 2.5, 16, 3], "texture": "#all"}, - "west": {"uv": [13.25, 2.5, 15.75, 3], "texture": "#all"}, - "east": {"uv": [10.5, 2.5, 13, 3], "texture": "#all"} - } - } - ], - "textures": { - "all": "...", - "particle": "..." - } -} diff --git a/src/main/resources/assets/mekanism/models/item/metallurgic_infuser.json b/src/main/resources/assets/mekanism/models/item/metallurgic_infuser.json deleted file mode 100644 index 8385b0dc7..000000000 --- a/src/main/resources/assets/mekanism/models/item/metallurgic_infuser.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "mekanism:block/metallurgic_infuser", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} -