From 758bc4951598203ff6157b77a3b4906b768eaf95 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 5 May 2016 18:45:40 -0400 Subject: [PATCH] Factory textures & block states, working perfectly --- .../java/mekanism/client/ClientProxy.java | 4 + .../java/mekanism/common/MekanismBlocks.java | 97 +++++++++++++++--- .../java/mekanism/common/base/IFactory.java | 39 ++++--- .../mekanism/common/block/BlockMachine.java | 7 +- .../common/block/states/BlockStateFacing.java | 5 +- .../block/states/BlockStateMachine.java | 37 ++++--- .../common/item/ItemBlockMachine.java | 6 ++ .../common/tile/TileEntityFactory.java | 18 ++-- .../advanced_factory_combining.json | 36 +++++++ .../advanced_factory_compressing.json | 36 +++++++ .../advanced_factory_crushing.json | 36 +++++++ .../advanced_factory_enriching.json | 36 +++++++ .../advanced_factory_infusing.json | 36 +++++++ .../advanced_factory_injecting.json | 36 +++++++ ...y.json => advanced_factory_purifying.json} | 0 .../advanced_factory_smelting.json | 36 +++++++ .../blockstates/basic_factory_combining.json | 36 +++++++ .../basic_factory_compressing.json | 36 +++++++ .../blockstates/basic_factory_crushing.json | 36 +++++++ ...tory.json => basic_factory_enriching.json} | 10 +- .../blockstates/basic_factory_infusing.json | 36 +++++++ .../blockstates/basic_factory_injecting.json | 36 +++++++ .../blockstates/basic_factory_purifying.json | 36 +++++++ .../blockstates/basic_factory_smelting.json | 36 +++++++ .../blockstates/elite_factory_combining.json | 36 +++++++ .../elite_factory_compressing.json | 36 +++++++ .../blockstates/elite_factory_crushing.json | 36 +++++++ ...tory.json => elite_factory_enriching.json} | 10 +- .../blockstates/elite_factory_infusing.json | 36 +++++++ .../blockstates/elite_factory_injecting.json | 36 +++++++ .../blockstates/elite_factory_purifying.json | 36 +++++++ .../blockstates/elite_factory_smelting.json | 36 +++++++ .../blockstates/purification_chamber.json | 2 +- .../factory/advanced/AdvancedFactoryFront.png | Bin 3282 -> 0 bytes .../factory/advanced/AdvancedFactorySide.png | Bin 1514 -> 0 bytes .../factory/advanced/AdvancedFactoryTop.png | Bin 890 -> 0 bytes .../AdvancedInfusingFactoryBottom.png | Bin 1423 -> 0 bytes .../factory/basic/BasicFactoryFront.png | Bin 2122 -> 0 bytes .../blocks/factory/basic/BasicFactorySide.png | Bin 1488 -> 0 bytes .../blocks/factory/basic/BasicFactoryTop.png | Bin 2247 -> 0 bytes .../infusing/BasicInfusingFactoryBottom.png | Bin 1422 -> 0 bytes .../injecting/BasicInjectingFactoryBottom.png | Bin 1427 -> 0 bytes .../factory/elite/EliteFactoryFront.png | Bin 2125 -> 0 bytes .../blocks/factory/elite/EliteFactorySide.png | Bin 1506 -> 0 bytes .../blocks/factory/elite/EliteFactoryTop.png | Bin 915 -> 0 bytes 45 files changed, 928 insertions(+), 63 deletions(-) create mode 100644 src/main/resources/assets/mekanism/blockstates/advanced_factory_combining.json create mode 100644 src/main/resources/assets/mekanism/blockstates/advanced_factory_compressing.json create mode 100644 src/main/resources/assets/mekanism/blockstates/advanced_factory_crushing.json create mode 100644 src/main/resources/assets/mekanism/blockstates/advanced_factory_enriching.json create mode 100644 src/main/resources/assets/mekanism/blockstates/advanced_factory_infusing.json create mode 100644 src/main/resources/assets/mekanism/blockstates/advanced_factory_injecting.json rename src/main/resources/assets/mekanism/blockstates/{advanced_factory.json => advanced_factory_purifying.json} (100%) create mode 100644 src/main/resources/assets/mekanism/blockstates/advanced_factory_smelting.json create mode 100644 src/main/resources/assets/mekanism/blockstates/basic_factory_combining.json create mode 100644 src/main/resources/assets/mekanism/blockstates/basic_factory_compressing.json create mode 100644 src/main/resources/assets/mekanism/blockstates/basic_factory_crushing.json rename src/main/resources/assets/mekanism/blockstates/{basic_factory.json => basic_factory_enriching.json} (61%) create mode 100644 src/main/resources/assets/mekanism/blockstates/basic_factory_infusing.json create mode 100644 src/main/resources/assets/mekanism/blockstates/basic_factory_injecting.json create mode 100644 src/main/resources/assets/mekanism/blockstates/basic_factory_purifying.json create mode 100644 src/main/resources/assets/mekanism/blockstates/basic_factory_smelting.json create mode 100644 src/main/resources/assets/mekanism/blockstates/elite_factory_combining.json create mode 100644 src/main/resources/assets/mekanism/blockstates/elite_factory_compressing.json create mode 100644 src/main/resources/assets/mekanism/blockstates/elite_factory_crushing.json rename src/main/resources/assets/mekanism/blockstates/{elite_factory.json => elite_factory_enriching.json} (61%) create mode 100644 src/main/resources/assets/mekanism/blockstates/elite_factory_infusing.json create mode 100644 src/main/resources/assets/mekanism/blockstates/elite_factory_injecting.json create mode 100644 src/main/resources/assets/mekanism/blockstates/elite_factory_purifying.json create mode 100644 src/main/resources/assets/mekanism/blockstates/elite_factory_smelting.json delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBottom.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index f4912a791..097f9ad24 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.HashMap; +import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.client; @@ -206,6 +208,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy { + public static Map machineResources = new HashMap(); + @Override public void loadConfiguration() { diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 30ca22e87..175db6556 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -10,9 +10,11 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.EnumColor; +import mekanism.client.ClientProxy; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.GasTankTier; import mekanism.common.base.IEnergyCube; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.block.BlockBasic; import mekanism.common.block.BlockBounding; import mekanism.common.block.BlockCardboardBox; @@ -123,31 +125,65 @@ public class MekanismBlocks for(MachineType type : MachineType.values()) { - List entries = new ArrayList(); + List modelsToAdd = new ArrayList(); + String resource = "mekanism:" + type.getName(); + RecipeType recipePointer = null; - if(type.hasActiveTexture()) + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) { - entries.add("active=false"); + recipePointer = RecipeType.values()[0]; + resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); } - if(type.hasRotations()) + while(true) { - 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) + if(ClientProxy.machineResources.get(resource) == null) { - properties += ","; + 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 += ","; + } + } + + ModelResourceLocation model = new ModelResourceLocation(resource, properties); + + ClientProxy.machineResources.put(resource, model); + modelsToAdd.add(model); + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + if(recipePointer.ordinal() < RecipeType.values().length-1) + { + recipePointer = RecipeType.values()[recipePointer.ordinal()+1]; + resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); + + continue; + } + } } + + break; } - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.typeBlock.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), properties)); + ModelLoader.registerItemVariants(Item.getItemFromBlock(type.typeBlock.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {})); } for(BasicBlockType type : BasicBlockType.values()) @@ -169,7 +205,7 @@ public class MekanismBlocks { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); } - + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.EnergyCube), new ItemMeshDefinition() { @Override public ModelResourceLocation getModelLocation(ItemStack stack) @@ -191,5 +227,32 @@ public class MekanismBlocks return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); } }); + + ItemMeshDefinition mesher = new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + MachineType type = MachineType.get(stack); + + if(type != null) + { + String resource = "mekanism:" + type.getName(); + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)]; + resource = "mekanism:" + type.getName() + "_" + recipe.getName(); + } + + return ClientProxy.machineResources.get(resource); + } + + return null; + } + }; + + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock), mesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), mesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), mesher); } } diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 88b77665c..2e87ce46d 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -6,6 +6,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.util.StackUtils; import mekanism.common.InfuseStorage; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.AdvancedMachineInput; @@ -20,10 +21,9 @@ import mekanism.common.util.LangUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; -import static mekanism.common.block.states.BlockStateMachine.MachineType; - /** * Internal interface for managing various Factory types. * @author AidanBrady @@ -45,20 +45,20 @@ public interface IFactory */ public void setRecipeType(int type, ItemStack itemStack); - public static enum RecipeType + public static enum RecipeType implements IStringSerializable { - SMELTING("Smelting", "smelter", MachineType.ENERGIZED_SMELTER.getStack(), false, false, Recipe.ENERGIZED_SMELTER), - ENRICHING("Enriching", "enrichment", MachineType.ENRICHMENT_CHAMBER.getStack(), false, false, Recipe.ENRICHMENT_CHAMBER), - CRUSHING("Crushing", "crusher", MachineType.CRUSHER.getStack(), false, false, Recipe.CRUSHER), - COMPRESSING("Compressing", "compressor", MachineType.OSMIUM_COMPRESSOR.getStack(), true, false, Recipe.OSMIUM_COMPRESSOR), - COMBINING("Combining", "combiner", MachineType.COMBINER.getStack(), true, false, Recipe.COMBINER), - PURIFYING("Purifying", "purifier", MachineType.PURIFICATION_CHAMBER.getStack(), true, true, Recipe.PURIFICATION_CHAMBER), - INJECTING("Injecting", "injection", MachineType.CHEMICAL_INJECTION_CHAMBER.getStack(), true, true, Recipe.CHEMICAL_INJECTION_CHAMBER), - INFUSING("Infusing", "metalinfuser", MachineType.METALLURGIC_INFUSER.getStack(), false, false, Recipe.METALLURGIC_INFUSER); + SMELTING("Smelting", "smelter", MachineType.ENERGIZED_SMELTER, false, false, Recipe.ENERGIZED_SMELTER), + ENRICHING("Enriching", "enrichment", MachineType.ENRICHMENT_CHAMBER, false, false, Recipe.ENRICHMENT_CHAMBER), + CRUSHING("Crushing", "crusher", MachineType.CRUSHER, false, false, Recipe.CRUSHER), + COMPRESSING("Compressing", "compressor", MachineType.OSMIUM_COMPRESSOR, true, false, Recipe.OSMIUM_COMPRESSOR), + COMBINING("Combining", "combiner", MachineType.COMBINER, true, false, Recipe.COMBINER), + PURIFYING("Purifying", "purifier", MachineType.PURIFICATION_CHAMBER, true, true, Recipe.PURIFICATION_CHAMBER), + INJECTING("Injecting", "injection", MachineType.CHEMICAL_INJECTION_CHAMBER, true, true, Recipe.CHEMICAL_INJECTION_CHAMBER), + INFUSING("Infusing", "metalinfuser", MachineType.METALLURGIC_INFUSER, false, false, Recipe.METALLURGIC_INFUSER); private String name; private ResourceLocation sound; - private ItemStack stack; + private MachineType type; private boolean usesFuel; private boolean fuelSpeed; private Recipe recipe; @@ -170,7 +170,6 @@ public interface IFactory if(((Map.Entry)obj).getKey() instanceof AdvancedMachineInput) { Map.Entry entry = (Map.Entry)obj; - ItemStack stack = ((AdvancedMachineInput)entry.getKey()).itemStack; if(StackUtils.equalsWildcard(stack, itemStack)) @@ -187,7 +186,7 @@ public interface IFactory { if(cacheTile == null) { - MachineType type = MachineType.get(Block.getBlockFromItem(getStack().getItem()), getStack().getItemDamage()); + MachineType type = MachineType.get(getStack()); cacheTile = (TileEntityAdvancedElectricMachine)type.create(); } @@ -201,7 +200,7 @@ public interface IFactory public ItemStack getStack() { - return stack; + return type.getStack(); } public String getUnlocalizedName() @@ -229,14 +228,20 @@ public interface IFactory return fuelSpeed; } - private RecipeType(String s, String s1, ItemStack is, boolean b, boolean b1, Recipe r) + private RecipeType(String s, String s1, MachineType t, boolean b, boolean b1, Recipe r) { name = s; sound = new ResourceLocation("mekanism", "tile.machine." + s1); - stack = is; + type = t; usesFuel = b; fuelSpeed = b1; recipe = r; } + + @Override + public String getName() + { + return name().toLowerCase(); + } } } diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index e30998b2d..33b3b1395 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -195,11 +195,14 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou state = state.withProperty(BlockStateMachine.tierProperty, ((TileEntityFluidTank)tile).tier.getBaseTier()); } + if(tile instanceof TileEntityFactory) + { + state = state.withProperty(BlockStateMachine.recipeProperty, ((TileEntityFactory)tile).recipeType); + } + return state; } - - /* @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/common/block/states/BlockStateFacing.java b/src/main/java/mekanism/common/block/states/BlockStateFacing.java index 23524e58e..94690a946 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateFacing.java +++ b/src/main/java/mekanism/common/block/states/BlockStateFacing.java @@ -1,6 +1,7 @@ package mekanism.common.block.states; import mekanism.common.Tier.BaseTier; +import mekanism.common.base.IFactory.RecipeType; import net.minecraft.block.Block; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyDirection; @@ -11,9 +12,9 @@ public class BlockStateFacing extends BlockState { public static final PropertyDirection facingProperty = PropertyDirection.create("facing"); - public BlockStateFacing(Block block, PropertyEnum typeProperty, PropertyBool activeProperty, PropertyEnum tierProperty) + public BlockStateFacing(Block block, PropertyEnum typeProperty, PropertyBool activeProperty, PropertyEnum tierProperty, PropertyEnum recipeProperty) { - super(block, facingProperty, typeProperty, activeProperty, tierProperty); + super(block, facingProperty, typeProperty, activeProperty, tierProperty, recipeProperty); } public BlockStateFacing(Block block, PropertyEnum typeProperty, PropertyBool activeProperty) diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index 694bcb466..825caa203 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -11,6 +11,7 @@ import mekanism.api.MekanismConfig.usage; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.block.BlockMachine; import mekanism.common.recipe.ShapedMekanismRecipe; import mekanism.common.tile.TileEntityAdvancedFactory; @@ -73,15 +74,13 @@ public class BlockStateMachine extends BlockStateFacing { public static final PropertyBool activeProperty = PropertyBool.create("active"); public static final PropertyEnum tierProperty = PropertyEnum.create("tier", BaseTier.class); + public static final PropertyEnum recipeProperty = PropertyEnum.create("recipe", RecipeType.class); public BlockStateMachine(BlockMachine block, PropertyEnum typeProperty) { - super(block, typeProperty, activeProperty, tierProperty); + super(block, typeProperty, activeProperty, tierProperty, recipeProperty); } - public static final Predicate never = Predicates.alwaysFalse(); - public static final Predicate always = Predicates.alwaysTrue(); - public static enum MachineBlock { MACHINE_BLOCK_1, @@ -129,11 +128,11 @@ public class BlockStateMachine extends BlockStateFacing METALLURGIC_INFUSER(MachineBlock.MACHINE_BLOCK_1, 8, "MetallurgicInfuser", 12, TileEntityMetallurgicInfuser.class, true, true, true, Plane.HORIZONTAL, false), PURIFICATION_CHAMBER(MachineBlock.MACHINE_BLOCK_1, 9, "PurificationChamber", 15, TileEntityPurificationChamber.class, true, false, true, Plane.HORIZONTAL, true), ENERGIZED_SMELTER(MachineBlock.MACHINE_BLOCK_1, 10, "EnergizedSmelter", 16, TileEntityEnergizedSmelter.class, true, false, true, Plane.HORIZONTAL, true), - TELEPORTER(MachineBlock.MACHINE_BLOCK_1, 11, "Teleporter", 13, TileEntityTeleporter.class, true, false, false, never, false), + TELEPORTER(MachineBlock.MACHINE_BLOCK_1, 11, "Teleporter", 13, TileEntityTeleporter.class, true, false, false, Predicates.alwaysFalse(), false), ELECTRIC_PUMP(MachineBlock.MACHINE_BLOCK_1, 12, "ElectricPump", 17, TileEntityElectricPump.class, true, true, false, Plane.HORIZONTAL, false), PERSONAL_CHEST(MachineBlock.MACHINE_BLOCK_1, 13, "PersonalChest", -1, TileEntityPersonalChest.class, true, true, false, Plane.HORIZONTAL, false), CHARGEPAD(MachineBlock.MACHINE_BLOCK_1, 14, "Chargepad", -1, TileEntityChargepad.class, true, true, false, Plane.HORIZONTAL, false), - LOGISTICAL_SORTER(MachineBlock.MACHINE_BLOCK_1, 15, "LogisticalSorter", -1, TileEntityLogisticalSorter.class, false, true, false, always, true), + LOGISTICAL_SORTER(MachineBlock.MACHINE_BLOCK_1, 15, "LogisticalSorter", -1, TileEntityLogisticalSorter.class, false, true, false, Predicates.alwaysTrue(), true), ROTARY_CONDENSENTRATOR(MachineBlock.MACHINE_BLOCK_2, 0, "RotaryCondensentrator", 7, TileEntityRotaryCondensentrator.class, true, true, false, Plane.HORIZONTAL, false), CHEMICAL_OXIDIZER(MachineBlock.MACHINE_BLOCK_2, 1, "ChemicalOxidizer", 29, TileEntityChemicalOxidizer.class, true, true, true, Plane.HORIZONTAL, true), CHEMICAL_INFUSER(MachineBlock.MACHINE_BLOCK_2, 2, "ChemicalInfuser", 30, TileEntityChemicalInfuser.class, true, true, false, Plane.HORIZONTAL, true), @@ -145,18 +144,18 @@ public class BlockStateMachine extends BlockStateFacing CHEMICAL_CRYSTALLIZER(MachineBlock.MACHINE_BLOCK_2, 8, "ChemicalCrystallizer", 37, TileEntityChemicalCrystallizer.class, true, true, true, Plane.HORIZONTAL, true), SEISMIC_VIBRATOR(MachineBlock.MACHINE_BLOCK_2, 9, "SeismicVibrator", 39, TileEntitySeismicVibrator.class, true, true, false, Plane.HORIZONTAL, true), PRESSURIZED_REACTION_CHAMBER(MachineBlock.MACHINE_BLOCK_2, 10, "PressurizedReactionChamber", 40, TileEntityPRC.class, true, true, false, Plane.HORIZONTAL, true), - FLUID_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "FluidTank", 41, TileEntityFluidTank.class, false, true, false, never, true), + FLUID_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "FluidTank", 41, TileEntityFluidTank.class, false, true, false, Predicates.alwaysFalse(), true), FLUIDIC_PLENISHER(MachineBlock.MACHINE_BLOCK_2, 12, "FluidicPlenisher", 42, TileEntityFluidicPlenisher.class, true, true, false, Plane.HORIZONTAL, true), - LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false, always, false), - LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false, always, true), - LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam.class, false, true, false, always, true), + LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false, Predicates.alwaysTrue(), false), + LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false, Predicates.alwaysTrue(), true), + LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam.class, false, true, false, Predicates.alwaysTrue(), true), QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "QuantumEntangloporter", 46, TileEntityQuantumEntangloporter.class, true, false, false, Plane.HORIZONTAL, true), SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false, Plane.HORIZONTAL, true), - AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false, never, true), + AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false, Predicates.alwaysFalse(), true), OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false, Plane.HORIZONTAL, true), - RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false, always, true), - FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true, always, true), - FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater.class, false, false, false, always, true); + RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false, Predicates.alwaysTrue(), true), + FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true, Predicates.alwaysTrue(), true), + FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater.class, false, false, false, Predicates.alwaysTrue(), true); public MachineBlock typeBlock; public int meta; @@ -413,6 +412,7 @@ public class BlockStateMachine extends BlockStateFacing BlockMachine block = (BlockMachine)state.getBlock(); MachineType type = state.getValue(block.getProperty()); StringBuilder builder = new StringBuilder(); + String nameOverride = null; if(type.hasActiveTexture()) { @@ -440,13 +440,20 @@ public class BlockStateMachine extends BlockStateFacing return new ModelResourceLocation("builtin/missing", "missing"); } } + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + RecipeType recipe = state.getValue(recipeProperty); + + nameOverride = type.getName() + "_" + recipe.getName(); + } if(builder.length() == 0) { builder.append("normal"); } - ResourceLocation baseLocation = new ResourceLocation("mekanism", type.getName()); + ResourceLocation baseLocation = new ResourceLocation("mekanism", nameOverride != null ? nameOverride : type.getName()); return new ModelResourceLocation(baseLocation, builder.toString()); } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index cf591eef7..84867b777 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -3,17 +3,20 @@ package mekanism.common.item; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; +import java.util.ArrayList; import java.util.List; import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.Range4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FluidTankTier; +import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.IFactory; import mekanism.common.base.IRedstoneControl; @@ -28,6 +31,7 @@ import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.integration.IC2ItemManager; import mekanism.common.inventory.InventoryPersonalChest; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; @@ -363,6 +367,8 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec factory.upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades()); factory.secondaryEnergyPerTick = factory.getSecondaryEnergyPerTick(recipeType); world.notifyNeighborsOfStateChange(pos, tileEntity.getBlockType()); + + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); } if(tileEntity instanceof ISustainedTank) diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index f4344afa9..645911f83 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -769,13 +769,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I clientActive = dataStream.readBoolean(); RecipeType oldRecipe = recipeType; recipeType = RecipeType.values()[dataStream.readInt()]; - upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades()); - - if(recipeType != oldRecipe) - { - secondaryEnergyPerTick = getSecondaryEnergyPerTick(recipeType); - } - + upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades()); recipeTicks = dataStream.readInt(); controlType = RedstoneControl.values()[dataStream.readInt()]; sorting = dataStream.readBoolean(); @@ -783,6 +777,16 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I lastUsage = dataStream.readDouble(); infuseStored.amount = dataStream.readInt(); infuseStored.type = InfuseRegistry.get(PacketHandler.readString(dataStream)); + + if(recipeType != oldRecipe) + { + secondaryEnergyPerTick = getSecondaryEnergyPerTick(recipeType); + + if(!upgraded) + { + MekanismUtils.updateBlock(worldObj, getPos()); + } + } for(int i = 0; i < tier.processes; i++) { diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_combining.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_combining.json new file mode 100644 index 000000000..2f6e11b6e --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_combining.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryFront", + "south": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryBack", + "west": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryRight", + "east": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryLeft", + "up": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_compressing.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_compressing.json new file mode 100644 index 000000000..6a827787e --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_compressing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront", + "south": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryBack", + "west": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryRight", + "east": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_crushing.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_crushing.json new file mode 100644 index 000000000..f0e4cfd6a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_crushing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront", + "south": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryBack", + "west": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryRight", + "east": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_enriching.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_enriching.json new file mode 100644 index 000000000..60158ff1c --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_enriching.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront", + "south": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBack", + "west": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRight", + "east": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_infusing.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_infusing.json new file mode 100644 index 000000000..35c95dfc2 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_infusing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryFront", + "south": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryBack", + "west": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryRight", + "east": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_injecting.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_injecting.json new file mode 100644 index 000000000..1365c8c22 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_injecting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront", + "south": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryBack", + "west": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryRight", + "east": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_purifying.json similarity index 100% rename from src/main/resources/assets/mekanism/blockstates/advanced_factory.json rename to src/main/resources/assets/mekanism/blockstates/advanced_factory_purifying.json diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_smelting.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_smelting.json new file mode 100644 index 000000000..8e099df7d --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_smelting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront", + "south": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBack", + "west": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRight", + "east": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_combining.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_combining.json new file mode 100644 index 000000000..48b0c4816 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_combining.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryFront", + "south": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryBack", + "west": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryRight", + "east": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryLeft", + "up": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryBackOn", + "west": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryRightOn", + "east": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_compressing.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_compressing.json new file mode 100644 index 000000000..c0f1d624b --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_compressing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryFront", + "south": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryBack", + "west": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryRight", + "east": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryLeft", + "up": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_crushing.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_crushing.json new file mode 100644 index 000000000..7d840023b --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_crushing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryFront", + "south": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryBack", + "west": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryRight", + "east": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryLeft", + "up": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_enriching.json similarity index 61% rename from src/main/resources/assets/mekanism/blockstates/basic_factory.json rename to src/main/resources/assets/mekanism/blockstates/basic_factory_enriching.json index 531b00c98..f07ba429c 100644 --- a/src/main/resources/assets/mekanism/blockstates/basic_factory.json +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_enriching.json @@ -19,7 +19,15 @@ "west": {"y": -90} }, "active": { - "true": {}, + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryTopOn" + } + }, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_infusing.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_infusing.json new file mode 100644 index 000000000..d0fd2b903 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_infusing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryFront", + "south": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryBack", + "west": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryRight", + "east": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryLeft", + "up": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_injecting.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_injecting.json new file mode 100644 index 000000000..5d96be893 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_injecting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryFront", + "south": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryBack", + "west": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryRight", + "east": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryLeft", + "up": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_purifying.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_purifying.json new file mode 100644 index 000000000..6329b4a23 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_purifying.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryFront", + "south": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryBack", + "west": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryRight", + "east": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryLeft", + "up": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_smelting.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_smelting.json new file mode 100644 index 000000000..57b435359 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_smelting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryFront", + "south": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryBack", + "west": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryRight", + "east": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryLeft", + "up": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_combining.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_combining.json new file mode 100644 index 000000000..2beb0730b --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_combining.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryFront", + "south": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryBack", + "west": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryRight", + "east": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryLeft", + "up": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryBackOn", + "west": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryRightOn", + "east": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_compressing.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_compressing.json new file mode 100644 index 000000000..697a54223 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_compressing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryFront", + "south": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryBack", + "west": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryRight", + "east": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryLeft", + "up": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_crushing.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_crushing.json new file mode 100644 index 000000000..d2e64ae36 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_crushing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryFront", + "south": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryBack", + "west": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryRight", + "east": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryLeft", + "up": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_enriching.json similarity index 61% rename from src/main/resources/assets/mekanism/blockstates/elite_factory.json rename to src/main/resources/assets/mekanism/blockstates/elite_factory_enriching.json index 74ec1d7be..5f62dd7be 100644 --- a/src/main/resources/assets/mekanism/blockstates/elite_factory.json +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_enriching.json @@ -19,7 +19,15 @@ "west": {"y": -90} }, "active": { - "true": {}, + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryTopOn" + } + }, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_infusing.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_infusing.json new file mode 100644 index 000000000..c6564d32b --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_infusing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryFront", + "south": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryBack", + "west": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryRight", + "east": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryLeft", + "up": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_injecting.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_injecting.json new file mode 100644 index 000000000..4d0648c93 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_injecting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryFront", + "south": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryBack", + "west": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryRight", + "east": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryLeft", + "up": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_purifying.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_purifying.json new file mode 100644 index 000000000..5a8d804e1 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_purifying.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryFront", + "south": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryBack", + "west": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryRight", + "east": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryLeft", + "up": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_smelting.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_smelting.json new file mode 100644 index 000000000..b6117575e --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_smelting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryFront", + "south": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryBack", + "west": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryRight", + "east": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryLeft", + "up": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/purification_chamber.json b/src/main/resources/assets/mekanism/blockstates/purification_chamber.json index 35508f9a1..6650c300e 100644 --- a/src/main/resources/assets/mekanism/blockstates/purification_chamber.json +++ b/src/main/resources/assets/mekanism/blockstates/purification_chamber.json @@ -19,7 +19,7 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { + "active": { "true": { "textures": { "front": "mekanism:blocks/purification_chamber/PurificationChamberFrontOn", diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png deleted file mode 100644 index 7407ed96b94a110d9771ab768cc798d6b9c14bc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3282 zcmV;@3@!7CP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER000PSNkl9=obh}*N?Ofk;zT=?Z?^gx|LExXN^5OP9jw9P_N^SWHMNw$JlLtrngxmG?dhPE~ z6j@Oerf*RgvJqOZH`d6BHSy9*hqhUl7R4cprNw+#{H=@9Lb(6Gd7U%%B#E=&d}U=N zMPJPM79K^h-tN;}Bjd@FbCe3hdc$aJ)!C)B_zuplEIb=q>vC%0_58QL`@rXowfJ&k z;qx)yQ$O?0uYb(GD|_$Vw|vgW@Y1(vR0AS8ew1&$i=TFra-7nRaY{`}lJXy!ig>N1uIV{P#b8ZdF#V zOZgC)vsrGza5$_E4m(ypy|e^|#kG|UU<99=b2rB;_GVZjlJ~wo*1UL%#6!x;hx#NZ z1ABT(IJH>Tpxp|(0MQi(6dn`0108|{lE ztQwiIr%4<*2DEgp?MVLRuYO|Z&qhX+EK;nJ(2`cndt?;~MpN7C z_bqL;h;L*iGCMnM_e>1`-~Q%(yMXTj8bx>|WKI-yIy-NtX>7q_Wh3%cfV=z6S3Ct* zs};fmi(8rJa#@j*98MW$?Ut=eloEikI)P!9wrzNFWNidjc;tiM{Q<)YyFI)G*V3My zUDy(S!qggL7RV&c5r8WdbG&JTe%EHxsZAzRdww|vC^M6S?KHCS_{x?jRR$#{0757mPiA)d^vnv%X|L0>YF+r|n-3in3zg|RCqrM# z^W2_aon!H(16Uyvg-HTi_6L#8@(q|M1<7mRla8v%5n3ya^seHNv{GBl=2qZtDI(@t zg9itN_=rlj0t*R>0N}Ez?SvDhW|Niu?B{P{DW#kp-~Yiwu#zfQ33F||WV#1j%^Qyv zD2@P-ycAMw!Z`8tyqqj-IbDJW;YFz#*l0ZQlR+3W7o!~aNK{)cC3?GETP&BX1$MaK zcO2<%;or#(mP>Szc;P|2&1M787Pi9b1PdLUZb^M;&Hm0#%MQT9YM$HVYG%{%%v#`K zcX!uj%LN%!Af&YAGPe?bS(e(_#R$H6&4j09${83VE9-eVM+(GP-RtcD5VOUc5{=4a zJ)R&f!R(x}oq_xz@n04T>vVUBduglH5}|XTRmw4WXc2E zN~nUW#f0>zs95lWVZlMOi_ysT_xJ4C>8ZW^%7AR>x{?VQb9i#!h6h~do5Cj3x#h*u z)A{$0K6b^kPRBm{=+E}no3Gn4pQBoh0Rdme2YY*a)$n)^DVKIG?a)dK!a_{`?+B9ec>uTB0S|@-_9?% z(uDyv67qmZHC#w;k=H6PQJUC%k=u%@B~o+22^X$>QXP@ryA(1Q@-OIZgQ;-9DA$}2pHq-O=OZwR8sz%m#>2gFJ@!I| zee&YhNwCxG0sPR}y(pRDOG{QCkno12gcD2Nj5sjseG=3(E}?G6=1{%Ns7AS_rH)ck zXX=2niTBO*U7$UlhH{tO(z*94h)=oWsfGYiB#;&WYra@gXu3YHEKv+g&>iruVzb_? z-Q`*n>AqhAUg4+lq`GVYG~!wg$P$q^B>u)@#pWlUe%TD2xj>~RMD<}t3MFL4dbO_I z$6QRcR1?yG%I^%ksyjo5h!mED^p#SlUpz%&d;_qgtcSq+d0f+OXLfZy!tDw{VL$Bl z?J@1P)flyV?Jn-88O4*IU|rzI5A1#`vVWqKlz5G1WE95 zUQRB4jdd9y`VL$L=u1BLea0M5x=V7dbs0DwPkkj+vAb?^JOrMGETsrLqNhtU$|ser z0hCS&j3R+e!X2Dgqx>()XZ?N@*i^&{>OsMrK+2?NfPPD^uM5fsUhSUBQB^+-4IQ71n`I_(q>7%3cBLDyZ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png deleted file mode 100644 index b1eb966e7d7a60372f44d79835e2749dd3708d20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1514 zcmVr)d~6wlY@waF&g-R$N8q~Q@EDpUv%QJxBliYO?)ssmI6L7}$NPRFs(=^(;rAJb09 zPo3#ZAJdsmzjX9V|FmDvxyenFWs~^D4`+7oy}x_U@1FBJXA@T_6arf~9EKK&h-dk` z8I2-B@6xoQ@w{n9VHgIisDXGaCM;&fphq-;u}o8(ZRol%v4@P$6@JwaT>LVSIf}lP zta#>%&*PaadYU_`&KIm*%(3;hW)I9sv(L%1*td(BGQd(*VTPf^f2!pP3rP@Tuda@x+CZ3OuimoIY6^AIo*2n~dK(%>oJb z$tiUiS_FM<*$M)q<3r-WBb`|>K7O(fefb_7>Sz<=vlqu`oGY!f!*aYNkUi2a#sfqB zbb-UjWLj~oNPvB^E?kL3LgbYv^YLg!1muBsLX*>{DhSxudCUZkb`{2BX9mS3np@K7 zDiUCyEMP%^1ym~n_VKytaeQ#B6PZJWi1ZKiIz~Ve;D`;4o)maVfPD%Ax_(dtgCi%< z+uu{2z~yl|kkp zl=9o#-(3|yIeoe$N*Mw6X_`bJ7BvrO;9c4Q4RF_z1ULdrB4;yB4Vzq-n0yVBd)oDg zFm~J%GfF8CKB-f>xD=!abGCz>NU+(R<*JaD@6xfHmm=i!iwH;&I^D{NM6LC#p;bi8 zzL(df2xA-p?naV8t&loJqMVFVx~dVA1VjY*izHLP2eoS9nhxHEM0qNm@Rfa_jtJ}J z+b&Qi9hGAw0rtr~NPG=ziSTXHlB*E`J4Qx8RDqpc{XC_#yQt}Q$E+<_`L3`l`38%nLz^SK~-@KMK%B?S9R_y~7 z1j-vxy?zD{oQRT@xv6Z*dj+6!fvv@{Y! z5Rp&-mL9^lYe76;3gVZiD*oQl@XcxvsRk1bF&)jR7+O*$Qb_~NO(uTcR`J`{gxwC| z*R2p!gMi-rY}mL>}wtqu5VU&ou5VZ443!Rzl-ym_JG&)p)1 zoVGIAMiY%hq9Lwfcg>II4}$pYwilO1Jy@LbO|H%Quz53pFYo&B z$5uof(w2^kXQnwxx3&bCA3pbE=b40-WvRl!%w0X&}bQ&c$Q7T%}uvC~w-5Ja~Y z1K3&iWADC-jX58__)x*qd4+Bs6(NsmA()iPWHDuXoYM6GUOf)eJ_XN+_`1()p#e?NbUd#@=u{7nw?FlymikI{d5!wh*YP4_=S}2HxbMN8S7?BXFL?0ih7TJvUaZg1^QvFq`5-pN^5J~DrSm@AC*1wZ9;{Hf z7pD|#T=NMGJGXTD=S}8Xo%ZALbw74jR3s?G$(UAr>H?Hbn%KNi2=)3kFP?tn!|pu= zo45S}lZ@+vti>TsM3Jx}!qMh+AGVehY|jVqkhJyWjv^|F&u0>8(i5lkKZ;c3MpHg* Qga7~l07*qoM6N<$g6bsE?*IS* diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png deleted file mode 100644 index 18e2eb83d4171289a075cbd0673928aa570ed1dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 890 zcmV-=1BLvFP)Gc{RS?na=(M&ylaSjW^HEf46VcmbF8J;MDGc1*T^7qSTNUvG z5DdUHOh$voshb%+zu(dNZj}$3Ovf~yoag%M?+3bjy2|w*zwQh6=)Zry$@R;4Leo_6 zKXx(@@QIXmETc~gKPmutc)8^X&&Lt#S2qhLL)KTf z%X9%}6a*u>+yH=2@S?M~x5s%!V=}M{5s(RWK<^(<1ps6aiiT`SC*EFUJ&|WD!}e=9Li;0EpP_!wuUD0Qh78rdj5|`u>{c%UL~u zzb~wdgXFplKqLI;SbnqDvYAUPji~GP95^l@4PS7eIsWt)tKCuV!Y1l-< z&!#1Ah=6V*5#TD&0aTS!@`*^)aiGe!0011oMWT*`di`%(y`Jy51^|3=6@Unnp`V`x zb+z79dQF7WqmgU?z$XK+(^61LsFuvOjb_`vP(@^k0Fy8+06q=nN~SZnF3$kiR4GXX zkyX%H3c~C{f)uC#+CGdb0jL{M+jl}q0d_*(2X=OL3T4>#o$!AZgjpG?9EiW*PFNyg z6$je96DCRoYB|v6ov;L;jstDo2}>lzLs0;H<T{rzuQ6?k}7D>4`i z`0KhZ9UL6ca5&5b_TY`@xfF&W`TmGkhITh?lkqZ#=y(9B^Z0?EUdtW&2VW_{MA2qm Qpa1{>07*qoM6N<$f+>!b761SM diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png deleted file mode 100644 index 5b83ac09f26a0c8055a703e05a424f6bc67ddc7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1423 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUPluPV;4hb3pYbIS3^TrQwvi= zpgE4NE~c(7PG)W{Fuk66#U+V($*C}VGlBL(^_t_=Yvo*&npl!w6q28x14{t`8Tlpo z#Toep3eL{p7+25;&&*57FE7>vMG?fuE~!PCWvMA{Mftf3;4rqz#Nvij6Eh=21G6+; zi)8aeT@ynS3n0rlNjKTlI5pYa%p^6*$VdsQKZTsI(+4_8ACyRt5)DiUm=ZxucoqP1 z;F%~j514a`fLTO&{`Lb542;`7T^vIyZta!&h^t^=kBZwOX16+q|Ns3@HB2!0 z(8!;+zPtJzUrXZcg9|Nn-`;zEbBWGrjjnm;)4!ODb+=CToMdtH`(Ka#XJ4ykrtOTe z`dPO>cir#DCq8@pnB%AJ{QYN5U4Gx=iEWlU*h)Uy+uh~tU$v^q;K8%wj~}Mo-sUIA z$L`EB&9Z(?nD*@W_2KHXmlbZ(;QD>tp7{;Ow7+%vHf>M!%Qmb~|IvLSQ2M|;3Flww z7fR8HWpJOB6JyyCN*MW^kVU6*fcwDY|z7}u-uByICXjU@HwYp%am;MpJ& z=4`Yher95AYC~H_;_@&pzt86xy0tGUGN->eC%4vqjZp8Lw$QeU&*vESMDXrz4m6Ew zE%B*t{-qqEyQr&H3DiWxH?2d=6gh_glQW@A%^%U&S@}&pqF~^2^*cg}w8y m{CdTov!JS~xtz_OiHAYeHSZM5#k-$DMWm;zpUXO@geCy5ixO!7 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png deleted file mode 100644 index 3c4dbe028d995ffc054270095c675247d4e701f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2122 zcmV-Q2(|Z#P)1A?jZJl1EEW~6qfl?k?p+&R;?fufW=a%Xbh!xThTSK*(_MzSo~_vT2!dQJ^1g>*IMekXr6KgdAFcWQxA>p7T+6n~Ta5c|huS1BGK!0fHLhGpw_P=GbuN8eQSJB& z$knl-)7V4fJUzWYn?u-j=DX4~M9Ic4+mI2{0ODge5H@i2^QN{P{e>ew9`D21*%3x#{i>UuBLLbgvI+nqV>}o)htmPS-;Jhl5Cem~=<1DN zB=#8FyK6XnmJl!#*pQPSoouNm;_)dQ9wo7VxFGpL4;cTVsr?n-#^E*=i8Wi5<{V-KmpJu53Hs53jix>JT7#0 zMGzhA!v!bT>&ay-3h9=JgRvfb z_vQ%i-=8ABI4NkWNCzhaqTx z*o^Vh%ZlJVbrdbv5C2-;}QafB8k)2`*?o5jq{6BF?xz% zqgPV8U3hVbm#+>ag*Pcihj{<#d;I$AXZ-TZPx$Gt=Xn3)Dc*_kNM{(qCLe~zqG)bw!1)g^ z1mwEBA-;G(v%mnL9I&TuKBrSsrBbeAZ#6nPo6$emAxi4utE)jnW1ZHCO4kE;eQtyr z>QLX{M`cw7y#5;agSBXs@9mK$0pLfA9HzOYUWgq=t*mFN^ROlWa)1ws6acFhit>sQ zQRYT-YecZdK-$LgTBeg+EZMplH}HAc7%T8}LX7d}wK}7h+c; zAaj9`Pwxj_PPD06KqB~jRpuo`l9ZG>^&})?-#~}dg`g_nY1!5aIEqie5CFk(ZBsa) z#ub2oY-|f)YkHkklg3Hc;5pJO6=<%*bBtHY*f4JG!= zmX}v?NlH>z@0V*heVy%cZ~D7}HZ=hE$N7m4(dAOpy$X7TrZ=Muzq& z&H1;{Q+Nl1MR~}{&O+|3Y~<$Vpu6xkZb?5YD-(T|JlxBbzUau#%2ZvPrw|P52OlJ~ zsiinCFHci~9w5qZMe#S;sf`l?V8wY)jo%Ulxmg*iI4VYlta-SVlMVl!Z_#-7FA9i8 z799B~5HQ@6Bjaym{V9&GbJWNEYzcrrC+34hLvWdfGjhjsBgsWDRA30l2H6bbj6XTi z@-VFYXpmwQYzn|5^?=+Vhsqz6X@gImUn+a diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png deleted file mode 100644 index ea7b16ef42ea56d8a5ab17ebfed7b630d0910e40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1488 zcmV;>1uy!EP)q?frdgt#9v>*!+G!*aCq7g2AA)m3_mANZ)Kc zA0Z2e!_tq%V!IYaD5QK0Ia}9tG4^BQb4$2B*tpZ(-Hs!N4@!G@x9#d`L$TOWb6%{F zm$}mZ);)8|%ya52#j6kg(y&ruL*bof+##Z~w{irebFS zgg{lh29o_RmlYKoDKs)mJCgj=@f+d)w3tJ+Q zkh=0@OEF!Q0d=66(AdOq6#?@)kD0)sVre{dwpW5^%w^HoS|Y%hEMOtP0;-n*^Z5M4 z2o4`9Am38TNYBY`%M2(2oUy*a)8elPFs2aTG?+EeJ8%l!Jx6O3xH2MR1#tY-UILZt zOn}d5ZEq=;fH8#t-^;@8Eyy2Al>wQ65|LSyJRUyRTOJ>x`gZqp*7P5nI8zp-$^c`A zBSat?HTG!WecB!k@T;W=a0ZwJx0S}FVN>hMNA;~t?Pq|Krs0!<`UEs z;k%Z_N{F?5{uiOKmw?rEss~;#Bekw|6#>=&|B$F9Li7FKFM4ymtw=H!W6CXHA+)#W z%HM)ocfH=#t0y>fHrN=8F@-=R5~&hl<(1j*q1o?UuoAM$0Aun6ke5*XBr_|wR-Kt( zy_;eNG-pRjz?ggsxCCYbR&RP`sWrc>C??4rS%7PD32+AF8YZJ5=s_=neh;F$AKxx}@nYVKU!M8!_hty+EP0Vh z8A!$GTb_v_mobn@hSAty;O7k=e*2nyH~jc@-H%tx9_&2yBTH*>BY-6BY0gB^kcuE3 z*YWaGFLoYjn7d%d>_s;|x#fZ_n~s7>1biBH2z+Bs!@u7L@Xre(u&pCY;A}Bs%|vny zQM5Lt@Yjxxx32Ax-}&(Nr4N5@?fMXC6O&CFNE3-vJcO-fH(osS;IX2C*rdcF2uqCB1vDvrK=7sTy|or-;Vil7w(MO;nAF=hoES~ zPo)V3ya@Tdm_7diZVwUJ0SE4mIWRqF$L$e2>4*Hhn)vJF8zBN=>fbu+z_n5KapCr; z6IX{ExIsAVXM}tbq-}A^i3O_1>a-L0=up-}EF7dreAJer;rh=KxtWU&Jih6|>ZB7Z zlhj^wi$5R4#=d+wM>l`Lg$LyK;EDr_lq0ilDNRI>hz12{?S>2M^BOj0 qJa|OfdU{uro5bfci7e@f%laSqfBY!|(oJmu0000z diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png deleted file mode 100644 index cdf498a6d9316db4c6b5e240d93cdc891a980735..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2247 zcmV;&2srnNP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER000DDNkl$`v4AtE6#))HMd-)KGyC|yQ z|NkLA1S+s38;Hkq@t(TX?r{yp)^4(BYWk8|QmbEI$zrh>1e7F+{==ZvP|ovAx~`|l zh_Wmdl|+KB_|w2|+g8h2mPykz!km<*5CpYtCuS#S!^Oo)y0(`rPr>XZM?T_?&v_ng2@)wo_Q zHRk|>ck^YXjj!K6m#5F31k>l6m7JeH3iUVdU&^yr7yJ6V7bAJ{pTB+@`0GDcvcXR} zJ}ot8lsR}EZr{6kR}PY{bEW0^nHFY8rIh$j7AIOKUh2D6jISU7C)8bcSu7V?s%90Y zsFV484j?!j&?fbyMNx|3Ck3!b9y3~IQXW-O76q{3z{HL*HT4*zR?ob#>Zp*}@l3iN za(=9|sSZ$4??5ZPN4rHJHWHVKlV;cAccI#T-^Oeysxgj=GKcd;SPc|5o4GENd_1DA z>7?E@Bc-DX^dDnHz1MOO5EbpQf?`TB=UJ9`2qMbfCUB7GDxk0;5_wj*Q2+J$tLm^R zv3j%JNioahi|5}V0`+bu#_zF|Nyg_MF<^;af4vD)z@p>=RBFIDoiVd?LZNk1gj8b=?>0BPo zu~$c7rLdAI11}f=gQKGp+C~}cYx2H3Gs;k2%dn{tU}X}76AD~U7$MK|V`qYKRl1LA zEMsNb42O{_wj?%;atN{UEw_=PZc540i1<;eLsO2L4)!Gm+(m-5@s=FqB4eS=7c8Vx z?aKQ}U)scs;Ec#~9KUWeibrcFqvaz5Q%dRlL_3`b5sC(AHg(PLxFne%*J|vHDyDM# zAv+4SDMn5mhd&zj(e+N!CU@bSNNjQXDNzA-tFrQFofr}2xY?AIJFr~GC^cuS$#fu( zr;9ejR&27&|LI{=e~ZqLSivvK$4eJ&6VoY3lksRC@=j>eY`5u@7m`3eTy`U}JKnwC z3B57i2Xr6cD(HuCIPC&rj@|2>kV*%4Ui1T;AP@q109gb=`$6G9-3ehMwyCGUAqM`B zJE7T}#K42z34ya1cgfk=*|6Cx)94GoT+u*G>^$6v%nQC{i*gr)7&Eu3h zfPq9leZqA)B7%fFB&ooQD5mXp>#kCG*YT-U*NxoX-sE)4@7_0W002ovPDHLkV1n3YLG1tl diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png deleted file mode 100644 index 90b8520fc98188ef105ec1b3dcee2470732773d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1422 zcmbVMZ%i9y7{85)WHO!EWPq7ojz!ea-d(TP(t|>1uN`%^)ItNsOg!4RaD(1;cLy!R zgbC^-IQ9Ymg2o788rYyF3v*5!uw}R?0)|00l9fo7;Mk~=s1q1?1&V$k``{&a@AJOz z^ZPyjufc9RxNB$fP6&c_S#oKIyuy(;ZoB+lPQ2SLFG-TANXq9ulAjR(l;h@00BrFx zrN99gclFV$AQOUOIJTfjDzd&vxp=RViRdT;UZ0GHpv>%mk8za)2`&MpET>1p7cL?& z>((QMq!qLJjG&Cotr0+ejjg~{Q|{8ak?bruGeF4%ULY}Wz+1tIR6vic@lvuJIYtq9 zO+_l#BkN8TS?#cq7XVBuH3}DwV z?V%jBdBc{x(<5b)b1B?&Fl^E*vM&er279|Jx*NrW;#e!-d zKpjBjD+QNa4^K)IEa&dQh9ZixH&mX$%0*!+Xx>%n1)OA|^@x0CfEx{@T0`fg z8%!nwm%~?S4JNb3Kp2d)kszZSTVb^XLC{)5x*0c{aoj}eFtgcgq)9VIn+Y7FqgV?k zN(|=$QM;^ccLS?^AeJ%;fRT8ifafcs9bhlxC0;D!eX!BER&n^*LY8y$e(||TiPj^g zfxuP)w^`u5@LG;3b_*YXTBE`-jYpC0(lQD)u1=RFqD0{$3EAlawJoRN znH}|y6lOu;Rom^skAn8ySp2D%(-Lf1pXIgAtsGd$bYvaBG%(utYEP)O+1XW$G=m4P_>3QZEDYCSM$>Sn=5~eKpAx%X@_QTWo@wDq#r1zn{GgV zUQYZuyMAbfnVlY3&PaXl_?5h=Ud`ku@VRBeE+s!XTiA7NM~`{0YD8>As)V0}^YMew zA%;9qzx006L}6^%I|)@sI(|{F#s|Mf_7lD<^LNG;FFil@JzE6c)rRBy8?Oa35}obN z+#x@2uYI%AG`@R&C>**E>3cm+a`D57uHeU~f5(PmmX366Z(lsNXO!2p9@}pfpJ?FK zkB!dRZgpPodTC#0JA3BozSXh(xk_hf&-6nXF*jRY`MfQzn)>u~Pxs`Ug&yf!I2&86 z+?U$e7FX0b-ZXW0B4Pfo3&UhKdHZbbSEc8sti`o&EKCP7TV4oVO`g1GIn%S!AKUqb dHc{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUIPmg17k}A6E{~^CqqM5U@Vvz zyBZt2n7Fz)npwCR!t{FP6_+IDC8xsd%>>#D)oYAbua$FAYGO%#QAmD%4lD%(WaO9R z7iZ)bC^$QVV_ZQaJTosPzr0uz6h#mpyQCInmZhe+73JqDfWz1-6N?+nO^p&04bseX zO;Sx#bd$|ZOmr=cjZJh-O_Pi*lT6dn%u^GUp!!qD2|InDgY-d(1S!$Lgn%g##Dr%7 zAP1g_QuBa0rwEuu7!S(nFfcIg_H=O!skn7y+UdR~2LV^dW6uv|7}T}=|L;GeLt3a( z%SW|6WSzn7w5-CFBD{BQ$MQeA{Z`C1Q091B>~%@L!wEA~Iv-|jE&5Yq*C$c9=Kb%J zzdrH?Cj2(seEMrusjS9<`1RM@-hZz?Bp5Ha@0Gn=zpKcW+}H8vKHvFJVkIfZ$8Ilr zC1Lj2V-uDKG(TFkil=*#fzRbD^Lf`h+?4HiKYaalYQ*)e#n*E*PhX16j%(c0xcl); z*6;)Kl79caw;@yNQueHin;!p25r4h$ZQ1LO8^fBk9~_E19J2GV@by=&?B&m=u9+$l z$7t#NY*Ts7e5o}5lL93Nx~I-czH`;0u7cGdRPR=9!out=w`-p6e&JyF>ag|&t0%K( zDMmfdl1g8CPDp8w@gAmce(JNHHDnz+CTBT2^}|)ExK*>Wz8;D_&n(}!>%GY2y7?yz%?* zyVlzEq6Js9u6kXQJwEUJa{p&b(>Bff@w4We^q=P${|wIQz8dzopr0HsG1%K!iX diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png deleted file mode 100644 index fcce7ffd4b3ec486cd86b213e7f9e493be3712e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2125 zcmV-T2(tHyP)Dh7$?}lV8>OND$h)2Dpje< zL;lOW%paPkZ_YW=y~sc+kMr-9S6-v!Hc z1g%ypeWTHsg8|jm${fAu)@U>Wp2uLlS-VeAz#YHej&^sewC-H%^V#5Xwfv!6;IxP= zyWVXy+90gY zJVHVUXf)NrMp0_eYwtm?*C4(T{Ys|ORttCy{`>R2mi0Y2HaH0`vB{ek0v?Y|CMw9^ zr2_WAAI1vND_5?4`5Zo6yXo-A)%t+#ze08NHS?D%el|rOf^Q4ab{=N=v467z~2nn zH9XEIz&3>dyMg1O7?+YFqsM1ytgg-@5nn_qxr}r=ik;mA_V-iRJ6J>Xd6`TCyE`dt@1}5ezKfI79lW{NRS7Z)EqRD-3IP^6sS4P54edxzI~y44 z!NTG+=H|z-v@(me^;Kjx6Ub~OvA37P>FG8p-$G_Ph26b%q|!00#^=TO`yb8(C+GWU zvOdT7^bjsDk1-h;7TxSQCcrkeIwHW#I364~qsa(|!vde*g^|%g^bLkE5qXKNoi!XD zq=?K6HfZO^XPe@QSZof5$7$>xZVS%^H=*0W?$B3=IB5y88 z$k>*e1AJj@dj!~cg0Q(ASB-CO#mMbjxO{hlzyI?iM#lPuzzh-W?GI8;tP$B6=yV#% z1GdTG7Y`^&$eG{ptPY``4vdWrVPY~YthY%yhhTeu4XIR=aw3N4>YNzfC-?8}Cn*F` zBCw6C59i{3CgBb`$mkd@zCXgj(H7=jMNqA&5&~?KH!Mf-Edd=`TAR_^7eaV+2vd~V zyxWaTl-#~7S-(xYUQfpnrKDR;E(ih6fvxQXj*d6+@#CeM0|Ub$j7A3V-MeGl+*}|Q zou#;I#1`8W5Acnogg{U3X>589f6$Hofe_{wr;yrsjnw)I8P5_(Z^mfn8-m5f2$EEK zNs=FsanAm?mnXQsev8kaFA?nVAUxiK>rZcqXokW%rV>!kf&3)o_;3iix&xS=4r5^{ zf@La0CJ{}(LM%Rqjg6S#&3Ai5B7>#Z(-Z;@MH&}x_i%K&g{$ieGI{}**G47XMR{?E z^Edlc!W$B1CLpITAH^I3)dS=bON$wuAurW!7*kXYOUqM;%#L6!{TgEv{n*-Fr(GW6 z-PIY@_aSaRe~({({eoY9`3XP$^$IsXUf=^65B2)t^4T#q6-J=bgR37-h~zrGA#Ob& zRiF@%957^WK9flgv$-BEwkGuS1~5F@LrU6VZ)<_a+a~9Px%oM4b_?8|Hne*jFgG^9 z=4gS#Wrdf%cZGaJz=0rbCJ=0=#P-8V^SRV{vnm130e(ni3FzdYsBd^m$}9+UxG9mk zWj9VbADDontrfO5izu_vL1S;T!r`eDH>#HqC&|-Vlk9|(acHE6&IOk!;N5a-C2|ZqkzoQ%j_3OPPBAV7h@`jE ziK+P!8ry}i+y}HtCcrj@fKI2oy^eFIp~ccDN`f8ay1oEh?ODa*ZZF+r-YgNjy+z!f z-JMOm#>SXX8+pa$v1ie4&)uYY^}1%8TmW(s%9AX2*E8hGC8$@cQ7>#2C5Bwfmsicx zEV5Vc?KPY~PoG~Dva8QhW9Uhs(iUJ|ODDMyV zioqA-gM#777b*z`lNcQBS4p)|KJbf(J#eoKSwU%05ef?n2?dzcK0#qYf%F-HipLnJ zF2ks{93{m?D1B6n($W(2S3kxh>K7FiVn|bt%2Mi+j^d(1(ZzBGlQB1${(ro09T+8Q0@Yr;G|QnZ=idM zxX&?HT+jWx?&n-$8SCTq+%f_FIZ+=Z5`tVAF3=s%3pu%%3@cE;V{+{LkdgYfK%c+F; z{m=NbHQKy?3kHuF>;e8YtE;QM{Wbf4{G8?pX!3rovoM)V(i#i~)YsRep`k$q&*$vr zld`q7m0a7DePoc_ASY;cy`n=I^AAwIo@Pt4ZXD;k-H00000NkvXXu0mjf DA~^rD diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png deleted file mode 100644 index 92cdb2c9d5ec490cbd645ffe6ca1634be14fb7bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1506 zcmV<81s(c{P)3WQ6%-XwP~4&gLU-HwwoO6bIGs~U97avab?e5e4ef^!Ud&U!uM!}(~Dq^v?w1wY>Y0`JB zAmS1{ZW<z2*_a)rWAz5K$8nx~{#~uyL4#5Qvjp%!UWG#4$-a zJu!rVp%c!cTxUDlbBCS&naL3ho$7P?;}?dD@_Byv^hu|Gv@3^B3jWrtcEMsyE-5LX zqdC`8L||lWP&Pc=-X{INlRfA;PBOMON&oD{QR;U&^9)#+Zxd)cd{Fu)27BoMhtS;I zNCY|si!s?3o>VF&b>%@LalA+Yd&5#f6H}*(2$arqp9vhv<@=*&2ILU+4Ot?P%PY{) zCk7S*Y@liil=ja}jiKXcJDOYaiu9i7c2&S8z={oyoRoZ<0AmUP&BX%)!~N*)Jyw~( zWLn#uNg4FY6EG2aRNx1IPqy6P22h`=`zhIQ=73-|pVd ziun^$ryWz;3NWUjn@k{4=7IMaWgg&H%OOAtFbQc3f=k2U%-cEkw@cV-Vn(Y31M9q( zT>`@7m(s&m!8V}-S_o1?LWq)5C!-b$teMCq-sr70p5i~Q7K*Wi{62KO}J0J z%M9w`qrx0V0m9@rNPZ2gn(!UV;%3B3Ikp0F3(5$%T&HT_RTZglt&0e-2l$UfB@>q2 z|9wth<_{N=jK!F83)lz;+H%fsLB+dXfB0oW`b33N-3cdb)*D@DSt?~1Z4zV-t;2Lt9hd!%v4Xscc6$s z;X|}!`0Y@$+T`zkN-)n^F9_5yh*O z5OyC%k)^q$sUl5lnlcvZY7EpSHN5;ZjNL~H7S4Mye<6rZZU*4V)>>c^YDB>BAhsSwWYZr%4&$d)1+VFJ&6LXrYN$)fi5oKcwZCtvc=b4n9m;vW z9LA-7FYa9oP_D@en0Pqj#q^*b&mSoGYAJ*#vq4gYCAV;Zu!r)|i+4LwR9E z@-@meh=5MtH_!NRb)0hoxHay_l~EtA6AtH@@rWGKvpnO+64hgE){nciDf=Oz$LJ&x zYV)Vz`p*-&xeGo#z7fFMv>&U})LsorK5xXqxx6`_Zt;8o_bKoGWgnJF?uAJOYu5sj z!{C;t(zi+qOa<}edJx;o5u`}sbRxdjYLb*qn^?b*mwNS@AJ0AtVEdke_1i(oNhdWS zYq6v$11T#eKP)a4ShB+CvDbsu)Dm1Ldc-LsNh z+uhw2utuXHn#~qH^>z@3vfb3IMTY(`2!-$a(jpPJ+hkE3i>Bw%oG^@NZO`+`@D2>? zqJKwP4UOLPS{#q(*)yHdvo~IfqjXx>Pd2*9`lKb}S+0-G?&Gz9T?120*lEOMzVB6P zi~|xxpe4fvHt6)?3!3!&ekWFUSL&s7G7_V7sQlMo5901=sr>Ih?~VBwzkj|_{`oW& z6KQCB(TK2siImC+_@bN64FV4@x3u7JG$4O@GZ*tq8OD=@{I}na(x0kv0P6FZz+l)X z|LS%jKj2h!yT_8igs^}KUDWpW_9(CD4B|^80=%G2=>6l#AYhNf2Z6IR^B-SV^bvl90M0VUTg9tAH32pa|eZQYnxNHN2!0;4>tQR66Dx`@mKaZpn8}pbj1Bb5sN* zCiWmY4NFD%$+WnHSTu(tKvj?<;3%gu@Y0ABl(j(s8o))ONQAli-}3c2eK<%03z$>| z5W?3%s?LJKS}!TRGQs7dAq`l-BmzMY7$Ve5X4^)yZC`K-c^v^@q5$YLe;gskXL3M3|7NRR@ZK;?&#i-5inRedK^DUdrM?F03C-6+GV?}VxfWCYfy;YI`Y zt+