From b3954b88ee2f54f868506ce14835bfd04aa3b2ce Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 23 Mar 2016 16:16:03 -0400 Subject: [PATCH] Further organized factory textures --- .../java/mekanism/common/block/BlockMachine.java | 6 +++--- .../AdvancedCombiningFactoryFront.png | Bin .../AdvancedCombiningFactoryFrontOn.png | Bin .../AdvancedCombiningFactoryFrontOn.png.mcmeta | 0 .../AdvancedCompressingFactoryFront.png | Bin .../AdvancedCompressingFactoryFrontOn.png | Bin .../AdvancedCompressingFactoryFrontOn.png.mcmeta | 0 .../{ => crushing}/AdvancedCrushingFactoryFront.png | Bin .../AdvancedCrushingFactoryFrontOn.png | Bin .../AdvancedCrushingFactoryFrontOn.png.mcmeta | 0 .../AdvancedEnrichingFactoryFront.png | Bin .../AdvancedEnrichingFactoryFrontOn.png | Bin .../AdvancedInjectingFactoryFront.png | Bin .../AdvancedInjectingFactoryFrontOn.png | Bin .../AdvancedPurifyingFactoryFront.png | Bin .../AdvancedPurifyingFactoryFrontOn.png | Bin .../{ => smelting}/AdvancedSmeltingFactoryFront.png | Bin .../AdvancedSmeltingFactoryFrontOn.png | Bin .../AdvancedSmeltingFactoryFrontOn.png.mcmeta | 0 .../{ => combining}/BasicCombiningFactoryFront.png | Bin .../BasicCombiningFactoryFrontOn.png | Bin .../BasicCombiningFactoryFrontOn.png.mcmeta | 0 .../BasicCompressingFactoryFront.png | Bin .../BasicCompressingFactoryFrontOn.png | Bin .../BasicCompressingFactoryFrontOn.png.mcmeta | 0 .../{ => crushing}/BasicCrushingFactoryFront.png | Bin .../{ => crushing}/BasicCrushingFactoryFrontOn.png | Bin .../BasicCrushingFactoryFrontOn.png.mcmeta | 0 .../{ => enriching}/BasicEnrichingFactoryFront.png | Bin .../BasicEnrichingFactoryFrontOn.png | Bin .../{ => injecting}/BasicInjectingFactoryFront.png | Bin .../BasicInjectingFactoryFrontOn.png | Bin .../{ => purifying}/BasicPurifyingFactoryFront.png | Bin .../BasicPurifyingFactoryFrontOn.png | Bin .../{ => smelting}/BasicSmeltingFactoryFront.png | Bin .../{ => smelting}/BasicSmeltingFactoryFrontOn.png | Bin .../BasicSmeltingFactoryFrontOn.png.mcmeta | 0 .../{ => combining}/EliteCombiningFactoryFront.png | Bin .../EliteCombiningFactoryFrontOn.png | Bin .../EliteCombiningFactoryFrontOn.png.mcmeta | 0 .../EliteCompressingFactoryFront.png | Bin .../EliteCompressingFactoryFrontOn.png | Bin .../EliteCompressingFactoryFrontOn.png.mcmeta | 0 .../{ => crushing}/EliteCrushingFactoryFront.png | Bin .../{ => crushing}/EliteCrushingFactoryFrontOn.png | Bin .../EliteCrushingFactoryFrontOn.png.mcmeta | 0 .../{ => enriching}/EliteEnrichingFactoryFront.png | Bin .../EliteEnrichingFactoryFrontOn.png | Bin .../{ => injecting}/EliteInjectingFactoryFront.png | Bin .../EliteInjectingFactoryFrontOn.png | Bin .../{ => purifying}/ElitePurifyingFactoryFront.png | Bin .../ElitePurifyingFactoryFrontOn.png | Bin .../{ => smelting}/EliteSmeltingFactoryFront.png | Bin .../{ => smelting}/EliteSmeltingFactoryFrontOn.png | Bin .../EliteSmeltingFactoryFrontOn.png.mcmeta | 0 55 files changed, 3 insertions(+), 3 deletions(-) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => combining}/AdvancedCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => combining}/AdvancedCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => combining}/AdvancedCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => compressing}/AdvancedCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => compressing}/AdvancedCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => compressing}/AdvancedCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => crushing}/AdvancedCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => crushing}/AdvancedCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => crushing}/AdvancedCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => enriching}/AdvancedEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => enriching}/AdvancedEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => injecting}/AdvancedInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => injecting}/AdvancedInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => purifying}/AdvancedPurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => purifying}/AdvancedPurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => smelting}/AdvancedSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => smelting}/AdvancedSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => smelting}/AdvancedSmeltingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => combining}/BasicCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => combining}/BasicCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => combining}/BasicCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => compressing}/BasicCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => compressing}/BasicCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => compressing}/BasicCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => crushing}/BasicCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => crushing}/BasicCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => crushing}/BasicCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => enriching}/BasicEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => enriching}/BasicEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => injecting}/BasicInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => injecting}/BasicInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => purifying}/BasicPurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => purifying}/BasicPurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => smelting}/BasicSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => smelting}/BasicSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => smelting}/BasicSmeltingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => combining}/EliteCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => combining}/EliteCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => combining}/EliteCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => compressing}/EliteCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => compressing}/EliteCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => compressing}/EliteCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => crushing}/EliteCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => crushing}/EliteCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => crushing}/EliteCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => enriching}/EliteEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => enriching}/EliteEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => injecting}/EliteInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => injecting}/EliteInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => purifying}/ElitePurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => purifying}/ElitePurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => smelting}/EliteSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => smelting}/EliteSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => smelting}/EliteSmeltingFactoryFrontOn.png.mcmeta (100%) diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index d079118cb..87b099687 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -198,17 +198,17 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo for(RecipeType type : RecipeType.values()) { - MekanismRenderer.loadDynamicTextures(register, "factory/basic/" + BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], + MekanismRenderer.loadDynamicTextures(register, "factory/basic/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryFront"), 2), DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryTop"), 1), DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryBottom"), 0), DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, "factory/advanced/" + BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], + MekanismRenderer.loadDynamicTextures(register, "factory/advanced/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryFront"), 2), DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryTop"), 1), DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryBottom"), 0), DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, "factory/elite/" + BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], + MekanismRenderer.loadDynamicTextures(register, "factory/elite/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryFront"), 2), DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryTop"), 1), DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryBottom"), 0), diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png.mcmeta