diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 7d39dc17d..30ca22e87 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -5,6 +5,10 @@ import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOC import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_3; + +import java.util.ArrayList; +import java.util.List; + import mekanism.api.EnumColor; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.GasTankTier; @@ -119,8 +123,31 @@ public class MekanismBlocks for(MachineType type : MachineType.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.typeBlock.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), - (type.hasActiveTexture() ? "active=false," : "") + (type.hasRotations() ? "facing=north" : ""))); + List entries = new ArrayList(); + + if(type.hasActiveTexture()) + { + entries.add("active=false"); + } + + if(type.hasRotations()) + { + entries.add("facing=north"); + } + + String properties = new String(); + + for(int i = 0; i < entries.size(); i++) + { + properties += entries.get(i); + + if(i < entries.size()-1) + { + properties += ","; + } + } + + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.typeBlock.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), properties)); } for(BasicBlockType type : BasicBlockType.values()) diff --git a/src/main/resources/assets/mekanism/blockstates/fluid_tank.json b/src/main/resources/assets/mekanism/blockstates/fluid_tank.json index 8e65f55df..a3725d3ab 100644 --- a/src/main/resources/assets/mekanism/blockstates/fluid_tank.json +++ b/src/main/resources/assets/mekanism/blockstates/fluid_tank.json @@ -9,7 +9,7 @@ "true": {"textures": {"all": "mekanism:blocks/models/fluid_tank_on"}}, "false": {"textures": {"all": "mekanism:blocks/models/fluid_tank"}} }, - "inventory": [{"textures": {"all": "mekanism:blocks/models/fluid_tank"}}] + "inventory": [{}] } }