diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index bc21fd8f1..11c414d39 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -94,26 +94,26 @@ public class MekanismRenderer overlays.put(type, event.map.registerIcon("mekanism:overlay/" + type.getTransmission() + "Overlay")); } - energyIcon = event.map.registerIcon("mekanism:LiquidEnergy"); - heatIcon = event.map.registerIcon("mekanism:LiquidHeat"); + energyIcon = event.map.registerIcon("mekanism:liquid/LiquidEnergy"); + heatIcon = event.map.registerIcon("mekanism:liquid/LiquidHeat"); - GasRegistry.getGas("hydrogen").setIcon(event.map.registerIcon("mekanism:LiquidHydrogen")); - GasRegistry.getGas("oxygen").setIcon(event.map.registerIcon("mekanism:LiquidOxygen")); - GasRegistry.getGas("water").setIcon(event.map.registerIcon("mekanism:LiquidSteam")); - GasRegistry.getGas("chlorine").setIcon(event.map.registerIcon("mekanism:LiquidChlorine")); - GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map.registerIcon("mekanism:LiquidSulfurDioxide")); - GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map.registerIcon("mekanism:LiquidSulfurTrioxide")); - GasRegistry.getGas("sulfuricAcid").setIcon(event.map.registerIcon("mekanism:LiquidSulfuricAcid")); - GasRegistry.getGas("hydrogenChloride").setIcon(event.map.registerIcon("mekanism:LiquidHydrogenChloride")); - GasRegistry.getGas("liquidOsmium").setIcon(event.map.registerIcon("mekanism:LiquidOsmium")); - GasRegistry.getGas("liquidStone").setIcon(event.map.registerIcon("mekanism:LiquidStone")); - GasRegistry.getGas("ethene").setIcon(event.map.registerIcon("mekanism:LiquidEthene")); - GasRegistry.getGas("brine").setIcon(event.map.registerIcon("mekanism:LiquidBrine")); - GasRegistry.getGas("sodium").setIcon(event.map.registerIcon("mekanism:LiquidSodium")); - GasRegistry.getGas("deuterium").setIcon(event.map.registerIcon("mekanism:LiquidDeuterium")); - GasRegistry.getGas("tritium").setIcon(event.map.registerIcon("mekanism:LiquidTritium")); - GasRegistry.getGas("fusionFuelDT").setIcon(event.map.registerIcon("mekanism:LiquidDT")); - GasRegistry.getGas("lithium").setIcon(event.map.registerIcon("mekanism:LiquidLithium")); + GasRegistry.getGas("hydrogen").setIcon(event.map.registerIcon("mekanism:liquid/LiquidHydrogen")); + GasRegistry.getGas("oxygen").setIcon(event.map.registerIcon("mekanism:liquid/LiquidOxygen")); + GasRegistry.getGas("water").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSteam")); + GasRegistry.getGas("chlorine").setIcon(event.map.registerIcon("mekanism:liquid/LiquidChlorine")); + GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfurDioxide")); + GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfurTrioxide")); + GasRegistry.getGas("sulfuricAcid").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfuricAcid")); + GasRegistry.getGas("hydrogenChloride").setIcon(event.map.registerIcon("mekanism:liquid/LiquidHydrogenChloride")); + GasRegistry.getGas("liquidOsmium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidOsmium")); + GasRegistry.getGas("liquidStone").setIcon(event.map.registerIcon("mekanism:liquid/LiquidStone")); + GasRegistry.getGas("ethene").setIcon(event.map.registerIcon("mekanism:liquid/LiquidEthene")); + GasRegistry.getGas("brine").setIcon(event.map.registerIcon("mekanism:liquid/LiquidBrine")); + GasRegistry.getGas("sodium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSodium")); + GasRegistry.getGas("deuterium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidDeuterium")); + GasRegistry.getGas("tritium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidTritium")); + GasRegistry.getGas("fusionFuelDT").setIcon(event.map.registerIcon("mekanism:liquid/LiquidDT")); + GasRegistry.getGas("lithium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidLithium")); for(Gas gas : GasRegistry.getRegisteredGasses()) { @@ -121,17 +121,17 @@ public class MekanismRenderer { if(gas.getUnlocalizedName().contains("clean")) { - gas.setIcon(event.map.registerIcon("mekanism:LiquidCleanOre")); + gas.setIcon(event.map.registerIcon("mekanism:liquid/LiquidCleanOre")); } else { - gas.setIcon(event.map.registerIcon("mekanism:LiquidOre")); + gas.setIcon(event.map.registerIcon("mekanism:liquid/LiquidOre")); } } } - FluidRegistry.getFluid("brine").setIcons(event.map.registerIcon("mekanism:LiquidBrine")); - FluidRegistry.getFluid("heavywater").setIcons(event.map.registerIcon("mekanism:LiquidHeavyWater")); - FluidRegistry.getFluid("steam").setIcons(event.map.registerIcon("mekanism:LiquidSteam")); + FluidRegistry.getFluid("brine").setIcons(event.map.registerIcon("mekanism:liquid/LiquidBrine")); + FluidRegistry.getFluid("heavywater").setIcons(event.map.registerIcon("mekanism:liquid/LiquidHeavyWater")); + FluidRegistry.getFluid("steam").setIcons(event.map.registerIcon("mekanism:liquid/LiquidSteam")); for(InfuseType type : InfuseRegistry.getInfuseMap().values()) { diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index d85527227..53a04d7ce 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -188,14 +188,14 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon icons[5][0] = register.registerIcon("mekanism:SteelBlock"); icons[6][0] = register.registerIcon(ICON_BASE); - MekanismRenderer.loadDynamicTextures(register, "BinBasic", binIcons[0], DefIcon.getActivePair(register.registerIcon("mekanism:BinBasicSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:BinBasicTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "BinAdvanced", binIcons[1], DefIcon.getActivePair(register.registerIcon("mekanism:BinAdvancedSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:BinAdvancedTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "BinElite", binIcons[2], DefIcon.getActivePair(register.registerIcon("mekanism:BinEliteSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:BinEliteTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "BinUltimate", binIcons[3], DefIcon.getActivePair(register.registerIcon("mekanism:BinUltimateSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:BinUltimateTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinBasic", binIcons[0], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinBasicSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:bin/BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinBasicTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinAdvanced", binIcons[1], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinAdvancedSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinElite", binIcons[2], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinEliteSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:bin/BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinEliteTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinUltimate", binIcons[3], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinUltimateSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTopOn"), 6)); icons[7][0] = ctms[7][0].mainTextureData.icon; icons[8][0] = register.registerIcon("mekanism:SteelCasing"); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 43f1f5af4..86ff01927 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -191,44 +191,47 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo case MACHINE_BLOCK_1: ctms[11][0] = new CTMData("ctm/Teleporter", this, Arrays.asList(11)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock, Arrays.asList(7)).registerIcons(register); - MekanismRenderer.loadDynamicTextures(register, MachineType.ENRICHMENT_CHAMBER.name, icons[0], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.OSMIUM_COMPRESSOR.name, icons[1], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.COMBINER.name, icons[2], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.CRUSHER.name, icons[3], def); + MekanismRenderer.loadDynamicTextures(register, "enrichment_chamber/" + MachineType.ENRICHMENT_CHAMBER.name, icons[0], def); + MekanismRenderer.loadDynamicTextures(register, "osmium_compressor/" + MachineType.OSMIUM_COMPRESSOR.name, icons[1], def); + MekanismRenderer.loadDynamicTextures(register, "combiner/" + MachineType.COMBINER.name, icons[2], def); + MekanismRenderer.loadDynamicTextures(register, "crusher/" + MachineType.CRUSHER.name, icons[3], def); for(RecipeType type : RecipeType.values()) { - MekanismRenderer.loadDynamicTextures(register, BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactorySide"), 3, 4, 5)); + MekanismRenderer.loadDynamicTextures(register, "factory/basic/" + 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()], + 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()], + 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), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactorySide"), 3, 4, 5)); } - MekanismRenderer.loadDynamicTextures(register, MachineType.PURIFICATION_CHAMBER.name, icons[9], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.ENERGIZED_SMELTER.name, icons[10], def); + MekanismRenderer.loadDynamicTextures(register, "purification_chamber/" + MachineType.PURIFICATION_CHAMBER.name, icons[9], def); + MekanismRenderer.loadDynamicTextures(register, "energized_smelter/" + MachineType.ENERGIZED_SMELTER.name, icons[10], def); icons[11][0] = ctms[11][0].mainTextureData.icon; + break; case MACHINE_BLOCK_2: - MekanismRenderer.loadDynamicTextures(register, MachineType.CHEMICAL_INJECTION_CHAMBER.name, icons[3], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.PRECISION_SAWMILL.name, icons[5], def); + MekanismRenderer.loadDynamicTextures(register, "chemical_injection_chamber/" + MachineType.CHEMICAL_INJECTION_CHAMBER.name, icons[3], def); + MekanismRenderer.loadDynamicTextures(register, "precision_sawmill/" + MachineType.PRECISION_SAWMILL.name, icons[5], def); + break; case MACHINE_BLOCK_3: icons[0][0] = BASE_ICON; icons[2][0] = BASE_ICON; icons[4][0] = BASE_ICON; icons[5][0] = BASE_ICON; - MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:OredictionificatorSide"))); + MekanismRenderer.loadDynamicTextures(register, "oredictionificator/" + MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:oredictionificator/OredictionificatorSide"))); + break; } } diff --git a/src/main/resources/assets/mekanism/textures/blocks/Chlorine.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/Chlorine.png.mcmeta deleted file mode 100644 index 4b721e09a..000000000 --- a/src/main/resources/assets/mekanism/textures/blocks/Chlorine.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 2 - } -} diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCasing.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCasing.png deleted file mode 100644 index 0c77c3352..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionCasing.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCellAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCellAdvanced.png deleted file mode 100644 index b6f941b70..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionCellAdvanced.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCellBasic.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCellBasic.png deleted file mode 100644 index 276f98c14..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionCellBasic.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCellElite.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCellElite.png deleted file mode 100644 index de8df433f..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionCellElite.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCellUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCellUltimate.png deleted file mode 100644 index b8dabeda9..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionCellUltimate.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionPortInput.png b/src/main/resources/assets/mekanism/textures/blocks/InductionPortInput.png deleted file mode 100644 index 33d963e11..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionPortInput.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionPortOutput.png b/src/main/resources/assets/mekanism/textures/blocks/InductionPortOutput.png deleted file mode 100644 index ec37dfbca..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionPortOutput.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/InductionProviderAdvanced.png deleted file mode 100644 index 26e530be1..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderAdvanced.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderBasic.png b/src/main/resources/assets/mekanism/textures/blocks/InductionProviderBasic.png deleted file mode 100644 index 9f5581eb0..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderBasic.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderElite.png b/src/main/resources/assets/mekanism/textures/blocks/InductionProviderElite.png deleted file mode 100644 index c393d338f..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderElite.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/InductionProviderUltimate.png deleted file mode 100644 index 998d7ac71..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderUltimate.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedSide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedSide.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedSide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTop.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTopOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTopOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinBasicFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicSide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinBasicSide.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicSide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTopOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTopOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinEliteFront.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinEliteFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteSide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteSide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinEliteTop.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTopOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinEliteTopOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTopOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinUltimateFront.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateSide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateSide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinUltimateTop.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTopOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinUltimateTopOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTopOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFront.png rename to src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/CombinerFront.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CombinerFront.png rename to src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/CrusherFront.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CrusherFront.png rename to src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFront.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFront.png rename to src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFront.png rename to src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryBottom.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedFactorySide.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryTop.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicFactoryBottom.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicFactorySide.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicFactoryTop.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteFactoryBottom.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteFactorySide.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteFactoryTop.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEnergyStatic.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergyStatic.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEnergyStatic.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergyStatic.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorBack.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBack.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OredictionificatorBack.png rename to src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBack.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorFront.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OredictionificatorFront.png rename to src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorLeft.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorLeft.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OredictionificatorLeft.png rename to src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorLeft.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorRight.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorRight.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OredictionificatorRight.png rename to src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorRight.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorSide.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorSide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OredictionificatorSide.png rename to src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorSide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFront.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFront.png rename to src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFront.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFront.png rename to src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFront.png rename to src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png.mcmeta