From bfb17d45f657749da7683cfe0b74b9a5139ab177 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 23 Mar 2016 08:52:03 -0400 Subject: [PATCH] Reorganized assets --- .../client/render/MekanismRenderer.java | 48 ++++++++--------- .../mekanism/common/block/BlockBasic.java | 16 +++--- .../mekanism/common/block/BlockMachine.java | 51 +++++++++--------- .../textures/blocks/Chlorine.png.mcmeta | 5 -- .../textures/blocks/InductionCasing.png | Bin 1149 -> 0 bytes .../textures/blocks/InductionCellAdvanced.png | Bin 1582 -> 0 bytes .../textures/blocks/InductionCellBasic.png | Bin 1584 -> 0 bytes .../textures/blocks/InductionCellElite.png | Bin 1603 -> 0 bytes .../textures/blocks/InductionCellUltimate.png | Bin 1606 -> 0 bytes .../textures/blocks/InductionPortInput.png | Bin 1388 -> 0 bytes .../textures/blocks/InductionPortOutput.png | Bin 1386 -> 0 bytes .../blocks/InductionProviderAdvanced.png | Bin 2082 -> 0 bytes .../blocks/InductionProviderBasic.png | Bin 2080 -> 0 bytes .../blocks/InductionProviderElite.png | Bin 2075 -> 0 bytes .../blocks/InductionProviderUltimate.png | Bin 2083 -> 0 bytes .../blocks/{ => bin}/BinAdvancedFront.png | Bin .../blocks/{ => bin}/BinAdvancedFrontOn.png | Bin .../blocks/{ => bin}/BinAdvancedSide.png | Bin .../blocks/{ => bin}/BinAdvancedTop.png | Bin .../blocks/{ => bin}/BinAdvancedTopOn.png | Bin .../blocks/{ => bin}/BinBasicFront.png | Bin .../blocks/{ => bin}/BinBasicFrontOn.png | Bin .../blocks/{ => bin}/BinBasicSide.png | Bin .../textures/blocks/{ => bin}/BinBasicTop.png | Bin .../blocks/{ => bin}/BinBasicTopOn.png | Bin .../blocks/{ => bin}/BinEliteFront.png | Bin .../blocks/{ => bin}/BinEliteFrontOn.png | Bin .../blocks/{ => bin}/BinEliteSide.png | Bin .../textures/blocks/{ => bin}/BinEliteTop.png | Bin .../blocks/{ => bin}/BinEliteTopOn.png | Bin .../blocks/{ => bin}/BinUltimateFront.png | Bin .../blocks/{ => bin}/BinUltimateFrontOn.png | Bin .../blocks/{ => bin}/BinUltimateSide.png | Bin .../blocks/{ => bin}/BinUltimateTop.png | Bin .../blocks/{ => bin}/BinUltimateTopOn.png | Bin .../ChemicalInjectionChamberFront.png | Bin .../ChemicalInjectionChamberFrontOn.png | Bin ...ChemicalInjectionChamberFrontOn.png.mcmeta | 0 .../blocks/{ => combiner}/CombinerFront.png | Bin .../blocks/{ => combiner}/CombinerFrontOn.png | Bin .../{ => combiner}/CombinerFrontOn.png.mcmeta | 0 .../blocks/{ => crusher}/CrusherFront.png | Bin .../blocks/{ => crusher}/CrusherFrontOn.png | Bin .../{ => crusher}/CrusherFrontOn.png.mcmeta | 0 .../EnergizedSmelterFront.png | Bin .../EnergizedSmelterFrontOn.png | Bin .../EnergizedSmelterFrontOn.png.mcmeta | 0 .../EnrichmentChamberFront.png | Bin .../EnrichmentChamberFrontOn.png | Bin .../AdvancedCombiningFactoryFront.png | Bin .../AdvancedCombiningFactoryFrontOn.png | Bin ...AdvancedCombiningFactoryFrontOn.png.mcmeta | 0 .../AdvancedCompressingFactoryFront.png | Bin .../AdvancedCompressingFactoryFrontOn.png | Bin ...vancedCompressingFactoryFrontOn.png.mcmeta | 0 .../AdvancedCrushingFactoryFront.png | Bin .../AdvancedCrushingFactoryFrontOn.png | Bin .../AdvancedCrushingFactoryFrontOn.png.mcmeta | 0 .../AdvancedEnrichingFactoryFront.png | Bin .../AdvancedEnrichingFactoryFrontOn.png | Bin .../advanced}/AdvancedFactoryBottom.png | Bin .../advanced}/AdvancedFactoryFront.png | Bin .../advanced}/AdvancedFactorySide.png | Bin .../advanced}/AdvancedFactoryTop.png | Bin .../AdvancedInjectingFactoryFront.png | Bin .../AdvancedInjectingFactoryFrontOn.png | Bin .../AdvancedPurifyingFactoryFront.png | Bin .../AdvancedPurifyingFactoryFrontOn.png | Bin .../AdvancedSmeltingFactoryFront.png | Bin .../AdvancedSmeltingFactoryFrontOn.png | Bin .../AdvancedSmeltingFactoryFrontOn.png.mcmeta | 0 .../basic}/BasicCombiningFactoryFront.png | Bin .../basic}/BasicCombiningFactoryFrontOn.png | Bin .../BasicCombiningFactoryFrontOn.png.mcmeta | 0 .../basic}/BasicCompressingFactoryFront.png | Bin .../basic}/BasicCompressingFactoryFrontOn.png | Bin .../BasicCompressingFactoryFrontOn.png.mcmeta | 0 .../basic}/BasicCrushingFactoryFront.png | Bin .../basic}/BasicCrushingFactoryFrontOn.png | Bin .../BasicCrushingFactoryFrontOn.png.mcmeta | 0 .../basic}/BasicEnrichingFactoryFront.png | Bin .../basic}/BasicEnrichingFactoryFrontOn.png | Bin .../basic}/BasicFactoryBottom.png | Bin .../{ => factory/basic}/BasicFactoryFront.png | Bin .../{ => factory/basic}/BasicFactorySide.png | Bin .../{ => factory/basic}/BasicFactoryTop.png | Bin .../basic}/BasicInjectingFactoryFront.png | Bin .../basic}/BasicInjectingFactoryFrontOn.png | Bin .../basic}/BasicPurifyingFactoryFront.png | Bin .../basic}/BasicPurifyingFactoryFrontOn.png | Bin .../basic}/BasicSmeltingFactoryFront.png | Bin .../basic}/BasicSmeltingFactoryFrontOn.png | Bin .../BasicSmeltingFactoryFrontOn.png.mcmeta | 0 .../elite}/EliteCombiningFactoryFront.png | Bin .../elite}/EliteCombiningFactoryFrontOn.png | Bin .../EliteCombiningFactoryFrontOn.png.mcmeta | 0 .../elite}/EliteCompressingFactoryFront.png | Bin .../elite}/EliteCompressingFactoryFrontOn.png | Bin .../EliteCompressingFactoryFrontOn.png.mcmeta | 0 .../elite}/EliteCrushingFactoryFront.png | Bin .../elite}/EliteCrushingFactoryFrontOn.png | Bin .../EliteCrushingFactoryFrontOn.png.mcmeta | 0 .../elite}/EliteEnrichingFactoryFront.png | Bin .../elite}/EliteEnrichingFactoryFrontOn.png | Bin .../elite}/EliteFactoryBottom.png | Bin .../{ => factory/elite}/EliteFactoryFront.png | Bin .../{ => factory/elite}/EliteFactorySide.png | Bin .../{ => factory/elite}/EliteFactoryTop.png | Bin .../elite}/EliteInjectingFactoryFront.png | Bin .../elite}/EliteInjectingFactoryFrontOn.png | Bin .../elite}/ElitePurifyingFactoryFront.png | Bin .../elite}/ElitePurifyingFactoryFrontOn.png | Bin .../elite}/EliteSmeltingFactoryFront.png | Bin .../elite}/EliteSmeltingFactoryFrontOn.png | Bin .../EliteSmeltingFactoryFrontOn.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidBrine.png | Bin .../{ => liquid}/LiquidBrine.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidChlorine.png | Bin .../{ => liquid}/LiquidChlorine.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidCleanOre.png | Bin .../{ => liquid}/LiquidCleanOre.png.mcmeta | 0 .../textures/blocks/{ => liquid}/LiquidDT.png | Bin .../blocks/{ => liquid}/LiquidDT.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidDeuterium.png | Bin .../{ => liquid}/LiquidDeuterium.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidEnergy.png | Bin .../{ => liquid}/LiquidEnergy.png.mcmeta | 0 .../{ => liquid}/LiquidEnergyStatic.png | Bin .../blocks/{ => liquid}/LiquidEthene.png | Bin .../{ => liquid}/LiquidEthene.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidHeat.png | Bin .../blocks/{ => liquid}/LiquidHeat.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidHeavyWater.png | Bin .../{ => liquid}/LiquidHeavyWater.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidHydrogen.png | Bin .../{ => liquid}/LiquidHydrogen.png.mcmeta | 0 .../{ => liquid}/LiquidHydrogenChloride.png | Bin .../LiquidHydrogenChloride.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidLithium.png | Bin .../{ => liquid}/LiquidLithium.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidOre.png | Bin .../blocks/{ => liquid}/LiquidOre.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidOsmium.png | Bin .../{ => liquid}/LiquidOsmium.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidOxygen.png | Bin .../{ => liquid}/LiquidOxygen.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidSodium.png | Bin .../{ => liquid}/LiquidSodium.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidSteam.png | Bin .../{ => liquid}/LiquidSteam.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidStone.png | Bin .../{ => liquid}/LiquidStone.png.mcmeta | 0 .../{ => liquid}/LiquidSulfurDioxide.png | Bin .../LiquidSulfurDioxide.png.mcmeta | 0 .../{ => liquid}/LiquidSulfurTrioxide.png | Bin .../LiquidSulfurTrioxide.png.mcmeta | 0 .../{ => liquid}/LiquidSulfuricAcid.png | Bin .../LiquidSulfuricAcid.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidTritium.png | Bin .../{ => liquid}/LiquidTritium.png.mcmeta | 0 .../OredictionificatorBack.png | Bin .../OredictionificatorFront.png | Bin .../OredictionificatorLeft.png | Bin .../OredictionificatorRight.png | Bin .../OredictionificatorSide.png | Bin .../OsmiumCompressorFront.png | Bin .../OsmiumCompressorFrontOn.png | Bin .../OsmiumCompressorFrontOn.png.mcmeta | 0 .../PrecisionSawmillFront.png | Bin .../PrecisionSawmillFrontOn.png | Bin .../PrecisionSawmillFrontOn.png.mcmeta | 0 .../PurificationChamberFront.png | Bin .../PurificationChamberFrontOn.png | Bin .../PurificationChamberFrontOn.png.mcmeta | 0 174 files changed, 59 insertions(+), 61 deletions(-) delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/Chlorine.png.mcmeta delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionCasing.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionCellAdvanced.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionCellBasic.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionCellElite.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionCellUltimate.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionPortInput.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionPortOutput.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionProviderAdvanced.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionProviderBasic.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionProviderElite.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionProviderUltimate.png rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinAdvancedFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinAdvancedFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinAdvancedSide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinAdvancedTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinAdvancedTopOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinBasicFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinBasicFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinBasicSide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinBasicTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinBasicTopOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinEliteFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinEliteFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinEliteSide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinEliteTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinEliteTopOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinUltimateFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinUltimateFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinUltimateSide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinUltimateTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinUltimateTopOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => chemical_injection_chamber}/ChemicalInjectionChamberFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => chemical_injection_chamber}/ChemicalInjectionChamberFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => chemical_injection_chamber}/ChemicalInjectionChamberFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => combiner}/CombinerFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => combiner}/CombinerFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => combiner}/CombinerFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => crusher}/CrusherFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => crusher}/CrusherFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => crusher}/CrusherFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => energized_smelter}/EnergizedSmelterFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => energized_smelter}/EnergizedSmelterFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => energized_smelter}/EnergizedSmelterFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => enrichment_chamber}/EnrichmentChamberFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => enrichment_chamber}/EnrichmentChamberFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedFactoryBottom.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedFactorySide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedFactoryTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedPurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedPurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedSmeltingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicFactoryBottom.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicFactorySide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicFactoryTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicPurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicPurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicSmeltingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteFactoryBottom.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteFactorySide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteFactoryTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/ElitePurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/ElitePurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteSmeltingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidBrine.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidBrine.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidChlorine.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidChlorine.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidCleanOre.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidCleanOre.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidDT.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidDT.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidDeuterium.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidDeuterium.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidEnergy.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidEnergy.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidEnergyStatic.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidEthene.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidEthene.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHeat.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHeat.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHeavyWater.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHeavyWater.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHydrogen.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHydrogen.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHydrogenChloride.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHydrogenChloride.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidLithium.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidLithium.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOre.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOre.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOsmium.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOsmium.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOxygen.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOxygen.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSodium.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSodium.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSteam.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSteam.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidStone.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidStone.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfurDioxide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfurDioxide.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfurTrioxide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfurTrioxide.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfuricAcid.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfuricAcid.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidTritium.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidTritium.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => oredictionificator}/OredictionificatorBack.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => oredictionificator}/OredictionificatorFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => oredictionificator}/OredictionificatorLeft.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => oredictionificator}/OredictionificatorRight.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => oredictionificator}/OredictionificatorSide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => osmium_compressor}/OsmiumCompressorFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => osmium_compressor}/OsmiumCompressorFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => osmium_compressor}/OsmiumCompressorFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => precision_sawmill}/PrecisionSawmillFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => precision_sawmill}/PrecisionSawmillFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => precision_sawmill}/PrecisionSawmillFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => purification_chamber}/PurificationChamberFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => purification_chamber}/PurificationChamberFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => purification_chamber}/PurificationChamberFrontOn.png.mcmeta (100%) 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 0c77c335232e89a1a025d645166a0c88897051be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1149 zcmV-@1cLjCP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zMJP~R+(n@x`~h54CSXnawlK(c+Av2`V%{H_c)@y9eCMcom)IExuIbSSFoLbAM4;BjaU?>ELQd zmudRLyl;T-0pA10GMb%1NjBcOdEW-3;bgNUYp4#GDq8R1;CZjaqVZx1TY<$NOrVCAzJ^%m! 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 276f98c144ca4a01fb11a7f9dfc399bfdf60f898..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1584 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 B@4Wy3 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 b8dabeda9d6a4c782ee42aa226d3f7b2c98e1375..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1606 zcmV-M2D$l(P)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z-2#HeMsB(@!_PVbc`m?p$0WGKkvOoSBCT7J|4qaiRF0xZO2vnN09 zFz~SmGAKMV11tZ;@D@xH;`6Zx6EvPE2fX_AgyCM-O0Z#hpC&L&;wyl&K@4O*jBQYr z0ainZV0prSh2fjfGyLj4af0R9Bp4XpKYY)?rUp?CVuJuOAH@Fk0wND9DIq*ea=y-M z21W%1h5tfALYT5hB7g31G9)#HGQ5BPp5fD{Pe?MDOg=t720=kVhC>}U7#>KS!c>4H zVq#*#z#{Wehe72J{<`2C!vSzGgM8K;RD#>r)$@N?UfD=V&LcJXAlq& zU?4RL2D~65D-D3+92D$oK%axaEnrA6USMD#Ck+r)4uEYzBS02{f*k}vY;plvX#k&P zq^1F)LjY95fwE!v$$D^B133c31_4mk0|A&Es2~DmLt+5YX#ivx$Y4+*11sr3Y?wHR zMwSEdi75w&YLuS)bO2-?NkEKEhCzly1+N}Zqm-y9FyeCn8w4xcVLl_o$7?%Oa=^=h zQ3s5Mz-S173nF6jD@YBf{Rje}Rul*j;)508Awa!y00AuK*7+>T(f|Me07*qoM6N<$ Ef)ID>R{#J2 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 33d963e1109447fe243dcd66a36f4317866fbd07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1388 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 M07*qoM6N<$g3Tx19RL6T 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 9f5581eb05a2d6416b76e52d9c581d3ce64e6873..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2080 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 N002ovPDHLkV1nVK?gan< 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