From 13893bd705908fa4abb554d2609a8842f54526f0 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 4 May 2016 23:37:21 -0400 Subject: [PATCH] A good bit of work - Fixed infuse sprites - Fixed liquid sprites - Fixed Plastic Fence block states - got Plastic Fence to render in block form --- src/main/java/mekanism/api/gas/Gas.java | 2 - .../java/mekanism/api/infuse/InfuseType.java | 16 ++-- .../client/render/MekanismRenderer.java | 86 +++++++++++------- src/main/java/mekanism/common/Mekanism.java | 18 ++-- .../java/mekanism/common/MekanismBlocks.java | 8 +- .../mekanism/common/block/BlockPlastic.java | 7 +- .../common/block/BlockPlasticFence.java | 26 +++++- .../block/states/BlockStateMachine.java | 9 +- .../block/states/BlockStatePlastic.java | 1 - .../models/block/fence_inventory.json | 56 ++++++++++++ .../assets/mekanism/models/block/fence_n.json | 41 +++++++++ .../mekanism/models/block/fence_ne.json | 63 +++++++++++++ .../mekanism/models/block/fence_ns.json | 43 +++++++++ .../mekanism/models/block/fence_nse.json | 65 +++++++++++++ .../mekanism/models/block/fence_nsew.json | 67 ++++++++++++++ .../mekanism/models/block/fence_post.json | 19 ++++ .../models/block/plastic_fence_inventory.json | 5 +- .../models/block/plastic_fence_n.json | 5 +- .../models/block/plastic_fence_ne.json | 5 +- .../models/block/plastic_fence_ns.json | 5 +- .../models/block/plastic_fence_nse.json | 5 +- .../models/block/plastic_fence_nsew.json | 5 +- .../models/block/plastic_fence_post.json | 5 +- .../blocks/liquid/LiquidEnergyStatic.png | Bin 3299 -> 0 bytes 24 files changed, 474 insertions(+), 88 deletions(-) create mode 100755 src/main/resources/assets/mekanism/models/block/fence_inventory.json create mode 100755 src/main/resources/assets/mekanism/models/block/fence_n.json create mode 100755 src/main/resources/assets/mekanism/models/block/fence_ne.json create mode 100755 src/main/resources/assets/mekanism/models/block/fence_ns.json create mode 100755 src/main/resources/assets/mekanism/models/block/fence_nse.json create mode 100755 src/main/resources/assets/mekanism/models/block/fence_nsew.json create mode 100755 src/main/resources/assets/mekanism/models/block/fence_post.json delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergyStatic.png diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index 11468cb9c..93ddab407 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -147,9 +147,7 @@ public class Gas public Gas setIcon(TextureMap map, String location) { iconLocation = new ResourceLocation(location); - sprite = map.registerSprite(iconLocation); - from_fluid = false; return this; diff --git a/src/main/java/mekanism/api/infuse/InfuseType.java b/src/main/java/mekanism/api/infuse/InfuseType.java index 1853e7d9b..5d5fb6087 100644 --- a/src/main/java/mekanism/api/infuse/InfuseType.java +++ b/src/main/java/mekanism/api/infuse/InfuseType.java @@ -11,29 +11,27 @@ import net.minecraft.util.StatCollector; */ public final class InfuseType { - /** The name of this infusion */ + /** The name of this infusion. */ public String name; /** This infuse GUI's icon */ - public ResourceLocation icon; + public ResourceLocation iconResource; + /** The texture representing this infuse type. */ public TextureAtlasSprite sprite; - - /** The location of this infuse GUI's icon */ - public String textureLocation; /** The unlocalized name of this type. */ public String unlocalizedName; - public InfuseType(String s, String tex) + public InfuseType(String s, ResourceLocation res) { name = s; - textureLocation = tex; + iconResource = res; } - public void setIcon(ResourceLocation i) + public void setIcon(TextureAtlasSprite tex) { - icon = i; + sprite = tex; } public InfuseType setUnlocalizedName(String name) diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 3bf22a5e3..5a0ca1722 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -10,6 +10,8 @@ import mekanism.api.EnumColor; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.OreGas; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.api.infuse.InfuseType; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDynamicTank; @@ -102,26 +104,26 @@ public class MekanismRenderer overlays.put(type, event.map.registerSprite(new ResourceLocation("mekanism:blocks/overlay/" + type.getTransmission() + "Overlay"))); } - energyIcon = event.map.registerSprite(new ResourceLocation("mekanism:blocks/LiquidEnergy")); - heatIcon = event.map.registerSprite(new ResourceLocation("mekanism:blocks/LiquidHeat")); + energyIcon = event.map.registerSprite(new ResourceLocation("mekanism:blocks/liquid/LiquidEnergy")); + heatIcon = event.map.registerSprite(new ResourceLocation("mekanism:blocks/liquid/LiquidHeat")); - GasRegistry.getGas("hydrogen").setIcon(event.map, "mekanism:blocks/LiquidHydrogen"); - GasRegistry.getGas("oxygen").setIcon(event.map,"mekanism:blocks/LiquidOxygen"); - GasRegistry.getGas("water").setIcon(event.map,"mekanism:blocks/LiquidSteam"); - GasRegistry.getGas("chlorine").setIcon(event.map,"mekanism:blocks/LiquidChlorine"); - GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map,"mekanism:blocks/LiquidSulfurDioxide"); - GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map,"mekanism:blocks/LiquidSulfurTrioxide"); - GasRegistry.getGas("sulfuricAcid").setIcon(event.map,"mekanism:blocks/LiquidSulfuricAcid"); - GasRegistry.getGas("hydrogenChloride").setIcon(event.map,"mekanism:blocks/LiquidHydrogenChloride"); - GasRegistry.getGas("liquidOsmium").setIcon(event.map,"mekanism:blocks/LiquidOsmium"); - GasRegistry.getGas("liquidStone").setIcon(event.map,"mekanism:blocks/LiquidStone"); - GasRegistry.getGas("ethene").setIcon(event.map,"mekanism:blocks/LiquidEthene"); - GasRegistry.getGas("brine").setIcon(event.map,"mekanism:blocks/LiquidBrine"); - GasRegistry.getGas("sodium").setIcon(event.map,"mekanism:blocks/LiquidSodium"); - GasRegistry.getGas("deuterium").setIcon(event.map,"mekanism:blocks/LiquidDeuterium"); - GasRegistry.getGas("tritium").setIcon(event.map,"mekanism:blocks/LiquidTritium"); - GasRegistry.getGas("fusionFuelDT").setIcon(event.map,"mekanism:blocks/LiquidDT"); - GasRegistry.getGas("lithium").setIcon(event.map,"mekanism:blocks/LiquidLithium"); + GasRegistry.getGas("hydrogen").setIcon(event.map, "mekanism:blocks/liquid/LiquidHydrogen"); + GasRegistry.getGas("oxygen").setIcon(event.map,"mekanism:blocks/liquid/LiquidOxygen"); + GasRegistry.getGas("water").setIcon(event.map,"mekanism:blocks/liquid/LiquidSteam"); + GasRegistry.getGas("chlorine").setIcon(event.map,"mekanism:blocks/liquid/LiquidChlorine"); + GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map,"mekanism:blocks/liquid/LiquidSulfurDioxide"); + GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map,"mekanism:blocks/liquid/LiquidSulfurTrioxide"); + GasRegistry.getGas("sulfuricAcid").setIcon(event.map,"mekanism:blocks/liquid/LiquidSulfuricAcid"); + GasRegistry.getGas("hydrogenChloride").setIcon(event.map,"mekanism:blocks/liquid/LiquidHydrogenChloride"); + GasRegistry.getGas("liquidOsmium").setIcon(event.map,"mekanism:blocks/liquid/LiquidOsmium"); + GasRegistry.getGas("liquidStone").setIcon(event.map,"mekanism:blocks/liquid/LiquidStone"); + GasRegistry.getGas("ethene").setIcon(event.map,"mekanism:blocks/liquid/LiquidEthene"); + GasRegistry.getGas("brine").setIcon(event.map,"mekanism:blocks/liquid/LiquidBrine"); + GasRegistry.getGas("sodium").setIcon(event.map,"mekanism:blocks/liquid/LiquidSodium"); + GasRegistry.getGas("deuterium").setIcon(event.map,"mekanism:blocks/liquid/LiquidDeuterium"); + GasRegistry.getGas("tritium").setIcon(event.map,"mekanism:blocks/liquid/LiquidTritium"); + GasRegistry.getGas("fusionFuelDT").setIcon(event.map,"mekanism:blocks/liquid/LiquidDT"); + GasRegistry.getGas("lithium").setIcon(event.map,"mekanism:blocks/liquid/LiquidLithium"); for(Gas gas : GasRegistry.getRegisteredGasses()) { @@ -129,14 +131,19 @@ public class MekanismRenderer { if(gas.getUnlocalizedName().contains("clean")) { - gas.setIcon(event.map,"mekanism:liquid/LiquidCleanOre"); + gas.setIcon(event.map,"mekanism:blocks/liquid/LiquidCleanOre"); } else { - gas.setIcon(event.map,"mekanism:liquid/LiquidOre"); + gas.setIcon(event.map,"mekanism:blocks/liquid/LiquidOre"); } } } + for(InfuseType type : InfuseRegistry.getInfuseMap().values()) + { + type.setIcon(event.map.registerSprite(type.iconResource)); + } + /* if(RenderPartTransmitter.getInstance() != null) { @@ -184,33 +191,45 @@ public class MekanismRenderer textureMap.clear(); - for (FluidType type : FluidType.values()) { + for(FluidType type : FluidType.values()) + { textureMap.put(type, new HashMap()); } - for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { + for(Fluid fluid : FluidRegistry.getRegisteredFluids().values()) + { // TextureAtlasSprite toUse = null; - if (fluid.getFlowing() != null) { + if(fluid.getFlowing() != null) + { String flow = fluid.getFlowing().toString(); TextureAtlasSprite sprite; - if (map.getTextureExtry(flow) != null) { + + if(map.getTextureExtry(flow) != null) + { sprite = map.getTextureExtry(flow); - } else { + } + else { sprite = map.registerSprite(fluid.getStill()); } + // toUse = sprite; textureMap.get(FluidType.FLOWING).put(fluid, sprite); } - if (fluid.getStill() != null) { + if(fluid.getStill() != null) + { String still = fluid.getStill().toString(); TextureAtlasSprite sprite; - if (map.getTextureExtry(still) != null) { + + if(map.getTextureExtry(still) != null) + { sprite = map.getTextureExtry(still); - } else { + } + else { sprite = map.registerSprite(fluid.getStill()); } + // toUse = sprite; textureMap.get(FluidType.STILL).put(fluid, sprite); } @@ -220,12 +239,15 @@ public class MekanismRenderer } } - - public static TextureAtlasSprite getFluidTexture(Fluid fluid, FluidType type) { - if (fluid == null || type == null) { + public static TextureAtlasSprite getFluidTexture(Fluid fluid, FluidType type) + { + if(fluid == null || type == null) + { return missingIcon; } + Map map = textureMap.get(type); + return map.containsKey(fluid) ? map.get(fluid) : missingIcon; } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 1aa86a6ad..29b03e066 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1269,8 +1269,8 @@ public class Mekanism GasRegistry.register(new Gas("fusionFuelDT")).registerFluid(); GasRegistry.register(new Gas("lithium")).registerFluid(); - FluidRegistry.registerFluid(new Fluid("heavyWater", new ResourceLocation("mekanism:heavy_water"), new ResourceLocation("mekanism:heavy_water"))); - FluidRegistry.registerFluid(new Fluid("steam", new ResourceLocation("mekanism:steam"), new ResourceLocation("mekanism:steam")).setGaseous(true)); + FluidRegistry.registerFluid(new Fluid("heavyWater", new ResourceLocation("mekanism:blocks/liquid/LiquidHeavyWater"), new ResourceLocation("mekanism:blocks/liquid/LiquidHeavyWater"))); + FluidRegistry.registerFluid(new Fluid("steam", new ResourceLocation("mekanism:blocks/liquid/LiquidSteam"), new ResourceLocation("mekanism:blocks/liquid/LiquidSteam")).setGaseous(true)); for(Resource resource : Resource.values()) { @@ -1287,13 +1287,13 @@ public class Mekanism Mekanism.proxy.preInit(); //Register infuses - InfuseRegistry.registerInfuseType(new InfuseType("CARBON", "mekanism:infuse/Carbon").setUnlocalizedName("carbon")); - InfuseRegistry.registerInfuseType(new InfuseType("TIN", "mekanism:infuse/Tin").setUnlocalizedName("tin")); - InfuseRegistry.registerInfuseType(new InfuseType("DIAMOND", "mekanism:infuse/Diamond").setUnlocalizedName("diamond")); - InfuseRegistry.registerInfuseType(new InfuseType("REDSTONE", "mekanism:infuse/Redstone").setUnlocalizedName("redstone")); - InfuseRegistry.registerInfuseType(new InfuseType("FUNGI", "mekanism:infuse/Fungi").setUnlocalizedName("fungi")); - InfuseRegistry.registerInfuseType(new InfuseType("BIO", "mekanism:infuse/Bio").setUnlocalizedName("bio")); - InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", "mekanism:infuse/Obsidian").setUnlocalizedName("obsidian")); + InfuseRegistry.registerInfuseType(new InfuseType("CARBON", new ResourceLocation("mekanism:blocks/infuse/Carbon")).setUnlocalizedName("carbon")); + InfuseRegistry.registerInfuseType(new InfuseType("TIN", new ResourceLocation("mekanism:blocks/infuse/Tin")).setUnlocalizedName("tin")); + InfuseRegistry.registerInfuseType(new InfuseType("DIAMOND", new ResourceLocation("mekanism:blocks/infuse/Diamond")).setUnlocalizedName("diamond")); + InfuseRegistry.registerInfuseType(new InfuseType("REDSTONE", new ResourceLocation("mekanism:blocks/infuse/Redstone")).setUnlocalizedName("redstone")); + InfuseRegistry.registerInfuseType(new InfuseType("FUNGI", new ResourceLocation("mekanism:blocks/infuse/Fungi")).setUnlocalizedName("fungi")); + InfuseRegistry.registerInfuseType(new InfuseType("BIO", new ResourceLocation("mekanism:blocks/infuse/Bio")).setUnlocalizedName("bio")); + InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", new ResourceLocation("mekanism:blocks/infuse/Obsidian")).setUnlocalizedName("obsidian")); Capabilities.registerCapabilities(); } diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 5a1925384..e920ce196 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -19,6 +19,7 @@ import mekanism.common.block.BlockObsidianTNT; import mekanism.common.block.BlockOre; import mekanism.common.block.BlockPlastic; import mekanism.common.block.BlockPlasticFence; +import mekanism.common.block.BlockPlasticFence.PlasticFenceStateMapper; import mekanism.common.block.BlockSalt; import mekanism.common.block.states.BlockStateBasic.BasicBlockStateMapper; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; @@ -70,8 +71,7 @@ public class MekanismBlocks private static final IStateMapper machineMapper = new MachineBlockStateMapper(); private static final IStateMapper basicMapper = new BasicBlockStateMapper(); private static final IStateMapper plasticMapper = new PlasticBlockStateMapper(); - - + private static final IStateMapper fenceMapper = new PlasticFenceStateMapper(); /** * Adds and registers all blocks. @@ -107,13 +107,14 @@ public class MekanismBlocks ModelLoader.setCustomStateMapper(GlowPlasticBlock, plasticMapper); ModelLoader.setCustomStateMapper(ReinforcedPlasticBlock, plasticMapper); ModelLoader.setCustomStateMapper(RoadPlasticBlock, plasticMapper); + ModelLoader.setCustomStateMapper(PlasticFence, fenceMapper); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(ObsidianTNT), 0, new ModelResourceLocation("mekanism:ObsidianTNT", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory")); for(MachineType type : MachineType.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.typeBlock.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), "active=false,facing=north")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.typeBlock.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), (type.hasActiveTexture() ? "active=false," : "") + "facing=north")); } for(BasicBlockType type : BasicBlockType.values()) @@ -147,6 +148,7 @@ public class MekanismBlocks { EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); ResourceLocation baseLocation = new ResourceLocation("mekanism", "EnergyCube"); + return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); } }); diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index e11cbd674..fc933f769 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -1,5 +1,7 @@ package mekanism.common.block; +import static mekanism.common.block.states.BlockStatePlastic.colorProperty; + import java.util.List; import mekanism.api.EnumColor; @@ -8,7 +10,6 @@ import mekanism.common.block.states.BlockStatePlastic; import mekanism.common.block.states.BlockStatePlastic.PlasticBlockType; import net.minecraft.block.Block; import net.minecraft.block.material.Material; - import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -23,8 +24,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import static mekanism.common.block.states.BlockStatePlastic.colorProperty; - public class BlockPlastic extends Block { public PlasticBlockType type; @@ -60,7 +59,6 @@ public class BlockPlastic extends Block return state.getValue(colorProperty).getMetadata(); } - /* @Override @SideOnly(Side.CLIENT) @@ -129,6 +127,7 @@ public class BlockPlastic extends Block { EnumDyeColor color = state.getValue(colorProperty); EnumColor dye = EnumColor.DYES[color.getDyeDamage()]; + return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); } diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index 02141759c..1f029786d 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -11,11 +11,14 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -37,8 +40,7 @@ public class BlockPlasticFence extends BlockFence @Override public IBlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(NORTH, false).withProperty(EAST, false) - .withProperty(WEST, false).withProperty(SOUTH, false).withProperty(colorProperty, EnumDyeColor.byMetadata(meta)); + return this.getDefaultState().withProperty(colorProperty, EnumDyeColor.byMetadata(meta)); } @Override @@ -66,8 +68,10 @@ public class BlockPlasticFence extends BlockFence @Override public int getRenderColor(IBlockState state) { - EnumColor colour = EnumColor.AQUA; - return (int)(colour.getColor(0)*255) << 16 | (int)(colour.getColor(1)*255) << 8 | (int)(colour.getColor(2)*255); + EnumDyeColor color = state.getValue(colorProperty); + EnumColor dye = EnumColor.DYES[color.getDyeDamage()]; + + return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); } @Override @@ -75,4 +79,18 @@ public class BlockPlasticFence extends BlockFence { return getMetaFromState(state); } + + public static class PlasticFenceStateMapper extends StateMapperBase + { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) + { + String properties = "east=" + state.getValue(EAST) + ","; + properties += "north=" + state.getValue(NORTH) + ","; + properties += "south=" + state.getValue(SOUTH) + ","; + properties += "west=" + state.getValue(WEST); + ResourceLocation baseLocation = new ResourceLocation("mekanism", "PlasticFence"); + return new ModelResourceLocation(baseLocation, properties); + } + } } diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index a15084bb7..f0839f636 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -385,7 +385,6 @@ public class BlockStateMachine extends BlockStateFacing { return activable; } - } public static class MachineBlockPredicate implements Predicate @@ -412,27 +411,30 @@ public class BlockStateMachine extends BlockStateFacing BlockMachine block = (BlockMachine)state.getBlock(); MachineType type = state.getValue(block.getProperty()); StringBuilder builder = new StringBuilder(); + if(type.hasActiveTexture()) { builder.append(activeProperty.getName()); builder.append("="); builder.append(state.getValue(activeProperty)); } + if(type.hasRotations()) { EnumFacing facing = state.getValue(facingProperty); + if(type.canRotateTo(facing)) { if(builder.length() > 0) { builder.append(","); } + builder.append(facingProperty.getName()); builder.append("="); builder.append(facing.getName()); } - else - { + else { return new ModelResourceLocation("builtin/missing", "missing"); } } @@ -443,6 +445,7 @@ public class BlockStateMachine extends BlockStateFacing } ResourceLocation baseLocation = new ResourceLocation("mekanism", type.getName()); + return new ModelResourceLocation(baseLocation, builder.toString()); } } diff --git a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java index 8a5713eb0..b375f9bb8 100644 --- a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java +++ b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java @@ -51,5 +51,4 @@ public class BlockStatePlastic extends BlockState return new ModelResourceLocation(baseLocation, property); } } - } diff --git a/src/main/resources/assets/mekanism/models/block/fence_inventory.json b/src/main/resources/assets/mekanism/models/block/fence_inventory.json new file mode 100755 index 000000000..5bec1f9d0 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/fence_inventory.json @@ -0,0 +1,56 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#texture" + }, + "elements": [ + { "from": [ 6, 0, 0 ], + "to": [ 10, 16, 4 ], + "faces": { + "down": { "uv": [ 6, 0, 10, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 6, 0, 10, 4 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "Left post" + }, + { "from": [ 6, 0, 12 ], + "to": [ 10, 16, 16 ], + "faces": { + "down": { "uv": [ 6, 12, 10, 16 ], "texture": "#texture", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 6, 12, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 12, 0, 16, 16 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 12, 0, 16, 16 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "Right post" + }, + { "from": [ 7, 13, -2 ], + "to": [ 9, 15, 18 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 1, 9, 3 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 7, 1, 9, 3 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 0, 1, 16, 3 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 1, 16, 3 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "Top bar" + }, + { "from": [ 7, 5, -2 ], + "to": [ 9, 7, 18 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 9, 9, 11 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 7, 9, 9, 11 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 0, 9, 16, 11 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 9, 16, 11 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "Lower bar" + } + ] +} diff --git a/src/main/resources/assets/mekanism/models/block/fence_n.json b/src/main/resources/assets/mekanism/models/block/fence_n.json new file mode 100755 index 000000000..56e42b455 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/fence_n.json @@ -0,0 +1,41 @@ +{ + "textures": { + "particle": "#texture" + }, + "elements": [ + { "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "down": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "Center post" + }, + { "from": [ 7, 12, 0 ], + "to": [ 9, 15, 9 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 9 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 9 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "north" }, + "west": { "uv": [ 0, 1, 9, 4 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 1, 9, 4 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "North top bar" + }, + { "from": [ 7, 6, 0 ], + "to": [ 9, 9, 9 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 9 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 9 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "north" }, + "west": { "uv": [ 0, 7, 9, 10 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 7, 9, 10 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "North lower bar" + } + ] +} diff --git a/src/main/resources/assets/mekanism/models/block/fence_ne.json b/src/main/resources/assets/mekanism/models/block/fence_ne.json new file mode 100755 index 000000000..eb059ea32 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/fence_ne.json @@ -0,0 +1,63 @@ +{ + "textures": { + "particle": "#texture" + }, + "elements": [ + { "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "down": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "Center post" + }, + { "from": [ 7, 12, 0 ], + "to": [ 9, 15, 9 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 9 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 9 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "north" }, + "west": { "uv": [ 0, 1, 9, 4 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 1, 9, 4 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "North top bar" + }, + { "from": [ 7, 6, 0 ], + "to": [ 9, 9, 9 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 9 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 9 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "cullface": "north" }, + "west": { "uv": [ 0, 7, 9, 10 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 7, 9, 10 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "North lower bar" + }, + { "from": [ 7, 12, 7 ], + "to": [ 16, 15, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 7, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "east" } + }, + "__comment": "East top bar" + }, + { "from": [ 7, 6, 7 ], + "to": [ 16, 9, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 7, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "east" } + }, + "__comment": "East lower bar" + } + ] +} diff --git a/src/main/resources/assets/mekanism/models/block/fence_ns.json b/src/main/resources/assets/mekanism/models/block/fence_ns.json new file mode 100755 index 000000000..866c05289 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/fence_ns.json @@ -0,0 +1,43 @@ +{ + "textures": { + "particle": "#texture" + }, + "elements": [ + { "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "down": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "Center post" + }, + { "from": [ 7, 12, 0 ], + "to": [ 9, 15, 16 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "North-south top bar" + }, + { "from": [ 7, 6, 0 ], + "to": [ 9, 9, 16 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "North-south lower bar" + } + ] +} diff --git a/src/main/resources/assets/mekanism/models/block/fence_nse.json b/src/main/resources/assets/mekanism/models/block/fence_nse.json new file mode 100755 index 000000000..9f3e6421a --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/fence_nse.json @@ -0,0 +1,65 @@ +{ + "textures": { + "particle": "#texture" + }, + "elements": [ + { "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "down": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "Center post" + }, + { "from": [ 7, 12, 0 ], + "to": [ 9, 15, 16 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "North-south top bar" + }, + { "from": [ 7, 6, 0 ], + "to": [ 9, 9, 16 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "North-south lower bar" + }, + { "from": [ 7, 12, 7 ], + "to": [ 16, 15, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 7, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "east" } + }, + "__comment": "East top bar" + }, + { "from": [ 7, 6, 7 ], + "to": [ 16, 9, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 7, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "east" } + }, + "__comment": "East lower bar" + } + ] +} diff --git a/src/main/resources/assets/mekanism/models/block/fence_nsew.json b/src/main/resources/assets/mekanism/models/block/fence_nsew.json new file mode 100755 index 000000000..893d74b0a --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/fence_nsew.json @@ -0,0 +1,67 @@ +{ + "textures": { + "particle": "#texture" + }, + "elements": [ + { "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "down": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "Center post" + }, + { "from": [ 7, 12, 0 ], + "to": [ 9, 15, 16 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "North-south top bar" + }, + { "from": [ 7, 6, 0 ], + "to": [ 9, 9, 16 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 0, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "North-south lower bar" + }, + { "from": [ 0, 12, 7 ], + "to": [ 16, 15, 9 ], + "faces": { + "down": { "uv": [ 0, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 0, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 0, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 0, 1, 16, 4 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 7, 1, 9, 4 ], "texture": "#texture", "tintindex": 0, "cullface": "east" } + }, + "__comment": "East-west top bar" + }, + { "from": [ 0, 6, 7 ], + "to": [ 16, 9, 9 ], + "faces": { + "down": { "uv": [ 0, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "up": { "uv": [ 0, 7, 16, 9 ], "texture": "#texture", "tintindex": 0 }, + "north": { "uv": [ 0, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 0, 7, 16, 10 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 7, 7, 9, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "east" } + }, + "__comment": "East-west lower bar" + } + ] +} diff --git a/src/main/resources/assets/mekanism/models/block/fence_post.json b/src/main/resources/assets/mekanism/models/block/fence_post.json new file mode 100755 index 000000000..010fa9046 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/fence_post.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#texture" + }, + "elements": [ + { "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "down": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "west": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 }, + "east": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "tintindex": 0 } + }, + "__comment": "Center post" + } + ] +} diff --git a/src/main/resources/assets/mekanism/models/block/plastic_fence_inventory.json b/src/main/resources/assets/mekanism/models/block/plastic_fence_inventory.json index a06184b2f..c047fca69 100755 --- a/src/main/resources/assets/mekanism/models/block/plastic_fence_inventory.json +++ b/src/main/resources/assets/mekanism/models/block/plastic_fence_inventory.json @@ -1,7 +1,6 @@ { - "parent": "block/fence_inventory", + "parent": "mekanism:block/fence_inventory", "textures": { - "texture": "mekanism:blocks/PlasticFence", - "tintindex": 0 + "texture": "mekanism:blocks/PlasticFence" } } diff --git a/src/main/resources/assets/mekanism/models/block/plastic_fence_n.json b/src/main/resources/assets/mekanism/models/block/plastic_fence_n.json index c022b892b..4a7b97955 100755 --- a/src/main/resources/assets/mekanism/models/block/plastic_fence_n.json +++ b/src/main/resources/assets/mekanism/models/block/plastic_fence_n.json @@ -1,7 +1,6 @@ { - "parent": "block/fence_n", + "parent": "mekanism:block/fence_n", "textures": { - "texture": "mekanism:blocks/PlasticFence", - "tintindex": 0 + "texture": "mekanism:blocks/PlasticFence" } } diff --git a/src/main/resources/assets/mekanism/models/block/plastic_fence_ne.json b/src/main/resources/assets/mekanism/models/block/plastic_fence_ne.json index 78201e179..76edf3e9a 100755 --- a/src/main/resources/assets/mekanism/models/block/plastic_fence_ne.json +++ b/src/main/resources/assets/mekanism/models/block/plastic_fence_ne.json @@ -1,7 +1,6 @@ { - "parent": "block/fence_ne", + "parent": "mekanism:block/fence_ne", "textures": { - "texture": "mekanism:blocks/PlasticFence", - "tintindex": 0 + "texture": "mekanism:blocks/PlasticFence" } } diff --git a/src/main/resources/assets/mekanism/models/block/plastic_fence_ns.json b/src/main/resources/assets/mekanism/models/block/plastic_fence_ns.json index 97cb652d7..47c2cace0 100755 --- a/src/main/resources/assets/mekanism/models/block/plastic_fence_ns.json +++ b/src/main/resources/assets/mekanism/models/block/plastic_fence_ns.json @@ -1,7 +1,6 @@ { - "parent": "block/fence_ns", + "parent": "mekanism:block/fence_ns", "textures": { - "texture": "mekanism:blocks/PlasticFence", - "tintindex": 0 + "texture": "mekanism:blocks/PlasticFence" } } diff --git a/src/main/resources/assets/mekanism/models/block/plastic_fence_nse.json b/src/main/resources/assets/mekanism/models/block/plastic_fence_nse.json index 4eff4e086..1b805ab64 100755 --- a/src/main/resources/assets/mekanism/models/block/plastic_fence_nse.json +++ b/src/main/resources/assets/mekanism/models/block/plastic_fence_nse.json @@ -1,7 +1,6 @@ { - "parent": "block/fence_nse", + "parent": "mekanism:block/fence_nse", "textures": { - "texture": "mekanism:blocks/PlasticFence", - "tintindex": 0 + "texture": "mekanism:blocks/PlasticFence" } } diff --git a/src/main/resources/assets/mekanism/models/block/plastic_fence_nsew.json b/src/main/resources/assets/mekanism/models/block/plastic_fence_nsew.json index e849d3663..b287897c5 100755 --- a/src/main/resources/assets/mekanism/models/block/plastic_fence_nsew.json +++ b/src/main/resources/assets/mekanism/models/block/plastic_fence_nsew.json @@ -1,7 +1,6 @@ { - "parent": "block/fence_nsew", + "parent": "mekanism:block/fence_nsew", "textures": { - "texture": "mekanism:blocks/PlasticFence", - "tintindex": 0 + "texture": "mekanism:blocks/PlasticFence" } } diff --git a/src/main/resources/assets/mekanism/models/block/plastic_fence_post.json b/src/main/resources/assets/mekanism/models/block/plastic_fence_post.json index 900db6a5e..a46cf7757 100755 --- a/src/main/resources/assets/mekanism/models/block/plastic_fence_post.json +++ b/src/main/resources/assets/mekanism/models/block/plastic_fence_post.json @@ -1,7 +1,6 @@ { - "parent": "block/fence_post", + "parent": "mekanism:block/fence_post", "textures": { - "texture": "mekanism:blocks/PlasticFence", - "tintindex": 0 + "texture": "mekanism:blocks/PlasticFence" } } diff --git a/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergyStatic.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergyStatic.png deleted file mode 100644 index 11be2597e28ee4b3f1807a548b6430c85860efde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3299 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