From 3085115a42bb0635bcff82e83b532ca65ccbaea7 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sun, 8 Aug 2021 17:52:07 -0500 Subject: [PATCH] merge conflicts: eternal --- .../api/implementations/items/IAEWrench.java | 3 +- src/api/java/cofh/api/item/IToolHammer.java | 3 + .../enderio/api/tool/IConduitControl.java | 6 +- src/main/java/gregtech/GregTechMod.java | 10 +- src/main/java/gregtech/api/GTValues.java | 100 +- src/main/java/gregtech/api/GregTechAPI.java | 6 +- .../api/block/machines/BlockMachine.java | 26 +- .../api/block/machines/MachineItemBlock.java | 2 +- .../api/capability/IEnergyContainer.java | 4 +- .../capability/impl/AbstractRecipeLogic.java | 30 +- .../impl/EnergyContainerBatteryBuffer.java | 10 +- .../impl/EnergyContainerHandler.java | 2 +- .../capability/impl/EnergyContainerList.java | 16 +- .../api/capability/impl/FuelRecipeLogic.java | 11 +- .../impl/MultiblockRecipeLogic.java | 2 +- .../capability/impl/RecipeLogicEnergy.java | 2 +- .../api/capability/impl/RecipeLogicSteam.java | 14 +- .../RecipeMapSteamMultiblockController.java | 2 - .../SimpleThermalFluidHandlerItemStack.java | 2 +- .../capability/impl/SteamMultiWorkable.java | 14 +- .../impl/ThermalFluidHandlerItemStack.java | 2 +- .../impl/VoidFluidHandlerItemStack.java | 9 +- .../gregtech/api/cover/CoverBehavior.java | 4 +- .../java/gregtech/api/cover/ICoverable.java | 33 +- .../java/gregtech/api/gui/IScissored.java | 2 +- src/main/java/gregtech/api/gui/ModularUI.java | 8 +- src/main/java/gregtech/api/gui/Widget.java | 4 +- .../api/gui/impl/ModularUIContainer.java | 42 +- .../gregtech/api/gui/impl/ModularUIGui.java | 2 +- .../api/gui/impl/ModularUIGuiHandler.java | 8 +- .../gui/resources/AdoptableTextureArea.java | 12 +- .../api/gui/resources/SizedTextureArea.java | 12 +- .../api/gui/resources/TextureArea.java | 18 +- .../api/gui/widgets/AdvancedTextWidget.java | 11 +- .../api/gui/widgets/ClickButtonWidget.java | 4 +- .../api/gui/widgets/CycleButtonWidget.java | 9 +- .../gregtech/api/gui/widgets/LabelWidget.java | 2 +- .../api/gui/widgets/ProgressWidget.java | 10 +- .../api/gui/widgets/ScrollableListWidget.java | 14 +- .../api/gui/widgets/SimpleTextWidget.java | 4 +- .../api/gui/widgets/SliderWidget.java | 6 +- .../gregtech/api/gui/widgets/SlotWidget.java | 7 +- .../gregtech/api/gui/widgets/TankWidget.java | 10 +- .../api/gui/widgets/ToggleButtonWidget.java | 2 +- .../api/gui/widgets/WidgetUIAccess.java | 1 + .../tab/HorizontalTabListRenderer.java | 8 +- .../api/gui/widgets/tab/ItemTabInfo.java | 2 +- .../widgets/tab/VerticalTabListRenderer.java | 8 +- .../java/gregtech/api/items/IToolItem.java | 12 +- .../api/items/gui/PlayerInventoryHolder.java | 4 +- .../materialitem/MaterialSetModelGen.java | 26 +- .../items/materialitem/MetaPrefixItem.java | 16 +- .../api/items/metaitem/ElectricStats.java | 32 +- .../api/items/metaitem/FoodStats.java | 3 +- .../gregtech/api/items/metaitem/MetaItem.java | 38 +- .../items/metaitem/stats/IItemUseManager.java | 9 +- .../AbstractToolItemCapabilityProvider.java | 2 +- .../api/items/toolitem/IToolStats.java | 2 +- .../api/items/toolitem/ToolMetaItem.java | 26 +- .../items/toolitem/ToolMetaItemListener.java | 2 +- .../api/metatileentity/MetaTileEntity.java | 15 +- .../metatileentity/MetaTileEntityHolder.java | 12 +- .../SimpleGeneratorMetaTileEntity.java | 18 +- .../SimpleMachineMetaTileEntity.java | 22 +- .../metatileentity/SteamMetaTileEntity.java | 16 +- .../TickableTileEntityBase.java | 1 + .../metatileentity/TieredMetaTileEntity.java | 4 +- .../WorkableTieredMetaTileEntity.java | 2 +- .../multiblock/MultiblockControllerBase.java | 7 +- .../multiblock/MultiblockWithDisplayBase.java | 8 +- .../RecipeMapMultiblockController.java | 6 +- .../api/model/AbstractBlockModelFactory.java | 4 +- .../api/multiblock/FactoryBlockPattern.java | 4 +- .../java/gregtech/api/net/NetworkHandler.java | 150 +- .../java/gregtech/api/pipenet/PipeNet.java | 14 +- .../gregtech/api/pipenet/WorldPipeNet.java | 2 +- .../gregtech/api/pipenet/block/BlockPipe.java | 48 +- .../block/material/IMaterialPipeType.java | 1 + .../material/TileEntityMaterialPipeBase.java | 2 +- .../pipenet/block/simple/EmptyNodeData.java | 3 +- .../tickable/TickableWorldPipeNet.java | 10 +- .../tile/PipeCoverableImplementation.java | 14 +- .../api/pipenet/tile/TileEntityPipeBase.java | 22 +- .../api/recipes/CountableIngredient.java | 8 +- .../java/gregtech/api/recipes/FluidKey.java | 8 +- .../java/gregtech/api/recipes/ModHandler.java | 56 +- .../gregtech/api/recipes/RecipeBuilder.java | 22 +- .../java/gregtech/api/recipes/RecipeMap.java | 40 +- .../java/gregtech/api/recipes/RecipeMaps.java | 118 +- .../ChemicalReactorRecipeBuilder.java | 19 +- .../builders/CokeOvenRecipeBuilder.java | 2 +- .../recipes/builders/FusionRecipeBuilder.java | 6 +- .../recipes/builders/PBFRecipeBuilder.java | 2 +- .../UniversalDistillationRecipeBuilder.java | 2 +- .../api/recipes/crafttweaker/CTRecipe.java | 26 +- .../recipes/crafttweaker/CTRecipeBuilder.java | 28 +- .../recipes/crafttweaker/InputIngredient.java | 4 +- .../crafttweaker/MetaItemBracketHandler.java | 10 +- .../MetaTileEntityBracketHandler.java | 2 +- .../ingredients/IntCircuitIngredient.java | 4 +- .../recipes/ingredients/NBTIngredient.java | 4 +- .../api/recipes/machines/FuelRecipeMap.java | 4 +- .../machines/RecipeMapFormingPress.java | 10 +- .../recipes/machines/RecipeMapFurnace.java | 12 +- .../FusionEUToStartProperty.java | 4 +- .../ImplosionExplosiveProperty.java | 2 +- .../recipeproperties/RecipeProperty.java | 1 + .../RecipePropertyStorage.java | 5 +- .../api/render/MetaTileEntityRenderer.java | 4 +- .../api/render/MetaTileEntityTESR.java | 23 +- .../gregtech/api/render/SafeRenderer.java | 8 +- .../api/render/ToolRenderHandler.java | 14 +- .../java/gregtech/api/render/UVMirror.java | 6 +- .../api/render/scene/WorldSceneRenderer.java | 11 +- .../api/unification/OreDictUnifier.java | 10 +- .../crafttweaker/MaterialBracketHandler.java | 2 +- .../unification/material/MarkerMaterials.java | 2 +- .../api/unification/material/Material.java | 31 +- .../api/unification/material/Materials.java | 24 +- .../material/properties/BlastProperty.java | 2 +- .../material/properties/DustProperty.java | 4 +- .../properties/FluidPipeProperties.java | 2 +- .../material/properties/IngotProperty.java | 2 +- .../properties/MaterialProperties.java | 3 +- .../material/properties/OreProperty.java | 14 +- .../material/properties/ToolProperty.java | 8 +- .../material/properties/WireProperties.java | 4 +- .../material/properties/package-info.java | 4 +- .../api/unification/ore/OrePrefix.java | 11 +- .../api/unification/ore/StoneTypes.java | 52 +- .../util/AnnotatedMaterialHandlerLoader.java | 2 +- .../java/gregtech/api/util/BlockInfo.java | 2 +- .../java/gregtech/api/util/ClipboardUtil.java | 5 +- .../gregtech/api/util/DirectionHelper.java | 6 +- src/main/java/gregtech/api/util/DyeUtil.java | 4 +- .../java/gregtech/api/util/FileUtility.java | 5 +- .../gregtech/api/util/FluidTooltipUtil.java | 10 +- .../api/util/GTControlledRegistry.java | 2 +- .../java/gregtech/api/util/GTUtility.java | 66 +- src/main/java/gregtech/api/util/IntRange.java | 8 +- .../gregtech/api/util/InventoryUtils.java | 105 +- .../api/util/ItemStackHashStrategy.java | 32 +- .../java/gregtech/api/util/ItemStackKey.java | 8 +- .../gregtech/api/util/ModCompatibility.java | 4 +- src/main/java/gregtech/api/util/NBTUtil.java | 6 +- src/main/java/gregtech/api/util/Position.java | 8 +- .../gregtech/api/util/PositionedRect.java | 20 +- .../java/gregtech/api/util/Predicates.java | 10 +- .../java/gregtech/api/util/RenderUtil.java | 16 +- .../util/ShapedOreEnergyTransferRecipe.java | 16 +- src/main/java/gregtech/api/util/Size.java | 8 +- src/main/java/gregtech/api/util/SlotUtil.java | 2 +- .../java/gregtech/api/util/StreamUtils.java | 16 +- .../java/gregtech/api/util/TaskScheduler.java | 8 +- .../gregtech/api/util/TextFormattingUtil.java | 1 + src/main/java/gregtech/api/util/XSTR.java | 2 +- .../gregtech/api/util/world/DummyWorld.java | 2 +- .../api/worldgen/config/OreConfigUtils.java | 6 +- .../worldgen/config/OreDepositDefinition.java | 4 +- .../api/worldgen/config/WorldGenRegistry.java | 41 +- .../filler/BlacklistedBlockFiller.java | 4 +- .../worldgen/generator/CachedGridEntry.java | 14 +- .../generator/WorldGeneratorImpl.java | 4 +- .../populator/FluidSpringPopulator.java | 4 +- .../populator/SurfaceBlockPopulator.java | 19 +- .../populator/SurfaceRockPopulator.java | 25 +- .../java/gregtech/common/ClientProxy.java | 19 +- .../java/gregtech/common/CommonProxy.java | 26 +- .../java/gregtech/common/EventHandlers.java | 9 +- src/main/java/gregtech/common/MetaFluids.java | 6 +- .../common/asm/GTCELoadingPlugin.java | 4 +- .../java/gregtech/common/asm/JEIVisitor.java | 4 +- .../gregtech/common/asm/util/ObfMapping.java | 277 ++- .../common/asm/util/TargetClassVisitor.java | 6 +- .../common/blocks/BlockCompressed.java | 4 +- .../gregtech/common/blocks/BlockConcrete.java | 4 +- .../gregtech/common/blocks/BlockFrame.java | 4 +- .../gregtech/common/blocks/BlockGranite.java | 4 +- .../gregtech/common/blocks/BlockMineral.java | 4 +- .../java/gregtech/common/blocks/BlockOre.java | 5 +- .../gregtech/common/blocks/BlockWireCoil.java | 2 +- .../gregtech/common/blocks/MetaBlocks.java | 43 +- .../gregtech/common/blocks/OreItemBlock.java | 2 +- .../common/blocks/StoneItemBlock.java | 4 +- .../modelfactories/BakedModelHandler.java | 2 +- .../BlockCompressedFactory.java | 18 +- .../modelfactories/BlockFrameFactory.java | 4 +- .../modelfactories/BlockOreFactory.java | 36 +- .../blocks/properties/PropertyMaterial.java | 2 +- .../blocks/surfacerock/BlockSurfaceRock.java | 2 +- .../surfacerock/TileEntitySurfaceRock.java | 4 +- .../common/blocks/wood/BlockGregLeaves.java | 16 +- .../common/blocks/wood/BlockGregLog.java | 20 +- .../common/blocks/wood/BlockGregSapling.java | 14 +- .../common/command/util/CommandHand.java | 26 +- .../worldgen/CommandWorldgenReload.java | 4 +- .../gregtech/common/covers/CoverConveyor.java | 62 +- .../common/covers/CoverFluidFilter.java | 12 +- .../common/covers/CoverFluidRegulator.java | 22 +- .../common/covers/CoverItemFilter.java | 14 +- .../common/covers/CoverMachineController.java | 22 +- .../gregtech/common/covers/CoverPump.java | 22 +- .../common/covers/CoverRoboticArm.java | 22 +- .../gregtech/common/covers/TransferMode.java | 28 +- .../covers/facade/FacadeBlockAccess.java | 20 +- .../common/covers/facade/FacadeHelper.java | 16 +- .../common/covers/facade/FacadeRenderer.java | 8 +- .../covers/filter/FilterTypeRegistry.java | 16 +- .../common/covers/filter/FluidFilter.java | 2 +- .../covers/filter/FluidFilterContainer.java | 16 +- .../covers/filter/FluidFilterWrapper.java | 8 +- .../common/covers/filter/ItemFilter.java | 2 +- .../covers/filter/ItemFilterContainer.java | 18 +- .../covers/filter/ItemFilterWrapper.java | 4 +- .../filter/OreDictionaryItemFilter.java | 6 +- .../covers/filter/SimpleFluidFilter.java | 6 +- .../covers/filter/SimpleItemFilter.java | 6 +- .../common/covers/filter/SmartItemFilter.java | 8 +- .../covers/filter/WidgetGroupFluidFilter.java | 10 +- .../covers/filter/WidgetGroupItemFilter.java | 6 +- .../common/crafting/FacadeRecipe.java | 5 +- .../common/gui/widget/CraftingSlotWidget.java | 2 +- .../common/gui/widget/ItemListGridWidget.java | 16 +- .../common/gui/widget/ItemListSlotWidget.java | 36 +- .../inventory/itemsource/ItemSourceList.java | 2 +- .../inventory/itemsource/NetworkItemInfo.java | 2 +- .../itemsource/sources/TileItemSource.java | 2 +- .../common/items/EnchantmentTableTweaks.java | 6 +- .../items/FieldProjectorEventHandler.java | 24 +- .../java/gregtech/common/items/MetaItem1.java | 18 +- .../java/gregtech/common/items/MetaTool.java | 232 +-- .../AbstractMaterialPartBehavior.java | 2 +- .../items/behaviors/ColorSprayBehaviour.java | 4 +- .../items/behaviors/CrowbarBehaviour.java | 2 +- .../items/behaviors/FoamSprayerBehavior.java | 6 +- .../common/items/behaviors/HoeBehaviour.java | 6 +- .../items/behaviors/IntCircuitBehaviour.java | 14 +- .../items/behaviors/ModeSwitchBehavior.java | 4 +- .../items/behaviors/NanoSaberBehavior.java | 6 +- .../items/behaviors/PlungerBehaviour.java | 4 +- .../items/behaviors/ScoopBehaviour.java | 2 +- .../ToggleEnergyConsumerBehavior.java | 12 +- .../metatileentities/MetaTileEntities.java | 2 +- .../electric/MetaTileEntityBatteryBuffer.java | 6 +- .../electric/MetaTileEntityBlockBreaker.java | 30 +- .../electric/MetaTileEntityCharger.java | 10 +- .../electric/MetaTileEntityFisher.java | 26 +- .../electric/MetaTileEntityItemCollector.java | 18 +- .../MetaTileEntityMagicEnergyAbsorber.java | 6 +- .../electric/MetaTileEntityPump.java | 40 +- .../electric/MetaTileEntityTransformer.java | 20 +- .../multiblockpart/MetaTileEntityItemBus.java | 2 +- .../MetaTileEntityMultiblockPart.java | 4 +- .../MetaTileEntityRotorHolder.java | 14 +- .../multi/MetaTileEntityCokeOven.java | 54 +- .../multi/MetaTileEntityLargeBoiler.java | 93 +- .../MetaTileEntityPrimitiveBlastFurnace.java | 79 +- .../electric/MetaTileEntityAssemblyLine.java | 5 +- .../electric/MetaTileEntityCrackingUnit.java | 24 +- .../MetaTileEntityDistillationTower.java | 20 +- .../MetaTileEntityElectricBlastFurnace.java | 30 +- .../MetaTileEntityImplosionCompressor.java | 22 +- .../electric/MetaTileEntityMultiFurnace.java | 116 +- .../electric/MetaTileEntityPyrolyseOven.java | 24 +- .../electric/MetaTileEntityVacuumFreezer.java | 24 +- .../generator/FueledMultiblockController.java | 8 +- .../LargeTurbineWorkableHandler.java | 20 +- .../MetaTileEntityLargeCombustionEngine.java | 22 +- .../generator/MetaTileEntityLargeTurbine.java | 5 +- .../steam/SteamAlloySmelter.java | 22 +- .../steam/SteamCompressor.java | 18 +- .../steam/SteamExtractor.java | 18 +- .../metatileentities/steam/SteamFurnace.java | 18 +- .../metatileentities/steam/SteamHammer.java | 22 +- .../steam/SteamMacerator.java | 20 +- .../steam/boiler/SteamBoiler.java | 52 +- .../steam/boiler/SteamSolarBoiler.java | 8 +- .../MetaTileEntitySteamHatch.java | 8 +- .../storage/CachedRecipeData.java | 2 +- .../storage/CraftingRecipeMemory.java | 12 +- .../storage/CraftingRecipeResolver.java | 2 +- .../storage/MetaTileEntityLockedSafe.java | 30 +- .../storage/MetaTileEntityQuantumChest.java | 10 +- .../storage/MetaTileEntityQuantumTank.java | 6 +- .../storage/MetaTileEntityTank.java | 26 +- .../storage/MetaTileEntityWorkbench.java | 2 +- .../common/pipelike/cable/BlockCable.java | 4 +- .../common/pipelike/cable/Insulation.java | 2 +- .../common/pipelike/cable/net/EnergyNet.java | 2 +- .../common/pipelike/cable/net/RoutePath.java | 4 +- .../cable/tile/CableEnergyContainer.java | 12 +- .../pipelike/cable/tile/TileEntityCable.java | 2 +- .../pipelike/fluidpipe/BlockFluidPipe.java | 4 +- .../pipelike/fluidpipe/FluidPipeType.java | 6 +- .../pipelike/fluidpipe/net/FluidNetTank.java | 2 +- .../fluidpipe/tile/FluidPipeFluidHandler.java | 2 +- .../fluidpipe/tile/TileEntityFluidPipe.java | 14 +- .../tile/TileEntityFluidPipeTickable.java | 2 +- .../pipelike/itempipe/BlockItemPipe.java | 2 +- .../pipelike/itempipe/ItemPipeType.java | 2 +- .../pipelike/itempipe/net/ItemNetHandler.java | 5 +- .../tile/TileEntityItemPipeTickable.java | 2 +- .../gregtech/common/render/CableRenderer.java | 6 +- .../common/render/FluidPipeRenderer.java | 2 +- .../common/render/ItemPipeRenderer.java | 20 +- .../render/StonePileModelGenerator.java | 2 +- .../gregtech/common/render/StoneRenderer.java | 8 +- .../common/render/WrenchOverlayRenderer.java | 12 +- .../java/gregtech/common/tools/ToolAxe.java | 4 +- .../gregtech/common/tools/ToolChainsawLV.java | 2 +- .../gregtech/common/tools/ToolCrowbar.java | 2 +- .../java/gregtech/common/tools/ToolFile.java | 2 +- .../gregtech/common/tools/ToolHardHammer.java | 13 +- .../java/gregtech/common/tools/ToolHoe.java | 2 +- .../common/tools/ToolMiningHammer.java | 32 +- .../gregtech/common/tools/ToolPickaxe.java | 8 +- .../java/gregtech/common/tools/ToolSaw.java | 21 +- .../common/tools/ToolScrewdriver.java | 2 +- .../java/gregtech/common/tools/ToolSense.java | 23 +- .../gregtech/common/tools/ToolShovel.java | 10 +- .../java/gregtech/common/tools/ToolSword.java | 22 +- .../common/tools/ToolUniversalSpade.java | 52 +- .../gregtech/common/tools/ToolUtility.java | 10 +- .../gregtech/common/tools/ToolWrench.java | 10 +- .../gregtech/common/tools/TreeChopTask.java | 39 +- .../common/tools/largedrills/DrillModes.java | 28 +- .../tools/largedrills/ToolDrillLarge.java | 6 +- .../common/tools/largedrills/ToolDrills.java | 3 +- .../common/worldgen/LootEntryMetaItem.java | 8 +- .../common/worldgen/LootTableHelper.java | 20 +- .../worldgen/WorldGenAbandonedBase.java | 6 +- .../common/worldgen/WorldGenRubberTree.java | 16 +- .../gregtech/integration/jei/GTJeiPlugin.java | 28 +- .../integration/jei/GTOreCategory.java | 36 +- .../gregtech/integration/jei/GTOreInfo.java | 68 +- .../jei/multiblock/MultiblockInfoPage.java | 17 +- .../MultiblockInfoRecipeWrapper.java | 8 +- .../multiblock/infos/AssemblyLineInfo.java | 11 +- .../jei/multiblock/infos/CokeOvenInfo.java | 16 +- .../jei/multiblock/infos/CrackerUnitInfo.java | 22 +- .../infos/DistillationTowerInfo.java | 24 +- .../infos/ElectricBlastFurnaceInfo.java | 26 +- .../multiblock/infos/FusionReactorInfo.java | 4 +- .../infos/ImplosionCompressorInfo.java | 20 +- .../jei/multiblock/infos/LargeBoilerInfo.java | 22 +- .../infos/LargeChemicalReactorInfo.java | 42 +- .../infos/LargeCombustionEngineInfo.java | 24 +- .../multiblock/infos/LargeTurbineInfo.java | 18 +- .../multiblock/infos/MultiSmelterInfo.java | 22 +- .../infos/PrimitiveBlastFurnaceInfo.java | 14 +- .../multiblock/infos/PyrolyseOvenInfo.java | 28 +- .../jei/multiblock/infos/SteamOvenInfo.java | 4 +- .../multiblock/infos/VacuumFreezerInfo.java | 24 +- .../jei/recipe/FacadeRegistryPlugin.java | 10 +- .../jei/recipe/GTRecipeWrapper.java | 2 +- .../jei/recipe/IntCircuitCategory.java | 114 +- .../jei/recipe/IntCircuitRecipeWrapper.java | 8 +- .../jei/recipe/RecipeMapCategory.java | 40 +- .../recipe/fuel/FuelRecipeMapCategory.java | 2 +- .../primitive/CokeOvenRecipeCategory.java | 68 +- .../primitive/CokeOvenRecipeWrapper.java | 72 +- .../jei/recipe/primitive/OreByProduct.java | 253 ++- .../primitive/OreByProductCategory.java | 112 +- .../PrimitiveBlastRecipeCategory.java | 54 +- .../PrimitiveBlastRecipeWrapper.java | 58 +- .../primitive/PrimitiveRecipeCategory.java | 72 +- .../jei/utils/render/CompositeRenderer.java | 2 +- .../provider/DebugPipeNetInfoProvider.java | 4 +- .../ElectricContainerInfoProvider.java | 10 +- .../provider/FuelableInfoProvider.java | 10 +- .../provider/TransformerInfoProvider.java | 6 +- .../provider/WorkableInfoProvider.java | 10 +- .../gregtech/loaders/MaterialInfoLoader.java | 2 +- .../gregtech/loaders/OreDictionaryLoader.java | 4 +- .../loaders/dungeon/ChestGenHooks.java | 18 +- .../DecompositionRecipeHandler.java | 20 +- .../oreprocessing/MaterialRecipeHandler.java | 196 +-- .../oreprocessing/OreRecipeHandler.java | 216 +-- .../oreprocessing/PartsRecipeHandler.java | 290 ++-- .../oreprocessing/PipeRecipeHandler.java | 74 +- .../PolarizingRecipeHandler.java | 16 +- .../oreprocessing/RecyclingRecipeHandler.java | 28 +- .../oreprocessing/WireRecipeHandler.java | 102 +- .../loaders/recipe/CircuitRecipes.java | 100 +- .../loaders/recipe/ComponentRecipes.java | 26 +- .../loaders/recipe/CraftingComponent.java | 3 +- .../loaders/recipe/CraftingRecipeLoader.java | 106 +- .../loaders/recipe/MachineRecipeLoader.java | 487 +++--- .../loaders/recipe/MiscRecipeLoader.java | 26 +- .../loaders/recipe/RecyclingRecipes.java | 30 +- .../recipe/VanillaOverrideRecipes.java | 1 + .../recipe/chemistry/ChemicalBathRecipes.java | 48 +- .../recipe/chemistry/ChemistryRecipes.java | 70 +- .../recipe/chemistry/CrackingRecipes.java | 176 +- .../recipe/chemistry/DistillationRecipes.java | 554 +++--- .../loaders/recipe/chemistry/LCRCombined.java | 4 +- .../recipe/chemistry/MixerRecipes.java | 108 +- .../recipe/chemistry/ReactorRecipes.java | 1514 ++++++++--------- .../autogenerated/compressed_block.json | 8 +- .../blockstates/autogenerated/ore_block.json | 4 +- .../autogenerated/surface_rock.json | 18 +- .../blockstates/boiler_firebox_casing.json | 3 - .../gregtech/blockstates/cable_double.json | 10 +- .../gregtech/blockstates/cable_hex.json | 10 +- .../gregtech/blockstates/cable_octal.json | 10 +- .../gregtech/blockstates/cable_quadruple.json | 10 +- .../gregtech/blockstates/cable_single.json | 10 +- .../assets/gregtech/blockstates/concrete.json | 194 ++- .../gregtech/blockstates/fluid_pipe_huge.json | 10 +- .../blockstates/fluid_pipe_large.json | 10 +- .../blockstates/fluid_pipe_normal.json | 10 +- .../blockstates/fluid_pipe_small.json | 10 +- .../gregtech/blockstates/fluid_pipe_tiny.json | 10 +- .../assets/gregtech/blockstates/foam.json | 6 +- .../assets/gregtech/blockstates/granite.json | 194 ++- .../gregtech/blockstates/hermetic_casing.json | 2 +- .../gregtech/blockstates/item_pipe_large.json | 10 +- .../item_pipe_large_restrictive.json | 10 +- .../blockstates/item_pipe_normal.json | 10 +- .../item_pipe_normal_restrictive.json | 10 +- .../gregtech/blockstates/item_pipe_small.json | 10 +- .../item_pipe_small_restrictive.json | 10 +- .../assets/gregtech/blockstates/log.json | 21 +- .../assets/gregtech/blockstates/machine.json | 10 +- .../assets/gregtech/blockstates/mineral.json | 194 ++- .../blockstates/multiblock_casing.json | 2 - .../blockstates/transparent_casing.json | 2 +- .../gregtech/blockstates/turbine_casing.json | 1 - .../gregtech/blockstates/wire_double.json | 10 +- .../assets/gregtech/blockstates/wire_hex.json | 10 +- .../gregtech/blockstates/wire_octal.json | 10 +- .../gregtech/blockstates/wire_quadruple.json | 10 +- .../gregtech/blockstates/wire_single.json | 10 +- .../gregtech/models/block/overlay_model.json | 164 +- .../gregtech/models/block/tinted_cube.json | 50 +- .../item/material_sets/bright/bolt.json | 10 +- .../material_sets/bright/cell_plasma.json | 10 +- .../item/material_sets/bright/crushed.json | 10 +- .../bright/crushed_centrifuged.json | 8 +- .../bright/crushed_purified.json | 8 +- .../item/material_sets/bright/dust.json | 10 +- .../material_sets/bright/dust_impure.json | 10 +- .../item/material_sets/bright/dust_pure.json | 10 +- .../item/material_sets/bright/dust_small.json | 10 +- .../item/material_sets/bright/dust_tiny.json | 10 +- .../item/material_sets/bright/foil.json | 8 +- .../item/material_sets/bright/gear.json | 10 +- .../item/material_sets/bright/gear_small.json | 10 +- .../item/material_sets/bright/ingot.json | 10 +- .../material_sets/bright/ingot_double.json | 10 +- .../item/material_sets/bright/ingot_hot.json | 10 +- .../item/material_sets/bright/nugget.json | 10 +- .../item/material_sets/bright/plate.json | 10 +- .../material_sets/bright/plate_curved.json | 8 +- .../material_sets/bright/plate_dense.json | 8 +- .../item/material_sets/bright/ring.json | 10 +- .../item/material_sets/bright/rotor.json | 8 +- .../item/material_sets/bright/round.json | 10 +- .../item/material_sets/bright/screw.json | 8 +- .../item/material_sets/bright/spring.json | 8 +- .../material_sets/bright/spring_small.json | 8 +- .../item/material_sets/bright/stick.json | 10 +- .../item/material_sets/bright/stick_long.json | 10 +- .../bright/toolHeadSoldering.json | 8 +- .../material_sets/bright/tool_head_axe.json | 8 +- .../bright/tool_head_buzz_saw.json | 8 +- .../bright/tool_head_chainsaw.json | 8 +- .../material_sets/bright/tool_head_drill.json | 8 +- .../material_sets/bright/tool_head_file.json | 8 +- .../bright/tool_head_hammer.json | 8 +- .../material_sets/bright/tool_head_hoe.json | 8 +- .../bright/tool_head_pickaxe.json | 8 +- .../material_sets/bright/tool_head_plow.json | 8 +- .../material_sets/bright/tool_head_saw.json | 8 +- .../bright/tool_head_screwdriver.json | 8 +- .../material_sets/bright/tool_head_sense.json | 8 +- .../bright/tool_head_shovel.json | 8 +- .../bright/tool_head_soldering.json | 8 +- .../material_sets/bright/tool_head_sword.json | 8 +- .../bright/tool_head_universal_spade.json | 8 +- .../bright/tool_head_wrench.json | 8 +- .../material_sets/bright/turbine_blade.json | 8 +- .../item/material_sets/bright/wire_fine.json | 10 +- .../item/material_sets/diamond/bolt.json | 10 +- .../item/material_sets/diamond/crushed.json | 10 +- .../diamond/crushed_centrifuged.json | 8 +- .../diamond/crushed_purified.json | 8 +- .../item/material_sets/diamond/dust.json | 10 +- .../material_sets/diamond/dust_impure.json | 10 +- .../item/material_sets/diamond/dust_pure.json | 10 +- .../material_sets/diamond/dust_small.json | 10 +- .../item/material_sets/diamond/dust_tiny.json | 10 +- .../item/material_sets/diamond/gear.json | 10 +- .../item/material_sets/diamond/gem.json | 8 +- .../material_sets/diamond/gem_chipped.json | 8 +- .../material_sets/diamond/gem_exquisite.json | 8 +- .../material_sets/diamond/gem_flawed.json | 8 +- .../material_sets/diamond/gem_flawless.json | 8 +- .../item/material_sets/diamond/lens.json | 10 +- .../item/material_sets/diamond/plate.json | 10 +- .../item/material_sets/diamond/screw.json | 8 +- .../item/material_sets/diamond/stick.json | 10 +- .../material_sets/diamond/stick_long.json | 10 +- .../material_sets/diamond/tool_head_axe.json | 8 +- .../diamond/tool_head_buzz_saw.json | 8 +- .../diamond/tool_head_chainsaw.json | 9 +- .../diamond/tool_head_drill.json | 8 +- .../material_sets/diamond/tool_head_file.json | 8 +- .../diamond/tool_head_hammer.json | 8 +- .../material_sets/diamond/tool_head_hoe.json | 8 +- .../diamond/tool_head_mallet.json | 8 +- .../diamond/tool_head_pickaxe.json | 8 +- .../material_sets/diamond/tool_head_plow.json | 8 +- .../material_sets/diamond/tool_head_saw.json | 8 +- .../diamond/tool_head_screwdriver.json | 8 +- .../diamond/tool_head_sense.json | 8 +- .../diamond/tool_head_shovel.json | 8 +- .../diamond/tool_head_soldering.json | 8 +- .../diamond/tool_head_sword.json | 8 +- .../diamond/tool_head_universal_spade.json | 8 +- .../diamond/tool_head_wrench.json | 8 +- .../material_sets/diamond/turbine_blade.json | 8 +- .../models/item/material_sets/dull/bolt.json | 8 +- .../item/material_sets/dull/cell_plasma.json | 10 +- .../item/material_sets/dull/crushed.json | 10 +- .../dull/crushed_centrifuged.json | 8 +- .../material_sets/dull/crushed_purified.json | 8 +- .../models/item/material_sets/dull/dust.json | 8 +- .../item/material_sets/dull/dust_impure.json | 10 +- .../item/material_sets/dull/dust_pure.json | 10 +- .../item/material_sets/dull/dust_small.json | 8 +- .../item/material_sets/dull/dust_tiny.json | 8 +- .../models/item/material_sets/dull/foil.json | 8 +- .../models/item/material_sets/dull/gear.json | 8 +- .../item/material_sets/dull/gear_small.json | 8 +- .../models/item/material_sets/dull/ingot.json | 8 +- .../item/material_sets/dull/ingot_double.json | 10 +- .../item/material_sets/dull/nugget.json | 8 +- .../models/item/material_sets/dull/plate.json | 8 +- .../item/material_sets/dull/plate_dense.json | 8 +- .../item/material_sets/dull/plate_double.json | 10 +- .../models/item/material_sets/dull/ring.json | 8 +- .../models/item/material_sets/dull/rotor.json | 8 +- .../models/item/material_sets/dull/round.json | 8 +- .../models/item/material_sets/dull/screw.json | 8 +- .../item/material_sets/dull/spring.json | 8 +- .../item/material_sets/dull/spring_small.json | 8 +- .../models/item/material_sets/dull/stick.json | 8 +- .../item/material_sets/dull/stick_long.json | 8 +- .../material_sets/dull/tool_head_axe.json | 8 +- .../dull/tool_head_buzz_saw.json | 8 +- .../dull/tool_head_chainsaw.json | 8 +- .../material_sets/dull/tool_head_drill.json | 8 +- .../material_sets/dull/tool_head_file.json | 8 +- .../material_sets/dull/tool_head_hammer.json | 8 +- .../material_sets/dull/tool_head_hoe.json | 8 +- .../material_sets/dull/tool_head_mallet.json | 8 +- .../material_sets/dull/tool_head_pickaxe.json | 8 +- .../material_sets/dull/tool_head_plow.json | 8 +- .../material_sets/dull/tool_head_saw.json | 8 +- .../dull/tool_head_screwdriver.json | 8 +- .../material_sets/dull/tool_head_sense.json | 8 +- .../material_sets/dull/tool_head_shovel.json | 8 +- .../dull/tool_head_soldering.json | 8 +- .../material_sets/dull/tool_head_sword.json | 8 +- .../dull/tool_head_universal_spade.json | 8 +- .../material_sets/dull/tool_head_wrench.json | 8 +- .../material_sets/dull/turbine_blade.json | 8 +- .../item/material_sets/dull/wire_fine.json | 10 +- .../item/material_sets/emerald/bolt.json | 10 +- .../item/material_sets/emerald/crushed.json | 10 +- .../emerald/crushed_centrifuged.json | 8 +- .../emerald/crushed_purified.json | 8 +- .../item/material_sets/emerald/dust.json | 10 +- .../material_sets/emerald/dust_impure.json | 10 +- .../item/material_sets/emerald/dust_pure.json | 10 +- .../material_sets/emerald/dust_small.json | 10 +- .../item/material_sets/emerald/dust_tiny.json | 10 +- .../item/material_sets/emerald/gear.json | 10 +- .../item/material_sets/emerald/gem.json | 8 +- .../material_sets/emerald/gem_chipped.json | 8 +- .../material_sets/emerald/gem_exquisite.json | 8 +- .../material_sets/emerald/gem_flawed.json | 8 +- .../material_sets/emerald/gem_flawless.json | 8 +- .../item/material_sets/emerald/lens.json | 10 +- .../item/material_sets/emerald/plate.json | 10 +- .../item/material_sets/emerald/screw.json | 8 +- .../item/material_sets/emerald/stick.json | 10 +- .../material_sets/emerald/stick_long.json | 10 +- .../material_sets/emerald/tool_head_axe.json | 8 +- .../emerald/tool_head_buzz_saw.json | 8 +- .../emerald/tool_head_chainsaw.json | 8 +- .../emerald/tool_head_drill.json | 8 +- .../material_sets/emerald/tool_head_file.json | 8 +- .../emerald/tool_head_hammer.json | 8 +- .../material_sets/emerald/tool_head_hoe.json | 8 +- .../emerald/tool_head_mallet.json | 8 +- .../emerald/tool_head_pickaxe.json | 8 +- .../material_sets/emerald/tool_head_plow.json | 8 +- .../material_sets/emerald/tool_head_saw.json | 8 +- .../emerald/tool_head_screwdriver.json | 8 +- .../emerald/tool_head_sense.json | 8 +- .../emerald/tool_head_shovel.json | 8 +- .../emerald/tool_head_soldering.json | 8 +- .../emerald/tool_head_sword.json | 8 +- .../emerald/tool_head_universal_spade.json | 8 +- .../emerald/tool_head_wrench.json | 8 +- .../material_sets/emerald/turbine_blade.json | 8 +- .../item/material_sets/fine/cell_plasma.json | 10 +- .../item/material_sets/fine/crushed.json | 10 +- .../fine/crushed_centrifuged.json | 8 +- .../material_sets/fine/crushed_purified.json | 8 +- .../models/item/material_sets/fine/dust.json | 8 +- .../item/material_sets/fine/dust_impure.json | 10 +- .../item/material_sets/fine/dust_pure.json | 10 +- .../item/material_sets/fine/dust_small.json | 8 +- .../item/material_sets/fine/dust_tiny.json | 8 +- .../models/item/material_sets/fine/gear.json | 8 +- .../item/material_sets/fine/gear_small.json | 8 +- .../models/item/material_sets/fine/ingot.json | 8 +- .../item/material_sets/fine/ingot_hot.json | 10 +- .../item/material_sets/fine/plate_dense.json | 8 +- .../item/material_sets/fine/spring_small.json | 8 +- .../item/material_sets/fine/stick_long.json | 8 +- .../item/material_sets/fine/wire_fine.json | 10 +- .../item/material_sets/flint/crushed.json | 10 +- .../flint/crushed_centrifuged.json | 8 +- .../material_sets/flint/crushed_purified.json | 8 +- .../models/item/material_sets/flint/dust.json | 8 +- .../item/material_sets/flint/dust_impure.json | 10 +- .../item/material_sets/flint/dust_pure.json | 10 +- .../item/material_sets/flint/dust_small.json | 8 +- .../item/material_sets/flint/dust_tiny.json | 8 +- .../models/item/material_sets/flint/gem.json | 8 +- .../item/material_sets/flint/plate.json | 8 +- .../material_sets/flint/tool_head_axe.json | 8 +- .../flint/tool_head_buzz_saw.json | 8 +- .../flint/tool_head_chainsaw.json | 8 +- .../material_sets/flint/tool_head_drill.json | 8 +- .../material_sets/flint/tool_head_file.json | 8 +- .../material_sets/flint/tool_head_hammer.json | 8 +- .../material_sets/flint/tool_head_hoe.json | 8 +- .../material_sets/flint/tool_head_mallet.json | 8 +- .../flint/tool_head_pickaxe.json | 8 +- .../material_sets/flint/tool_head_plow.json | 8 +- .../material_sets/flint/tool_head_saw.json | 8 +- .../flint/tool_head_screwdriver.json | 8 +- .../material_sets/flint/tool_head_sense.json | 8 +- .../material_sets/flint/tool_head_shovel.json | 8 +- .../flint/tool_head_soldering.json | 8 +- .../material_sets/flint/tool_head_sword.json | 8 +- .../flint/tool_head_universal_spade.json | 8 +- .../material_sets/flint/tool_head_wrench.json | 8 +- .../material_sets/flint/turbine_blade.json | 8 +- .../item/material_sets/fluid/cell_plasma.json | 10 +- .../material_sets/gem_horizontal/bolt.json | 10 +- .../material_sets/gem_horizontal/crushed.json | 10 +- .../gem_horizontal/crushed_centrifuged.json | 8 +- .../gem_horizontal/crushed_purified.json | 8 +- .../material_sets/gem_horizontal/dust.json | 10 +- .../gem_horizontal/dust_impure.json | 10 +- .../gem_horizontal/dust_pure.json | 10 +- .../gem_horizontal/dust_small.json | 10 +- .../gem_horizontal/dust_tiny.json | 10 +- .../material_sets/gem_horizontal/gear.json | 10 +- .../material_sets/gem_horizontal/gem.json | 8 +- .../gem_horizontal/gem_chipped.json | 8 +- .../gem_horizontal/gem_exquisite.json | 8 +- .../gem_horizontal/gem_flawed.json | 8 +- .../gem_horizontal/gem_flawless.json | 8 +- .../material_sets/gem_horizontal/lens.json | 10 +- .../material_sets/gem_horizontal/plate.json | 10 +- .../material_sets/gem_horizontal/screw.json | 8 +- .../material_sets/gem_horizontal/stick.json | 10 +- .../gem_horizontal/stick_long.json | 10 +- .../gem_horizontal/tool_head_axe.json | 8 +- .../gem_horizontal/tool_head_buzz_saw.json | 8 +- .../gem_horizontal/tool_head_chainsaw.json | 8 +- .../gem_horizontal/tool_head_drill.json | 8 +- .../gem_horizontal/tool_head_file.json | 8 +- .../gem_horizontal/tool_head_hammer.json | 8 +- .../gem_horizontal/tool_head_hoe.json | 8 +- .../gem_horizontal/tool_head_mallet.json | 8 +- .../gem_horizontal/tool_head_pickaxe.json | 8 +- .../gem_horizontal/tool_head_plow.json | 8 +- .../gem_horizontal/tool_head_saw.json | 8 +- .../gem_horizontal/tool_head_screwdriver.json | 8 +- .../gem_horizontal/tool_head_sense.json | 8 +- .../gem_horizontal/tool_head_shovel.json | 8 +- .../gem_horizontal/tool_head_soldering.json | 8 +- .../gem_horizontal/tool_head_sword.json | 8 +- .../tool_head_universal_spade.json | 8 +- .../gem_horizontal/tool_head_wrench.json | 8 +- .../gem_horizontal/turbine_blade.json | 8 +- .../item/material_sets/gem_vertical/bolt.json | 10 +- .../material_sets/gem_vertical/crushed.json | 10 +- .../gem_vertical/crushed_centrifuged.json | 8 +- .../gem_vertical/crushed_purified.json | 8 +- .../item/material_sets/gem_vertical/dust.json | 10 +- .../gem_vertical/dust_impure.json | 10 +- .../material_sets/gem_vertical/dust_pure.json | 10 +- .../gem_vertical/dust_small.json | 10 +- .../material_sets/gem_vertical/dust_tiny.json | 10 +- .../item/material_sets/gem_vertical/gear.json | 10 +- .../item/material_sets/gem_vertical/gem.json | 8 +- .../gem_vertical/gem_chipped.json | 8 +- .../gem_vertical/gem_exquisite.json | 8 +- .../gem_vertical/gem_flawed.json | 8 +- .../gem_vertical/gem_flawless.json | 8 +- .../item/material_sets/gem_vertical/lens.json | 10 +- .../material_sets/gem_vertical/plate.json | 10 +- .../material_sets/gem_vertical/screw.json | 8 +- .../material_sets/gem_vertical/stick.json | 10 +- .../gem_vertical/stick_long.json | 10 +- .../gem_vertical/tool_head_axe.json | 8 +- .../gem_vertical/tool_head_buzz_saw.json | 8 +- .../gem_vertical/tool_head_chainsaw.json | 8 +- .../gem_vertical/tool_head_drill.json | 8 +- .../gem_vertical/tool_head_file.json | 8 +- .../gem_vertical/tool_head_hammer.json | 8 +- .../gem_vertical/tool_head_hoe.json | 8 +- .../gem_vertical/tool_head_mallet.json | 8 +- .../gem_vertical/tool_head_pickaxe.json | 8 +- .../gem_vertical/tool_head_plow.json | 8 +- .../gem_vertical/tool_head_saw.json | 8 +- .../gem_vertical/tool_head_screwdriver.json | 8 +- .../gem_vertical/tool_head_sense.json | 8 +- .../gem_vertical/tool_head_shovel.json | 8 +- .../gem_vertical/tool_head_soldering.json | 8 +- .../gem_vertical/tool_head_sword.json | 8 +- .../tool_head_universal_spade.json | 8 +- .../gem_vertical/tool_head_wrench.json | 8 +- .../gem_vertical/turbine_blade.json | 8 +- .../models/item/material_sets/glass/dust.json | 10 +- .../item/material_sets/glass/dust_small.json | 10 +- .../item/material_sets/glass/dust_tiny.json | 10 +- .../models/item/material_sets/glass/gear.json | 10 +- .../models/item/material_sets/glass/gem.json | 8 +- .../item/material_sets/glass/gem_chipped.json | 8 +- .../material_sets/glass/gem_exquisite.json | 8 +- .../item/material_sets/glass/gem_flawed.json | 8 +- .../material_sets/glass/gem_flawless.json | 8 +- .../item/material_sets/glass/ingot.json | 10 +- .../models/item/material_sets/glass/lens.json | 10 +- .../item/material_sets/glass/nugget.json | 8 +- .../item/material_sets/glass/plate.json | 10 +- .../item/material_sets/glass/stick.json | 10 +- .../item/material_sets/glass/stick_long.json | 10 +- .../models/item/material_sets/lapis/bolt.json | 10 +- .../item/material_sets/lapis/crushed.json | 10 +- .../lapis/crushed_centrifuged.json | 8 +- .../material_sets/lapis/crushed_purified.json | 8 +- .../models/item/material_sets/lapis/dust.json | 8 +- .../item/material_sets/lapis/dust_impure.json | 10 +- .../item/material_sets/lapis/dust_pure.json | 10 +- .../item/material_sets/lapis/dust_small.json | 8 +- .../item/material_sets/lapis/dust_tiny.json | 8 +- .../models/item/material_sets/lapis/gear.json | 8 +- .../models/item/material_sets/lapis/gem.json | 8 +- .../item/material_sets/lapis/gem_chipped.json | 8 +- .../material_sets/lapis/gem_exquisite.json | 8 +- .../item/material_sets/lapis/gem_flawed.json | 8 +- .../material_sets/lapis/gem_flawless.json | 8 +- .../models/item/material_sets/lapis/lens.json | 10 +- .../item/material_sets/lapis/plate.json | 8 +- .../item/material_sets/lapis/screw.json | 8 +- .../item/material_sets/lapis/stick.json | 8 +- .../item/material_sets/lapis/stick_long.json | 8 +- .../item/material_sets/lignite/crushed.json | 10 +- .../lignite/crushed_centrifuged.json | 10 +- .../lignite/crushed_purified.json | 10 +- .../item/material_sets/lignite/dust.json | 10 +- .../material_sets/lignite/dust_impure.json | 10 +- .../item/material_sets/lignite/dust_pure.json | 10 +- .../material_sets/lignite/dust_small.json | 10 +- .../item/material_sets/lignite/dust_tiny.json | 10 +- .../item/material_sets/lignite/gem.json | 8 +- .../material_sets/lignite/gem_chipped.json | 8 +- .../material_sets/lignite/gem_exquisite.json | 8 +- .../material_sets/lignite/gem_flawed.json | 8 +- .../material_sets/lignite/gem_flawless.json | 8 +- .../item/material_sets/magnetic/bolt.json | 10 +- .../item/material_sets/magnetic/crushed.json | 10 +- .../magnetic/crushed_centrifuged.json | 10 +- .../magnetic/crushed_purified.json | 10 +- .../item/material_sets/magnetic/dust.json | 10 +- .../material_sets/magnetic/dust_impure.json | 10 +- .../material_sets/magnetic/dust_pure.json | 10 +- .../material_sets/magnetic/dust_small.json | 10 +- .../material_sets/magnetic/dust_tiny.json | 10 +- .../item/material_sets/magnetic/foil.json | 10 +- .../item/material_sets/magnetic/gear.json | 10 +- .../material_sets/magnetic/gear_small.json | 10 +- .../item/material_sets/magnetic/gem.json | 10 +- .../material_sets/magnetic/gem_chipped.json | 10 +- .../material_sets/magnetic/gem_exquisite.json | 10 +- .../material_sets/magnetic/gem_flawed.json | 10 +- .../material_sets/magnetic/gem_flawless.json | 10 +- .../item/material_sets/magnetic/ingot.json | 10 +- .../material_sets/magnetic/ingot_double.json | 12 +- .../item/material_sets/magnetic/nugget.json | 10 +- .../item/material_sets/magnetic/plate.json | 10 +- .../material_sets/magnetic/plate_curved.json | 10 +- .../material_sets/magnetic/plate_dense.json | 10 +- .../material_sets/magnetic/plate_double.json | 10 +- .../item/material_sets/magnetic/ring.json | 10 +- .../item/material_sets/magnetic/rotor.json | 10 +- .../item/material_sets/magnetic/round.json | 10 +- .../item/material_sets/magnetic/screw.json | 10 +- .../item/material_sets/magnetic/spring.json | 10 +- .../material_sets/magnetic/spring_small.json | 10 +- .../item/material_sets/magnetic/stick.json | 10 +- .../material_sets/magnetic/stick_long.json | 10 +- .../material_sets/magnetic/tool_head_axe.json | 10 +- .../magnetic/tool_head_buzz_saw.json | 10 +- .../magnetic/tool_head_chainsaw.json | 10 +- .../magnetic/tool_head_drill.json | 10 +- .../magnetic/tool_head_file.json | 10 +- .../magnetic/tool_head_hammer.json | 10 +- .../material_sets/magnetic/tool_head_hoe.json | 10 +- .../magnetic/tool_head_mallet.json | 10 +- .../magnetic/tool_head_pickaxe.json | 10 +- .../magnetic/tool_head_plow.json | 10 +- .../material_sets/magnetic/tool_head_saw.json | 10 +- .../magnetic/tool_head_screwdriver.json | 10 +- .../magnetic/tool_head_sense.json | 10 +- .../magnetic/tool_head_shovel.json | 10 +- .../magnetic/tool_head_soldering.json | 8 +- .../magnetic/tool_head_sword.json | 10 +- .../magnetic/tool_head_universal_spade.json | 10 +- .../magnetic/tool_head_wrench.json | 10 +- .../material_sets/magnetic/turbine_blade.json | 8 +- .../material_sets/magnetic/wire_fine.json | 10 +- .../item/material_sets/metallic/bolt.json | 8 +- .../material_sets/metallic/cell_plasma.json | 10 +- .../item/material_sets/metallic/crushed.json | 10 +- .../metallic/crushed_centrifuged.json | 8 +- .../metallic/crushed_purified.json | 8 +- .../item/material_sets/metallic/dust.json | 8 +- .../material_sets/metallic/dust_impure.json | 10 +- .../material_sets/metallic/dust_pure.json | 10 +- .../material_sets/metallic/dust_small.json | 8 +- .../material_sets/metallic/dust_tiny.json | 8 +- .../item/material_sets/metallic/foil.json | 8 +- .../item/material_sets/metallic/gear.json | 8 +- .../material_sets/metallic/gear_small.json | 8 +- .../material_sets/metallic/gem_chipped.json | 8 +- .../material_sets/metallic/gem_exquisite.json | 8 +- .../material_sets/metallic/gem_flawed.json | 8 +- .../material_sets/metallic/gem_flawless.json | 8 +- .../item/material_sets/metallic/ingot.json | 10 +- .../material_sets/metallic/ingot_double.json | 10 +- .../material_sets/metallic/ingot_hot.json | 10 +- .../item/material_sets/metallic/nugget.json | 8 +- .../item/material_sets/metallic/plate.json | 8 +- .../material_sets/metallic/plate_curved.json | 8 +- .../material_sets/metallic/plate_dense.json | 8 +- .../material_sets/metallic/plate_double.json | 10 +- .../item/material_sets/metallic/ring.json | 8 +- .../item/material_sets/metallic/rotor.json | 8 +- .../item/material_sets/metallic/round.json | 8 +- .../item/material_sets/metallic/screw.json | 8 +- .../item/material_sets/metallic/spring.json | 8 +- .../material_sets/metallic/spring_small.json | 8 +- .../item/material_sets/metallic/stick.json | 8 +- .../material_sets/metallic/stick_long.json | 8 +- .../material_sets/metallic/tool_head_axe.json | 8 +- .../metallic/tool_head_buzz_saw.json | 8 +- .../metallic/tool_head_chainsaw.json | 8 +- .../metallic/tool_head_drill.json | 8 +- .../metallic/tool_head_file.json | 8 +- .../metallic/tool_head_hammer.json | 8 +- .../material_sets/metallic/tool_head_hoe.json | 8 +- .../metallic/tool_head_mallet.json | 8 +- .../metallic/tool_head_pickaxe.json | 8 +- .../metallic/tool_head_plow.json | 8 +- .../material_sets/metallic/tool_head_saw.json | 8 +- .../metallic/tool_head_screwdriver.json | 8 +- .../metallic/tool_head_sense.json | 8 +- .../metallic/tool_head_shovel.json | 8 +- .../metallic/tool_head_soldering.json | 8 +- .../metallic/tool_head_sword.json | 8 +- .../metallic/tool_head_universal_spade.json | 8 +- .../metallic/tool_head_wrench.json | 8 +- .../material_sets/metallic/turbine_blade.json | 8 +- .../material_sets/metallic/wire_fine.json | 10 +- .../item/material_sets/netherstar/bolt.json | 10 +- .../material_sets/netherstar/crushed.json | 10 +- .../netherstar/crushed_centrifuged.json | 8 +- .../netherstar/crushed_purified.json | 8 +- .../item/material_sets/netherstar/dust.json | 10 +- .../material_sets/netherstar/dust_impure.json | 10 +- .../material_sets/netherstar/dust_pure.json | 10 +- .../material_sets/netherstar/dust_small.json | 10 +- .../material_sets/netherstar/dust_tiny.json | 10 +- .../item/material_sets/netherstar/gear.json | 10 +- .../item/material_sets/netherstar/gem.json | 8 +- .../material_sets/netherstar/gem_chipped.json | 8 +- .../netherstar/gem_exquisite.json | 8 +- .../material_sets/netherstar/gem_flawed.json | 8 +- .../netherstar/gem_flawless.json | 8 +- .../item/material_sets/netherstar/lens.json | 10 +- .../item/material_sets/netherstar/plate.json | 10 +- .../item/material_sets/netherstar/screw.json | 8 +- .../item/material_sets/netherstar/stick.json | 10 +- .../material_sets/netherstar/stick_long.json | 8 +- .../netherstar/tool_head_axe.json | 8 +- .../netherstar/tool_head_buzz_saw.json | 8 +- .../netherstar/tool_head_chainsaw.json | 8 +- .../netherstar/tool_head_drill.json | 8 +- .../netherstar/tool_head_file.json | 8 +- .../netherstar/tool_head_hammer.json | 8 +- .../netherstar/tool_head_hoe.json | 8 +- .../netherstar/tool_head_mallet.json | 8 +- .../netherstar/tool_head_pickaxe.json | 8 +- .../netherstar/tool_head_plow.json | 8 +- .../netherstar/tool_head_saw.json | 8 +- .../netherstar/tool_head_screwdriver.json | 8 +- .../netherstar/tool_head_sense.json | 8 +- .../netherstar/tool_head_shovel.json | 8 +- .../netherstar/tool_head_soldering.json | 8 +- .../netherstar/tool_head_sword.json | 8 +- .../netherstar/tool_head_universal_spade.json | 8 +- .../netherstar/tool_head_wrench.json | 8 +- .../netherstar/turbine_blade.json | 8 +- .../models/item/material_sets/opal/bolt.json | 10 +- .../item/material_sets/opal/crushed.json | 10 +- .../opal/crushed_centrifuged.json | 8 +- .../material_sets/opal/crushed_purified.json | 8 +- .../models/item/material_sets/opal/dust.json | 10 +- .../item/material_sets/opal/dust_impure.json | 10 +- .../item/material_sets/opal/dust_pure.json | 10 +- .../item/material_sets/opal/dust_small.json | 10 +- .../item/material_sets/opal/dust_tiny.json | 10 +- .../models/item/material_sets/opal/gem.json | 10 +- .../item/material_sets/opal/gem_chipped.json | 10 +- .../material_sets/opal/gem_exquisite.json | 10 +- .../item/material_sets/opal/gem_flawed.json | 10 +- .../item/material_sets/opal/gem_flawless.json | 10 +- .../models/item/material_sets/opal/lens.json | 10 +- .../models/item/material_sets/opal/plate.json | 10 +- .../models/item/material_sets/opal/stick.json | 10 +- .../item/material_sets/opal/stick_long.json | 10 +- .../material_sets/opal/tool_head_axe.json | 8 +- .../opal/tool_head_buzz_saw.json | 8 +- .../opal/tool_head_chainsaw.json | 8 +- .../material_sets/opal/tool_head_drill.json | 8 +- .../material_sets/opal/tool_head_file.json | 8 +- .../material_sets/opal/tool_head_hammer.json | 8 +- .../material_sets/opal/tool_head_hoe.json | 8 +- .../material_sets/opal/tool_head_mallet.json | 8 +- .../material_sets/opal/tool_head_pickaxe.json | 8 +- .../material_sets/opal/tool_head_plow.json | 8 +- .../material_sets/opal/tool_head_saw.json | 8 +- .../opal/tool_head_screwdriver.json | 8 +- .../material_sets/opal/tool_head_sense.json | 8 +- .../material_sets/opal/tool_head_shovel.json | 8 +- .../opal/tool_head_soldering.json | 8 +- .../material_sets/opal/tool_head_sword.json | 8 +- .../opal/tool_head_universal_spade.json | 8 +- .../material_sets/opal/tool_head_wrench.json | 8 +- .../material_sets/opal/turbine_blade.json | 8 +- .../models/item/material_sets/paper/dust.json | 8 +- .../item/material_sets/paper/dust_impure.json | 10 +- .../item/material_sets/paper/dust_pure.json | 10 +- .../item/material_sets/paper/dust_small.json | 8 +- .../item/material_sets/paper/dust_tiny.json | 8 +- .../models/item/material_sets/paper/ring.json | 8 +- .../item/material_sets/powder/dust.json | 8 +- .../material_sets/powder/dust_impure.json | 8 +- .../item/material_sets/powder/dust_pure.json | 8 +- .../item/material_sets/powder/dust_small.json | 8 +- .../item/material_sets/powder/dust_tiny.json | 8 +- .../item/material_sets/quartz/bolt.json | 10 +- .../item/material_sets/quartz/crushed.json | 10 +- .../quartz/crushed_centrifuged.json | 8 +- .../quartz/crushed_purified.json | 8 +- .../item/material_sets/quartz/dust.json | 8 +- .../material_sets/quartz/dust_impure.json | 10 +- .../item/material_sets/quartz/dust_pure.json | 10 +- .../item/material_sets/quartz/dust_small.json | 8 +- .../item/material_sets/quartz/dust_tiny.json | 8 +- .../item/material_sets/quartz/gear.json | 8 +- .../models/item/material_sets/quartz/gem.json | 8 +- .../material_sets/quartz/gem_chipped.json | 8 +- .../material_sets/quartz/gem_exquisite.json | 8 +- .../item/material_sets/quartz/gem_flawed.json | 8 +- .../material_sets/quartz/gem_flawless.json | 8 +- .../item/material_sets/quartz/lens.json | 10 +- .../item/material_sets/quartz/plate.json | 8 +- .../material_sets/quartz/plate_double.json | 10 +- .../item/material_sets/quartz/screw.json | 8 +- .../item/material_sets/quartz/stick.json | 8 +- .../item/material_sets/quartz/stick_long.json | 8 +- .../material_sets/quartz/tool_head_axe.json | 8 +- .../quartz/tool_head_buzz_saw.json | 8 +- .../quartz/tool_head_chainsaw.json | 8 +- .../material_sets/quartz/tool_head_drill.json | 8 +- .../material_sets/quartz/tool_head_file.json | 8 +- .../quartz/tool_head_hammer.json | 8 +- .../material_sets/quartz/tool_head_hoe.json | 8 +- .../quartz/tool_head_mallet.json | 8 +- .../quartz/tool_head_pickaxe.json | 8 +- .../material_sets/quartz/tool_head_plow.json | 8 +- .../material_sets/quartz/tool_head_saw.json | 8 +- .../quartz/tool_head_screwdriver.json | 8 +- .../material_sets/quartz/tool_head_sense.json | 8 +- .../quartz/tool_head_shovel.json | 8 +- .../quartz/tool_head_soldering.json | 8 +- .../material_sets/quartz/tool_head_sword.json | 8 +- .../quartz/tool_head_universal_spade.json | 8 +- .../quartz/tool_head_wrench.json | 8 +- .../material_sets/quartz/turbine_blade.json | 8 +- .../models/item/material_sets/rough/bolt.json | 8 +- .../item/material_sets/rough/crushed.json | 10 +- .../rough/crushed_centrifuged.json | 8 +- .../material_sets/rough/crushed_purified.json | 8 +- .../models/item/material_sets/rough/dust.json | 10 +- .../item/material_sets/rough/dust_impure.json | 10 +- .../item/material_sets/rough/dust_pure.json | 10 +- .../item/material_sets/rough/dust_small.json | 8 +- .../item/material_sets/rough/dust_tiny.json | 8 +- .../models/item/material_sets/rough/foil.json | 8 +- .../models/item/material_sets/rough/gear.json | 8 +- .../item/material_sets/rough/gear_small.json | 8 +- .../item/material_sets/rough/ingot.json | 10 +- .../material_sets/rough/ingot_double.json | 10 +- .../item/material_sets/rough/nugget.json | 8 +- .../item/material_sets/rough/plate.json | 8 +- .../material_sets/rough/plate_curved.json | 8 +- .../item/material_sets/rough/plate_dense.json | 8 +- .../material_sets/rough/plate_double.json | 8 +- .../models/item/material_sets/rough/ring.json | 8 +- .../item/material_sets/rough/rotor.json | 8 +- .../item/material_sets/rough/round.json | 8 +- .../item/material_sets/rough/screw.json | 8 +- .../item/material_sets/rough/spring.json | 8 +- .../material_sets/rough/spring_small.json | 8 +- .../item/material_sets/rough/stick.json | 8 +- .../item/material_sets/rough/stick_long.json | 8 +- .../material_sets/rough/tool_head_axe.json | 8 +- .../rough/tool_head_buzz_saw.json | 8 +- .../rough/tool_head_chainsaw.json | 8 +- .../material_sets/rough/tool_head_drill.json | 8 +- .../material_sets/rough/tool_head_file.json | 8 +- .../material_sets/rough/tool_head_hammer.json | 8 +- .../material_sets/rough/tool_head_hoe.json | 8 +- .../material_sets/rough/tool_head_mallet.json | 8 +- .../rough/tool_head_pickaxe.json | 8 +- .../material_sets/rough/tool_head_plow.json | 8 +- .../material_sets/rough/tool_head_saw.json | 8 +- .../rough/tool_head_screwdriver.json | 8 +- .../material_sets/rough/tool_head_sense.json | 8 +- .../material_sets/rough/tool_head_shovel.json | 8 +- .../rough/tool_head_soldering.json | 8 +- .../material_sets/rough/tool_head_sword.json | 8 +- .../rough/tool_head_universal_spade.json | 8 +- .../material_sets/rough/tool_head_wrench.json | 8 +- .../material_sets/rough/turbine_blade.json | 8 +- .../item/material_sets/rough/wire_fine.json | 10 +- .../models/item/material_sets/ruby/bolt.json | 10 +- .../item/material_sets/ruby/crushed.json | 10 +- .../ruby/crushed_centrifuged.json | 8 +- .../material_sets/ruby/crushed_purified.json | 8 +- .../models/item/material_sets/ruby/dust.json | 10 +- .../item/material_sets/ruby/dust_impure.json | 10 +- .../item/material_sets/ruby/dust_pure.json | 10 +- .../item/material_sets/ruby/dust_small.json | 10 +- .../item/material_sets/ruby/dust_tiny.json | 10 +- .../models/item/material_sets/ruby/gem.json | 8 +- .../item/material_sets/ruby/gem_chipped.json | 10 +- .../material_sets/ruby/gem_exquisite.json | 10 +- .../item/material_sets/ruby/gem_flawed.json | 10 +- .../item/material_sets/ruby/gem_flawless.json | 10 +- .../models/item/material_sets/ruby/lens.json | 10 +- .../models/item/material_sets/ruby/plate.json | 10 +- .../models/item/material_sets/ruby/screw.json | 8 +- .../models/item/material_sets/ruby/stick.json | 10 +- .../item/material_sets/ruby/stick_long.json | 10 +- .../material_sets/ruby/tool_head_axe.json | 8 +- .../ruby/tool_head_buzz_saw.json | 8 +- .../ruby/tool_head_chainsaw.json | 8 +- .../material_sets/ruby/tool_head_drill.json | 8 +- .../material_sets/ruby/tool_head_file.json | 8 +- .../material_sets/ruby/tool_head_hammer.json | 8 +- .../material_sets/ruby/tool_head_hoe.json | 8 +- .../material_sets/ruby/tool_head_mallet.json | 8 +- .../material_sets/ruby/tool_head_pickaxe.json | 8 +- .../material_sets/ruby/tool_head_plow.json | 8 +- .../material_sets/ruby/tool_head_saw.json | 8 +- .../ruby/tool_head_screwdriver.json | 8 +- .../material_sets/ruby/tool_head_sense.json | 8 +- .../material_sets/ruby/tool_head_shovel.json | 8 +- .../ruby/tool_head_soldering.json | 8 +- .../material_sets/ruby/tool_head_sword.json | 8 +- .../ruby/tool_head_universal_spade.json | 8 +- .../material_sets/ruby/tool_head_wrench.json | 8 +- .../material_sets/ruby/turbine_blade.json | 8 +- .../item/material_sets/sand/crushed.json | 10 +- .../sand/crushed_centrifuged.json | 8 +- .../material_sets/sand/crushed_purified.json | 8 +- .../models/item/material_sets/sand/dust.json | 10 +- .../item/material_sets/sand/dust_impure.json | 10 +- .../item/material_sets/sand/dust_pure.json | 10 +- .../item/material_sets/sand/dust_small.json | 10 +- .../item/material_sets/sand/dust_tiny.json | 10 +- .../models/item/material_sets/shiny/bolt.json | 10 +- .../item/material_sets/shiny/cell_plasma.json | 10 +- .../item/material_sets/shiny/crushed.json | 10 +- .../shiny/crushed_centrifuged.json | 8 +- .../material_sets/shiny/crushed_purified.json | 8 +- .../models/item/material_sets/shiny/dust.json | 10 +- .../item/material_sets/shiny/dust_impure.json | 10 +- .../item/material_sets/shiny/dust_pure.json | 10 +- .../item/material_sets/shiny/dust_small.json | 10 +- .../item/material_sets/shiny/dust_tiny.json | 10 +- .../models/item/material_sets/shiny/foil.json | 8 +- .../models/item/material_sets/shiny/gear.json | 10 +- .../item/material_sets/shiny/gear_small.json | 10 +- .../item/material_sets/shiny/ingot.json | 10 +- .../material_sets/shiny/ingot_double.json | 10 +- .../item/material_sets/shiny/ingot_hot.json | 10 +- .../item/material_sets/shiny/nugget.json | 10 +- .../item/material_sets/shiny/plate.json | 10 +- .../material_sets/shiny/plate_curved.json | 8 +- .../item/material_sets/shiny/plate_dense.json | 8 +- .../models/item/material_sets/shiny/ring.json | 10 +- .../item/material_sets/shiny/rotor.json | 8 +- .../item/material_sets/shiny/round.json | 10 +- .../item/material_sets/shiny/screw.json | 8 +- .../item/material_sets/shiny/spring.json | 8 +- .../material_sets/shiny/spring_small.json | 8 +- .../item/material_sets/shiny/stick.json | 10 +- .../item/material_sets/shiny/stick_long.json | 10 +- .../shiny/toolHeadSoldering.json | 8 +- .../material_sets/shiny/tool_head_axe.json | 8 +- .../shiny/tool_head_buzz_saw.json | 8 +- .../shiny/tool_head_chainsaw.json | 8 +- .../material_sets/shiny/tool_head_drill.json | 8 +- .../material_sets/shiny/tool_head_file.json | 8 +- .../material_sets/shiny/tool_head_hammer.json | 8 +- .../material_sets/shiny/tool_head_hoe.json | 8 +- .../shiny/tool_head_pickaxe.json | 8 +- .../material_sets/shiny/tool_head_plow.json | 8 +- .../material_sets/shiny/tool_head_saw.json | 8 +- .../shiny/tool_head_screwdriver.json | 8 +- .../material_sets/shiny/tool_head_sense.json | 8 +- .../material_sets/shiny/tool_head_shovel.json | 8 +- .../shiny/tool_head_soldering.json | 8 +- .../material_sets/shiny/tool_head_sword.json | 8 +- .../shiny/tool_head_universal_spade.json | 8 +- .../material_sets/shiny/tool_head_wrench.json | 8 +- .../material_sets/shiny/turbine_blade.json | 8 +- .../item/material_sets/shiny/wire_fine.json | 10 +- .../item/material_sets/smooth/dust_small.json | 8 +- .../item/material_sets/smooth/dust_tiny.json | 8 +- .../item/material_sets/smooth/gear.json | 8 +- .../item/material_sets/smooth/stick_long.json | 8 +- .../models/item/material_sets/wood/bolt.json | 10 +- .../models/item/material_sets/wood/dust.json | 8 +- .../item/material_sets/wood/dust_small.json | 8 +- .../item/material_sets/wood/dust_tiny.json | 8 +- .../models/item/material_sets/wood/gear.json | 8 +- .../models/item/material_sets/wood/plate.json | 8 +- .../item/material_sets/wood/plate_double.json | 10 +- .../models/item/material_sets/wood/screw.json | 8 +- .../item/material_sets/wood/stick_long.json | 8 +- .../item/metaitems/energy.cluster/1.json | 3 +- .../item/metaitems/energy.cluster/2.json | 3 +- .../item/metaitems/energy.cluster/3.json | 3 +- .../item/metaitems/energy.cluster/4.json | 3 +- .../item/metaitems/energy.cluster/5.json | 3 +- .../item/metaitems/energy.cluster/6.json | 3 +- .../item/metaitems/energy.cluster/7.json | 3 +- .../item/metaitems/energy.cluster/8.json | 3 +- .../item/metaitems/energy.module/1.json | 3 +- .../item/metaitems/energy.module/2.json | 3 +- .../item/metaitems/energy.module/3.json | 3 +- .../item/metaitems/energy.module/4.json | 3 +- .../item/metaitems/energy.module/5.json | 3 +- .../item/metaitems/energy.module/6.json | 3 +- .../item/metaitems/energy.module/7.json | 3 +- .../item/metaitems/energy.module/8.json | 3 +- .../gregtech/models/item/tools/scoop.json | 2 +- .../models/item/tools/screwdriver.json | 2 +- .../models/item/tools/wire_cutter.json | 2 +- .../gregtech/models/item/tools/wrench.mv.json | 2 +- .../gregtech/worldgen/end/beryllium_vein.json | 13 +- .../gregtech/worldgen/end/lapis_vein.json | 15 +- .../gregtech/worldgen/end/manganese_vein.json | 15 +- .../worldgen/end/molybdenum_vein.json | 13 +- .../gregtech/worldgen/end/naquadah_vein.json | 11 +- .../gregtech/worldgen/end/nickel_vein.json | 15 +- .../gregtech/worldgen/end/olivine_vein.json | 15 +- .../gregtech/worldgen/end/platinum_vein.json | 17 +- .../gregtech/worldgen/end/tungstate_vein.json | 13 +- .../worldgen/nether/chalcopyrite_vein.json | 17 +- .../gregtech/worldgen/nether/iron_vein.json | 17 +- .../worldgen/nether/magnetite_vein.json | 15 +- .../worldgen/nether/netherquartz_vein.json | 11 +- .../gregtech/worldgen/nether/nickel_vein.json | 15 +- .../worldgen/nether/redstone_vein.json | 13 +- .../gregtech/worldgen/nether/sulfur_vein.json | 13 +- .../worldgen/nether/tetrahedrite_vein.json | 13 +- .../worldgen/overworld/apatite_vein.json | 5 +- .../worldgen/overworld/basalt_sphere.json | 8 +- .../worldgen/overworld/bauxite_vein.json | 7 +- .../worldgen/overworld/beryllium_vein.json | 9 +- .../overworld/black_granite_sphere.json | 8 +- .../worldgen/overworld/bornite_vein.json | 13 +- .../worldgen/overworld/chalcopyrite_vein.json | 13 +- .../worldgen/overworld/coal_vein.json | 7 +- .../worldgen/overworld/diamond_vein.json | 9 +- .../worldgen/overworld/galena_vein.json | 9 +- .../worldgen/overworld/heavy_oil_sphere.json | 8 +- .../worldgen/overworld/iron_vein.json | 13 +- .../worldgen/overworld/lapis_vein.json | 11 +- .../worldgen/overworld/light_oil_sphere.json | 8 +- .../worldgen/overworld/lignitecoal_vein.json | 7 +- .../worldgen/overworld/magnetite_vein.json | 11 +- .../worldgen/overworld/manganese_vein.json | 11 +- .../worldgen/overworld/marble_sphere.json | 8 +- .../worldgen/overworld/medium_oil_sphere.json | 8 +- .../worldgen/overworld/molybdenite_vein.json | 9 +- .../worldgen/overworld/monazite_vein.json | 7 +- .../worldgen/overworld/natural_gas_plate.json | 18 +- .../worldgen/overworld/nickel_vein.json | 11 +- .../worldgen/overworld/olivine_vein.json | 11 +- .../worldgen/overworld/pitchblende_vein.json | 9 +- .../worldgen/overworld/platinum_vein.json | 13 +- .../worldgen/overworld/quartz_vein.json | 7 +- .../overworld/red_granite_sphere.json | 8 +- .../worldgen/overworld/redstone_vein.json | 7 +- .../worldgen/overworld/salts_vein.json | 11 +- .../worldgen/overworld/sapphire_vein.json | 11 +- .../worldgen/overworld/soapstone_vein.json | 11 +- .../worldgen/overworld/tenorite_vein.json | 7 +- .../worldgen/overworld/tetrahedrite_vein.json | 10 +- .../gregtech/worldgen/overworld/tin_vein.json | 7 +- .../worldgen/overworld/tungstate_vein.json | 9 +- 1240 files changed, 9659 insertions(+), 9032 deletions(-) diff --git a/src/api/java/appeng/api/implementations/items/IAEWrench.java b/src/api/java/appeng/api/implementations/items/IAEWrench.java index 6371acffc70..bb0db33698c 100644 --- a/src/api/java/appeng/api/implementations/items/IAEWrench.java +++ b/src/api/java/appeng/api/implementations/items/IAEWrench.java @@ -14,8 +14,7 @@ public interface IAEWrench { * Check if the wrench can be used. * * @param player wrenching player - * @param pos of block. - * + * @param pos of block. * @return true if wrench can be used */ boolean canWrench(ItemStack wrench, EntityPlayer player, BlockPos pos); diff --git a/src/api/java/cofh/api/item/IToolHammer.java b/src/api/java/cofh/api/item/IToolHammer.java index c556773e3ea..5806918e371 100644 --- a/src/api/java/cofh/api/item/IToolHammer.java +++ b/src/api/java/cofh/api/item/IToolHammer.java @@ -8,7 +8,10 @@ public interface IToolHammer { boolean isUsable(ItemStack item, EntityLivingBase user, BlockPos pos); + boolean isUsable(ItemStack item, EntityLivingBase user, Entity entity); + void toolUsed(ItemStack item, EntityLivingBase user, BlockPos pos); + void toolUsed(ItemStack item, EntityLivingBase user, Entity entity); } diff --git a/src/api/java/crazypants/enderio/api/tool/IConduitControl.java b/src/api/java/crazypants/enderio/api/tool/IConduitControl.java index c3ae695f2fd..6adb167c3fc 100644 --- a/src/api/java/crazypants/enderio/api/tool/IConduitControl.java +++ b/src/api/java/crazypants/enderio/api/tool/IConduitControl.java @@ -10,10 +10,8 @@ public interface IConduitControl { /** * Controls whether the overlay is shown and the player can change the display mode. * - * @param stack - * The itemstack - * @param player - * The player holding the itemstack + * @param stack The itemstack + * @param player The player holding the itemstack * @return True if the overlay should be rendered and the player should be able to change modes. False otherwise. */ boolean showOverlay(@Nonnull ItemStack stack, @Nonnull EntityPlayer player); diff --git a/src/main/java/gregtech/GregTechMod.java b/src/main/java/gregtech/GregTechMod.java index 3b0c958510c..93c20d87cfc 100644 --- a/src/main/java/gregtech/GregTechMod.java +++ b/src/main/java/gregtech/GregTechMod.java @@ -38,9 +38,15 @@ import gregtech.loaders.dungeon.DungeonLootLoader; import net.minecraftforge.classloading.FMLForgePlugin; import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fml.common.*; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.LoaderException; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Optional.Method; -import net.minecraftforge.fml.common.event.*; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.registry.GameRegistry; @Mod(modid = GTValues.MODID, diff --git a/src/main/java/gregtech/api/GTValues.java b/src/main/java/gregtech/api/GTValues.java index ba53a1b687f..03749fca777 100644 --- a/src/main/java/gregtech/api/GTValues.java +++ b/src/main/java/gregtech/api/GTValues.java @@ -65,33 +65,33 @@ public class GTValues { /** * The short names for the voltages */ - public static final String[] VN = new String[] {"ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "UHV", "UEV", "UIV", "UMV", "UXV", "MAX"}; + public static final String[] VN = new String[]{"ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "UHV", "UEV", "UIV", "UMV", "UXV", "MAX"}; /** * Color values for the voltages */ - public static final int[] VC = new int[] {0xB4B4B4, 0xDCDCDC, 0xFF6400, 0xFFFF1E, 0x808080, 0xF0F0F5, 0xDCDCF5, 0xC8C8F5, 0xB4B4F5, 0xA0A0F5, 0x8C8CF5, 0x7878F5, 0x6464F5, 0x5050F5, 0x2828F5}; + public static final int[] VC = new int[]{0xB4B4B4, 0xDCDCDC, 0xFF6400, 0xFFFF1E, 0x808080, 0xF0F0F5, 0xDCDCF5, 0xC8C8F5, 0xB4B4F5, 0xA0A0F5, 0x8C8CF5, 0x7878F5, 0x6464F5, 0x5050F5, 0x2828F5}; /** * The long names for the voltages */ - public static final String[] VOLTAGE_NAMES = new String[] {"Ultra Low Voltage", "Low Voltage", "Medium Voltage", "High Voltage", "Extreme Voltage", "Insane Voltage", "Ludicrous Voltage", "ZPM Voltage", "Ultimate Voltage", + public static final String[] VOLTAGE_NAMES = new String[]{"Ultra Low Voltage", "Low Voltage", "Medium Voltage", "High Voltage", "Extreme Voltage", "Insane Voltage", "Ludicrous Voltage", "ZPM Voltage", "Ultimate Voltage", "Highly Ultimate Voltage", "Extremely Ultimate Voltage", "Insanely Ultimate Voltage", "Mega Ultimate Voltage", "Extended Mega Ultimate Voltage", "Maximum Voltage"}; /** * ModID strings, since they are quite common parameters */ public static final String MODID = "gregtech", - MODID_FR = "forestry", - MODID_CT = "crafttweaker", - MODID_TOP = "theoneprobe", - MODID_CTM = "ctm", - MODID_CC = "cubicchunks", - MODID_AR = "advancedrocketry", - MODID_EIO = "enderio", - MODID_BC = "buildcraftcore", - MODID_COFH = "cofhcore", - MODID_APPENG = "appliedenergistics2"; + MODID_FR = "forestry", + MODID_CT = "crafttweaker", + MODID_TOP = "theoneprobe", + MODID_CTM = "ctm", + MODID_CC = "cubicchunks", + MODID_AR = "advancedrocketry", + MODID_EIO = "enderio", + MODID_BC = "buildcraftcore", + MODID_COFH = "cofhcore", + MODID_APPENG = "appliedenergistics2"; //because forge is too fucking retarded to cache results or at least do not create fucking //immutable collections every time you retrieve indexed mod list @@ -117,41 +117,41 @@ public static boolean isModLoaded(String modid) { */ public static final boolean HT = ConfigHolder.U.machines.highTierMachines || - ConfigHolder.U.machines.highTierAlloySmelter || - ConfigHolder.U.machines.highTierArcFurnaces || - ConfigHolder.U.machines.highTierAssemblers || - ConfigHolder.U.machines.highTierAutoclaves || - ConfigHolder.U.machines.highTierBenders || - ConfigHolder.U.machines.highTierBreweries || - ConfigHolder.U.machines.highTierCanners || - ConfigHolder.U.machines.highTierCentrifuges || - ConfigHolder.U.machines.highTierChemicalBaths || - ConfigHolder.U.machines.highTierChemicalReactors || - ConfigHolder.U.machines.highTierCompressors || - ConfigHolder.U.machines.highTierCutters || - ConfigHolder.U.machines.highTierDistilleries || - ConfigHolder.U.machines.highTierElectricFurnace || - ConfigHolder.U.machines.highTierElectrolyzers || - ConfigHolder.U.machines.highTierElectromagneticSeparators || - ConfigHolder.U.machines.highTierExtractors || - ConfigHolder.U.machines.highTierExtruders || - ConfigHolder.U.machines.highTierFermenters || - ConfigHolder.U.machines.highTierFluidHeaters || - ConfigHolder.U.machines.highTierFluidSolidifiers || - ConfigHolder.U.machines.highTierForgeHammers || - ConfigHolder.U.machines.highTierFormingPresses || - ConfigHolder.U.machines.highTierLathes || - ConfigHolder.U.machines.highTierMixers || - ConfigHolder.U.machines.highTierOreWashers || - ConfigHolder.U.machines.highTierPackers || - ConfigHolder.U.machines.highTierPolarizers || - ConfigHolder.U.machines.highTierLaserEngravers || - ConfigHolder.U.machines.highTierSifters || - ConfigHolder.U.machines.highTierThermalCentrifuges || - ConfigHolder.U.machines.highTierMacerators || - ConfigHolder.U.machines.highTierUnpackers || - ConfigHolder.U.machines.highTierWiremills || - ConfigHolder.U.machines.highTierMassFabricators || - ConfigHolder.U.machines.highTierReplicators || - ConfigHolder.U.machines.highTierScanners; + ConfigHolder.U.machines.highTierAlloySmelter || + ConfigHolder.U.machines.highTierArcFurnaces || + ConfigHolder.U.machines.highTierAssemblers || + ConfigHolder.U.machines.highTierAutoclaves || + ConfigHolder.U.machines.highTierBenders || + ConfigHolder.U.machines.highTierBreweries || + ConfigHolder.U.machines.highTierCanners || + ConfigHolder.U.machines.highTierCentrifuges || + ConfigHolder.U.machines.highTierChemicalBaths || + ConfigHolder.U.machines.highTierChemicalReactors || + ConfigHolder.U.machines.highTierCompressors || + ConfigHolder.U.machines.highTierCutters || + ConfigHolder.U.machines.highTierDistilleries || + ConfigHolder.U.machines.highTierElectricFurnace || + ConfigHolder.U.machines.highTierElectrolyzers || + ConfigHolder.U.machines.highTierElectromagneticSeparators || + ConfigHolder.U.machines.highTierExtractors || + ConfigHolder.U.machines.highTierExtruders || + ConfigHolder.U.machines.highTierFermenters || + ConfigHolder.U.machines.highTierFluidHeaters || + ConfigHolder.U.machines.highTierFluidSolidifiers || + ConfigHolder.U.machines.highTierForgeHammers || + ConfigHolder.U.machines.highTierFormingPresses || + ConfigHolder.U.machines.highTierLathes || + ConfigHolder.U.machines.highTierMixers || + ConfigHolder.U.machines.highTierOreWashers || + ConfigHolder.U.machines.highTierPackers || + ConfigHolder.U.machines.highTierPolarizers || + ConfigHolder.U.machines.highTierLaserEngravers || + ConfigHolder.U.machines.highTierSifters || + ConfigHolder.U.machines.highTierThermalCentrifuges || + ConfigHolder.U.machines.highTierMacerators || + ConfigHolder.U.machines.highTierUnpackers || + ConfigHolder.U.machines.highTierWiremills || + ConfigHolder.U.machines.highTierMassFabricators || + ConfigHolder.U.machines.highTierReplicators || + ConfigHolder.U.machines.highTierScanners; } diff --git a/src/main/java/gregtech/api/GregTechAPI.java b/src/main/java/gregtech/api/GregTechAPI.java index b75d09c8be9..0467fa1f05d 100644 --- a/src/main/java/gregtech/api/GregTechAPI.java +++ b/src/main/java/gregtech/api/GregTechAPI.java @@ -22,11 +22,11 @@ public class GregTechAPI { public static final Map> oreBlockTable = new HashMap<>(); public static final BaseCreativeTab TAB_GREGTECH = - new BaseCreativeTab(GTValues.MODID + ".main", () -> MetaItems.BATTERY_HULL_HV.getStackForm(), true); + new BaseCreativeTab(GTValues.MODID + ".main", () -> MetaItems.BATTERY_HULL_HV.getStackForm(), true); public static final BaseCreativeTab TAB_GREGTECH_MATERIALS = - new BaseCreativeTab(GTValues.MODID + ".materials", () -> OreDictUnifier.get(OrePrefix.ingot, Materials.Aluminium), true); + new BaseCreativeTab(GTValues.MODID + ".materials", () -> OreDictUnifier.get(OrePrefix.ingot, Materials.Aluminium), true); public static final BaseCreativeTab TAB_GREGTECH_ORES = - new BaseCreativeTab(GTValues.MODID + ".ores", () -> MetaItems.DRILL_MV.getStackForm(), true); + new BaseCreativeTab(GTValues.MODID + ".ores", () -> MetaItems.DRILL_MV.getStackForm(), true); public static final GTControlledRegistry META_TILE_ENTITY_REGISTRY = new GTControlledRegistry<>(Short.MAX_VALUE); diff --git a/src/main/java/gregtech/api/block/machines/BlockMachine.java b/src/main/java/gregtech/api/block/machines/BlockMachine.java index 60611482e2c..419d3754d50 100755 --- a/src/main/java/gregtech/api/block/machines/BlockMachine.java +++ b/src/main/java/gregtech/api/block/machines/BlockMachine.java @@ -20,11 +20,11 @@ import gregtech.api.pipenet.block.BlockPipe; import gregtech.api.pipenet.tile.AttachmentType; import gregtech.api.pipenet.tile.IPipeTile; +import gregtech.api.render.IBlockAppearance; import gregtech.api.render.MetaTileEntityRenderer; import gregtech.api.util.GTUtility; import gregtech.common.ConfigHolder; import gregtech.common.tools.DamageValues; -import gregtech.api.render.IBlockAppearance; import gregtech.integration.ctm.IFacadeWrapper; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; @@ -121,8 +121,8 @@ public IBlockState getActualState(@Nonnull IBlockState state, @Nonnull IBlockAcc return state; return ((IExtendedBlockState) state) - .withProperty(HARVEST_TOOL, metaTileEntity.getHarvestTool() == null ? "wrench" : metaTileEntity.getHarvestTool()) - .withProperty(HARVEST_LEVEL, metaTileEntity.getHarvestLevel()); + .withProperty(HARVEST_TOOL, metaTileEntity.getHarvestTool() == null ? "wrench" : metaTileEntity.getHarvestTool()) + .withProperty(HARVEST_LEVEL, metaTileEntity.getHarvestLevel()); } @Nonnull @@ -204,9 +204,9 @@ public RayTraceResult collisionRayTrace(@Nonnull IBlockState blockState, @Nonnul public boolean rotateBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing axis) { MetaTileEntity metaTileEntity = getMetaTileEntity(world, pos); if (metaTileEntity == null || - !metaTileEntity.isValidFrontFacing(axis) || - metaTileEntity.getFrontFacing() == axis || - !metaTileEntity.hasFrontFacing()) + !metaTileEntity.isValidFrontFacing(axis) || + metaTileEntity.getFrontFacing() == axis || + !metaTileEntity.hasFrontFacing()) return false; metaTileEntity.setFrontFacing(axis); return true; @@ -218,15 +218,15 @@ public EnumFacing[] getValidRotations(@Nonnull World world, @Nonnull BlockPos po MetaTileEntity metaTileEntity = getMetaTileEntity(world, pos); if (metaTileEntity == null || !metaTileEntity.hasFrontFacing()) return null; return Arrays.stream(EnumFacing.VALUES) - .filter(metaTileEntity::isValidFrontFacing) - .toArray(EnumFacing[]::new); + .filter(metaTileEntity::isValidFrontFacing) + .toArray(EnumFacing[]::new); } @Override public boolean recolorBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side, @Nonnull EnumDyeColor color) { MetaTileEntity metaTileEntity = getMetaTileEntity(world, pos); if (metaTileEntity == null || - metaTileEntity.getPaintingColor() == color.colorValue) + metaTileEntity.getPaintingColor() == color.colorValue) return false; metaTileEntity.setPaintingColor(color.colorValue); return true; @@ -258,9 +258,9 @@ public void onBlockPlacedBy(World worldIn, @Nonnull BlockPos pos, @Nonnull IBloc pipePos = rt2.getBlockPos(); if (pipePos != null) { Block block = worldIn.getBlockState(pipePos).getBlock(); - if(block instanceof BlockPipe) { + if (block instanceof BlockPipe) { IPipeTile pipeTile = ((BlockPipe) block).getPipeTileEntity(worldIn, pipePos); - if(((BlockPipe) block).canPipeConnectToBlock(pipeTile, facing.getOpposite(), worldIn.getTileEntity(pos))) { + if (((BlockPipe) block).canPipeConnectToBlock(pipeTile, facing.getOpposite(), worldIn.getTileEntity(pos))) { pipeTile.setConnectionBlocked(AttachmentType.PIPE, facing.getOpposite(), false, false); } } @@ -319,7 +319,7 @@ public boolean onBlockActivated(@Nonnull World worldIn, @Nonnull BlockPos pos, @ IScrewdriverItem screwdriver = itemStack.getCapability(GregtechCapabilities.CAPABILITY_SCREWDRIVER, null); if (screwdriver.damageItem(DamageValues.DAMAGE_FOR_SCREWDRIVER, true) && - metaTileEntity.onCoverScrewdriverClick(playerIn, hand, rayTraceResult)) { + metaTileEntity.onCoverScrewdriverClick(playerIn, hand, rayTraceResult)) { screwdriver.damageItem(DamageValues.DAMAGE_FOR_SCREWDRIVER, false); return true; } @@ -331,7 +331,7 @@ public boolean onBlockActivated(@Nonnull World worldIn, @Nonnull BlockPos pos, @ EnumFacing wrenchDirection = ICoverable.determineGridSideHit(rayTraceResult); if (wrenchItem.damageItem(DamageValues.DAMAGE_FOR_WRENCH, true) && - metaTileEntity.onWrenchClick(playerIn, hand, wrenchDirection, rayTraceResult)) { + metaTileEntity.onWrenchClick(playerIn, hand, wrenchDirection, rayTraceResult)) { wrenchItem.damageItem(DamageValues.DAMAGE_FOR_WRENCH, false); return true; } diff --git a/src/main/java/gregtech/api/block/machines/MachineItemBlock.java b/src/main/java/gregtech/api/block/machines/MachineItemBlock.java index 1e564d9aa6e..99463f7f382 100644 --- a/src/main/java/gregtech/api/block/machines/MachineItemBlock.java +++ b/src/main/java/gregtech/api/block/machines/MachineItemBlock.java @@ -48,7 +48,7 @@ public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer play //prevent rendering glitch before meta tile entity sync to client, but after block placement //set opaque property on the placing on block, instead during set of meta tile entity return super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, - newState.withProperty(BlockMachine.OPAQUE, metaTileEntity != null && metaTileEntity.isOpaqueCube())); + newState.withProperty(BlockMachine.OPAQUE, metaTileEntity != null && metaTileEntity.isOpaqueCube())); } @Nullable diff --git a/src/main/java/gregtech/api/capability/IEnergyContainer.java b/src/main/java/gregtech/api/capability/IEnergyContainer.java index 341eadfadca..241104c2c81 100644 --- a/src/main/java/gregtech/api/capability/IEnergyContainer.java +++ b/src/main/java/gregtech/api/capability/IEnergyContainer.java @@ -23,6 +23,7 @@ default boolean outputsEnergy(EnumFacing side) { /** * Adds specified amount of energy to this energy container + * * @param energyToAdd amount of energy to add * @return amount of energy added */ @@ -32,6 +33,7 @@ default long addEnergy(long energyToAdd) { /** * Removes specified amount of energy from this energy container + * * @param energyToRemove amount of energy to remove * @return amount of energy removed */ @@ -82,4 +84,4 @@ default boolean isOneProbeHidden() { return false; } -} \ No newline at end of file +} diff --git a/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java index 37e2405af38..64a6da05fe4 100755 --- a/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java +++ b/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java @@ -105,9 +105,9 @@ public int getNetworkID() { @Override public T getCapability(Capability capability) { - if(capability == GregtechTileCapabilities.CAPABILITY_WORKABLE) { + if (capability == GregtechTileCapabilities.CAPABILITY_WORKABLE) { return GregtechTileCapabilities.CAPABILITY_WORKABLE.cast(this); - } else if(capability == GregtechTileCapabilities.CAPABILITY_CONTROLLABLE) { + } else if (capability == GregtechTileCapabilities.CAPABILITY_CONTROLLABLE) { return GregtechTileCapabilities.CAPABILITY_CONTROLLABLE.cast(this); } return null; @@ -182,11 +182,11 @@ public void forceRecipeRecheck() { } protected int getMinTankCapacity(IMultipleTankHandler tanks) { - if(tanks.getTanks() == 0) { + if (tanks.getTanks() == 0) { return 0; } int result = Integer.MAX_VALUE; - for(IFluidTank fluidTank : tanks.getFluidTanks()) { + for (IFluidTank fluidTank : tanks.getFluidTanks()) { result = Math.min(fluidTank.getCapacity(), result); } return result; @@ -220,11 +220,11 @@ protected boolean checkRecipeInputsDirty(IItemHandler inputs, IMultipleTankHandl FluidStack currentStack = fluidInputs.getTankAt(i).getFluid(); FluidStack lastStack = lastFluidInputs[i]; if ((currentStack == null && lastStack != null) || - (currentStack != null && !currentStack.isFluidEqual(lastStack))) { + (currentStack != null && !currentStack.isFluidEqual(lastStack))) { this.lastFluidInputs[i] = currentStack == null ? null : currentStack.copy(); shouldRecheckRecipe = true; } else if (currentStack != null && lastStack != null && - currentStack.amount != lastStack.amount) { + currentStack.amount != lastStack.amount) { lastStack.amount = currentStack.amount; shouldRecheckRecipe = true; } @@ -234,8 +234,8 @@ protected boolean checkRecipeInputsDirty(IItemHandler inputs, IMultipleTankHandl protected static boolean areItemStacksEqual(ItemStack stackA, ItemStack stackB) { return (stackA.isEmpty() && stackB.isEmpty()) || - (ItemStack.areItemsEqual(stackA, stackB) && - ItemStack.areItemStackTagsEqual(stackA, stackB)); + (ItemStack.areItemsEqual(stackA, stackB) && + ItemStack.areItemStackTagsEqual(stackA, stackB)); } protected boolean setupAndConsumeRecipeInputs(Recipe recipe) { @@ -246,10 +246,10 @@ protected boolean setupAndConsumeRecipeInputs(Recipe recipe) { IMultipleTankHandler importFluids = getInputTank(); IMultipleTankHandler exportFluids = getOutputTank(); return (totalEUt >= 0 ? getEnergyStored() >= (totalEUt > getEnergyCapacity() / 2 ? resultOverclock[0] : totalEUt) : - (getEnergyStored() - resultOverclock[0] <= getEnergyCapacity())) && - MetaTileEntity.addItemsToItemHandler(exportInventory, true, recipe.getAllItemOutputs(exportInventory.getSlots())) && - MetaTileEntity.addFluidsToFluidHandler(exportFluids, true, recipe.getFluidOutputs()) && - recipe.matches(true, importInventory, importFluids); + (getEnergyStored() - resultOverclock[0] <= getEnergyCapacity())) && + MetaTileEntity.addItemsToItemHandler(exportInventory, true, recipe.getAllItemOutputs(exportInventory.getSlots())) && + MetaTileEntity.addFluidsToFluidHandler(exportFluids, true, recipe.getFluidOutputs()) && + recipe.matches(true, importInventory, importFluids); } protected int[] calculateOverclock(int EUt, int duration) { @@ -258,7 +258,7 @@ protected int[] calculateOverclock(int EUt, int duration) { protected int[] calculateOverclock(int EUt, long voltage, int duration) { if (!allowOverclocking) { - return new int[] {EUt, duration}; + return new int[]{EUt, duration}; } boolean negativeEU = EUt < 0; int tier = getOverclockingTier(voltage); @@ -414,7 +414,7 @@ public void setOverclockVoltage(final long overclockVoltage) { * Sets the overclocking policy to use getOverclockVoltage() instead of getMaxVoltage() * and initialises the overclock voltage to max voltage. * The actual value will come from the saved tag when the tile is loaded for pre-existing machines. - * + *

* NOTE: This should only be used directly after construction of the workable. * Use setOverclockVoltage() or setOverclockTier() for a more dynamic use case. */ @@ -485,7 +485,7 @@ public NBTTagCompound serializeNBT() { public void deserializeNBT(NBTTagCompound compound) { this.workingEnabled = compound.getBoolean("WorkEnabled"); this.progressTime = compound.getInteger("Progress"); - if(compound.hasKey(ALLOW_OVERCLOCKING)) { + if (compound.hasKey(ALLOW_OVERCLOCKING)) { this.allowOverclocking = compound.getBoolean(ALLOW_OVERCLOCKING); } if (compound.hasKey(OVERCLOCK_VOLTAGE)) { diff --git a/src/main/java/gregtech/api/capability/impl/EnergyContainerBatteryBuffer.java b/src/main/java/gregtech/api/capability/impl/EnergyContainerBatteryBuffer.java index 08dfea4aa18..2432653ee7d 100644 --- a/src/main/java/gregtech/api/capability/impl/EnergyContainerBatteryBuffer.java +++ b/src/main/java/gregtech/api/capability/impl/EnergyContainerBatteryBuffer.java @@ -52,7 +52,7 @@ public long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage } } long amperageUsed = initialAmperage - amperage; - if(amperageUsed > 0L) { + if (amperageUsed > 0L) { notifyEnergyListener(false); } return amperageUsed; @@ -155,7 +155,7 @@ public long getInputAmperage() { public IElectricItem getBatteryContainer(ItemStack itemStack) { IElectricItem electricItem = itemStack.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null); if (electricItem != null && getTier() >= electricItem.getTier() && - electricItem.canProvideChargeExternally()) + electricItem.canProvideChargeExternally()) return electricItem; return null; } @@ -172,10 +172,10 @@ public long changeEnergy(long energyToAdd) { if (electricItem == null) continue; long charged = chargeItem(electricItem, energyToAdd, getTier(), isDischarge); energyToAdd -= charged; - if(energyToAdd == 0L) break; + if (energyToAdd == 0L) break; } long energyAdded = initialEnergyToAdd - energyToAdd; - if(energyAdded > 0L) { + if (energyAdded > 0L) { notifyEnergyListener(false); } return energyAdded; @@ -230,7 +230,7 @@ public int getNetworkID() { @Override public T getCapability(Capability capability) { - if(capability == GregtechCapabilities.CAPABILITY_ENERGY_CONTAINER) { + if (capability == GregtechCapabilities.CAPABILITY_ENERGY_CONTAINER) { return GregtechCapabilities.CAPABILITY_ENERGY_CONTAINER.cast(this); } return null; diff --git a/src/main/java/gregtech/api/capability/impl/EnergyContainerHandler.java b/src/main/java/gregtech/api/capability/impl/EnergyContainerHandler.java index b17ed025bbc..9a22a0cd20b 100644 --- a/src/main/java/gregtech/api/capability/impl/EnergyContainerHandler.java +++ b/src/main/java/gregtech/api/capability/impl/EnergyContainerHandler.java @@ -66,7 +66,7 @@ public int getNetworkID() { @Override public T getCapability(Capability capability) { - if(capability == GregtechCapabilities.CAPABILITY_ENERGY_CONTAINER) { + if (capability == GregtechCapabilities.CAPABILITY_ENERGY_CONTAINER) { return GregtechCapabilities.CAPABILITY_ENERGY_CONTAINER.cast(this); } return null; diff --git a/src/main/java/gregtech/api/capability/impl/EnergyContainerList.java b/src/main/java/gregtech/api/capability/impl/EnergyContainerList.java index eefd18977cb..04de92b43fb 100644 --- a/src/main/java/gregtech/api/capability/impl/EnergyContainerList.java +++ b/src/main/java/gregtech/api/capability/impl/EnergyContainerList.java @@ -36,15 +36,15 @@ public long changeEnergy(long energyToAdd) { @Override public long getEnergyStored() { return energyContainerList.stream() - .mapToLong(IEnergyContainer::getEnergyStored) - .sum(); + .mapToLong(IEnergyContainer::getEnergyStored) + .sum(); } @Override public long getEnergyCapacity() { return energyContainerList.stream() - .mapToLong(IEnergyContainer::getEnergyCapacity) - .sum(); + .mapToLong(IEnergyContainer::getEnergyCapacity) + .sum(); } @Override @@ -60,15 +60,15 @@ public long getOutputAmperage() { @Override public long getInputVoltage() { return energyContainerList.stream() - .mapToLong(v -> v.getInputVoltage() * v.getInputAmperage()) - .sum(); + .mapToLong(v -> v.getInputVoltage() * v.getInputAmperage()) + .sum(); } @Override public long getOutputVoltage() { return energyContainerList.stream() - .mapToLong(v -> v.getOutputVoltage() * v.getOutputAmperage()) - .sum(); + .mapToLong(v -> v.getOutputVoltage() * v.getOutputAmperage()) + .sum(); } @Override diff --git a/src/main/java/gregtech/api/capability/impl/FuelRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/FuelRecipeLogic.java index ddf4858877b..f05ac63b9ab 100755 --- a/src/main/java/gregtech/api/capability/impl/FuelRecipeLogic.java +++ b/src/main/java/gregtech/api/capability/impl/FuelRecipeLogic.java @@ -88,8 +88,7 @@ public Collection getFuels() { if (fuelInfo == null) { fuelInfo = new FluidFuelInfo(tankContents, fuelRemaining, fuelCapacity, amountPerRecipe, fuelBurnTime); fuels.put(tankContents.getUnlocalizedName(), fuelInfo); - } - else { + } else { fuelInfo.addFuelRemaining(fuelRemaining); fuelInfo.addFuelBurnTime(fuelBurnTime); } @@ -99,10 +98,10 @@ public Collection getFuels() { @Override public T getCapability(Capability capability) { - if(capability == GregtechTileCapabilities.CAPABILITY_CONTROLLABLE) { + if (capability == GregtechTileCapabilities.CAPABILITY_CONTROLLABLE) { return GregtechTileCapabilities.CAPABILITY_CONTROLLABLE.cast(this); } - if(capability == GregtechCapabilities.CAPABILITY_FUELABLE) { + if (capability == GregtechCapabilities.CAPABILITY_FUELABLE) { return GregtechCapabilities.CAPABILITY_FUELABLE.cast(this); } return null; @@ -114,7 +113,7 @@ public void update() { if (workingEnabled) { if (recipeDurationLeft > 0) { if (energyContainer.get().getEnergyCanBeInserted() >= - recipeOutputVoltage || shouldVoidExcessiveEnergy()) { + recipeOutputVoltage || shouldVoidExcessiveEnergy()) { energyContainer.get().addEnergy(recipeOutputVoltage); if (--this.recipeDurationLeft == 0) { this.wasActiveAndNeedsUpdate = true; @@ -132,7 +131,7 @@ public void update() { } protected boolean isReadyForRecipes() { - return true; + return true; } protected boolean shouldVoidExcessiveEnergy() { diff --git a/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java index 312a8aa1593..7dc2a72f927 100644 --- a/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java +++ b/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java @@ -65,7 +65,7 @@ protected IMultipleTankHandler getOutputTank() { protected boolean setupAndConsumeRecipeInputs(Recipe recipe) { RecipeMapMultiblockController controller = (RecipeMapMultiblockController) metaTileEntity; if (controller.checkRecipe(recipe, false) && - super.setupAndConsumeRecipeInputs(recipe)) { + super.setupAndConsumeRecipeInputs(recipe)) { controller.checkRecipe(recipe, true); return true; } else return false; diff --git a/src/main/java/gregtech/api/capability/impl/RecipeLogicEnergy.java b/src/main/java/gregtech/api/capability/impl/RecipeLogicEnergy.java index ff4c58e5d33..e89f3d1e78d 100644 --- a/src/main/java/gregtech/api/capability/impl/RecipeLogicEnergy.java +++ b/src/main/java/gregtech/api/capability/impl/RecipeLogicEnergy.java @@ -37,7 +37,7 @@ protected boolean drawEnergy(int recipeEUt) { @Override protected long getMaxVoltage() { return Math.max(energyContainer.get().getInputVoltage(), - energyContainer.get().getOutputVoltage()); + energyContainer.get().getOutputVoltage()); } } diff --git a/src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java b/src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java index d75c6c8b382..c33252a0bdb 100644 --- a/src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java +++ b/src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java @@ -118,18 +118,18 @@ protected void tryDoVenting() { IBlockState blockOnPos = metaTileEntity.getWorld().getBlockState(ventingBlockPos); if (blockOnPos.getCollisionBoundingBox(metaTileEntity.getWorld(), ventingBlockPos) == Block.NULL_AABB) { metaTileEntity.getWorld() - .getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(ventingBlockPos), EntitySelectors.CAN_AI_TARGET) - .forEach(entity -> entity.attackEntityFrom(DamageSources.getHeatDamage(), this.isHighPressure ? 12.0f : 6.0f)); + .getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(ventingBlockPos), EntitySelectors.CAN_AI_TARGET) + .forEach(entity -> entity.attackEntityFrom(DamageSources.getHeatDamage(), this.isHighPressure ? 12.0f : 6.0f)); WorldServer world = (WorldServer) metaTileEntity.getWorld(); double posX = machinePos.getX() + 0.5 + ventingSide.getXOffset() * 0.6; double posY = machinePos.getY() + 0.5 + ventingSide.getYOffset() * 0.6; double posZ = machinePos.getZ() + 0.5 + ventingSide.getZOffset() * 0.6; world.spawnParticle(EnumParticleTypes.SMOKE_LARGE, posX, posY, posZ, - 7 + world.rand.nextInt(3), - ventingSide.getXOffset() / 2.0, - ventingSide.getYOffset() / 2.0, - ventingSide.getZOffset() / 2.0, 0.1); + 7 + world.rand.nextInt(3), + ventingSide.getXOffset() / 2.0, + ventingSide.getYOffset() / 2.0, + ventingSide.getZOffset() / 2.0, 0.1); world.playSound(null, posX, posY, posZ, SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.BLOCKS, 1.0f, 1.0f); setNeedsVenting(false); } else if (!ventingStuck) { @@ -181,7 +181,7 @@ protected long getEnergyCapacity() { protected boolean drawEnergy(int recipeEUt) { int resultDraw = (int) Math.ceil(recipeEUt / conversionRate); return resultDraw >= 0 && steamFluidTank.getFluidAmount() >= resultDraw && - steamFluidTank.drain(resultDraw, true) != null; + steamFluidTank.drain(resultDraw, true) != null; } @Override diff --git a/src/main/java/gregtech/api/capability/impl/RecipeMapSteamMultiblockController.java b/src/main/java/gregtech/api/capability/impl/RecipeMapSteamMultiblockController.java index 568ef289907..249807a586e 100644 --- a/src/main/java/gregtech/api/capability/impl/RecipeMapSteamMultiblockController.java +++ b/src/main/java/gregtech/api/capability/impl/RecipeMapSteamMultiblockController.java @@ -1,8 +1,6 @@ package gregtech.api.capability.impl; import gregtech.api.capability.IMultipleTankHandler; -import gregtech.api.capability.impl.FluidTankList; -import gregtech.api.capability.impl.ItemHandlerList; import gregtech.api.metatileentity.multiblock.IMultiblockPart; import gregtech.api.metatileentity.multiblock.MultiblockAbility; import gregtech.api.metatileentity.multiblock.MultiblockWithDisplayBase; diff --git a/src/main/java/gregtech/api/capability/impl/SimpleThermalFluidHandlerItemStack.java b/src/main/java/gregtech/api/capability/impl/SimpleThermalFluidHandlerItemStack.java index d8666903759..cb5eaeb43d0 100644 --- a/src/main/java/gregtech/api/capability/impl/SimpleThermalFluidHandlerItemStack.java +++ b/src/main/java/gregtech/api/capability/impl/SimpleThermalFluidHandlerItemStack.java @@ -43,7 +43,7 @@ public FluidStack drain(int maxDrain, boolean doDrain) { } private void removeTagWhenEmpty(Boolean doDrain) { - if(doDrain && this.getFluid() == null) { + if (doDrain && this.getFluid() == null) { this.container.setTagCompound(null); } } diff --git a/src/main/java/gregtech/api/capability/impl/SteamMultiWorkable.java b/src/main/java/gregtech/api/capability/impl/SteamMultiWorkable.java index bee834ecf16..3bb9f1f8d7f 100644 --- a/src/main/java/gregtech/api/capability/impl/SteamMultiWorkable.java +++ b/src/main/java/gregtech/api/capability/impl/SteamMultiWorkable.java @@ -35,7 +35,7 @@ protected void trySearchNewRecipe() { IItemHandlerModifiable importInventory = getInputInventory(); boolean dirty = checkRecipeInputsDirty(importInventory, null); - if(dirty || forceRecipeRecheck) { + if (dirty || forceRecipeRecheck) { this.forceRecipeRecheck = false; currentRecipe = findRecipe(maxVoltage, importInventory, null, MatchingMode.DEFAULT); @@ -63,7 +63,7 @@ protected Recipe findRecipe(long maxVoltage, IItemHandlerModifiable inputs, IMul /* Iterate over input items looking for more items to process until we * have touched every item, or are at maximum item capacity */ - for (int index = 0; index < inputs.getSlots() && currentItemsEngaged < MAX_PROCESSES; index ++) { + for (int index = 0; index < inputs.getSlots() && currentItemsEngaged < MAX_PROCESSES; index++) { final ItemStack currentInputItem = inputs.getStackInSlot(index); // Skip slot if empty @@ -128,19 +128,19 @@ protected Recipe findRecipe(long maxVoltage, IItemHandlerModifiable inputs, IMul return recipeMap.recipeBuilder() .inputsIngredients(recipeInputs) .outputs(recipeOutputs) - .EUt(Math.min(32, (int)Math.ceil(recipeEUt * 1.33))) - .duration(Math.max(recipeDuration, (int)(recipeDuration * (100.0F / (100.0F + speedBonusPercent)) * 1.5))) + .EUt(Math.min(32, (int) Math.ceil(recipeEUt * 1.33))) + .duration(Math.max(recipeDuration, (int) (recipeDuration * (100.0F / (100.0F + speedBonusPercent)) * 1.5))) .build().getResult(); } private void computeOutputItemStacks(Collection recipeOutputs, ItemStack outputStack, int recipeAmount) { - if(!outputStack.isEmpty()) { + if (!outputStack.isEmpty()) { int finalAmount = outputStack.getCount() * recipeAmount; int maxCount = outputStack.getMaxStackSize(); int numStacks = finalAmount / maxCount; int remainder = finalAmount % maxCount; - for(int fullStacks = numStacks; fullStacks > 0; fullStacks--) { + for (int fullStacks = numStacks; fullStacks > 0; fullStacks--) { ItemStack full = outputStack.copy(); full.setCount(maxCount); recipeOutputs.add(full); @@ -159,7 +159,7 @@ private Recipe doChancedOnlyRecipe(Recipe matchingRecipe, ItemStack stack) { RecipeBuilder builder = recipeMap.recipeBuilder() .inputs(new CountableIngredient(matchingRecipe.getInputs().get(0).getIngredient(), stack.getCount())) .EUt(Math.min(32, (int) Math.ceil(matchingRecipe.getEUt() * 1.33))) - .duration((int)(matchingRecipe.getDuration() * 1.5)); + .duration((int) (matchingRecipe.getDuration() * 1.5)); Recipe.ChanceEntry entry = matchingRecipe.getChancedOutputs().get(0); int maxProcesses = Math.min(MAX_PROCESSES, stack.getCount()); diff --git a/src/main/java/gregtech/api/capability/impl/ThermalFluidHandlerItemStack.java b/src/main/java/gregtech/api/capability/impl/ThermalFluidHandlerItemStack.java index 8598babad39..31abb425b1f 100644 --- a/src/main/java/gregtech/api/capability/impl/ThermalFluidHandlerItemStack.java +++ b/src/main/java/gregtech/api/capability/impl/ThermalFluidHandlerItemStack.java @@ -42,7 +42,7 @@ public FluidStack drain(int maxDrain, boolean doDrain) { } private void removeTagWhenEmpty(Boolean doDrain) { - if(doDrain && this.getFluid() == null) { + if (doDrain && this.getFluid() == null) { this.container.setTagCompound(null); } } diff --git a/src/main/java/gregtech/api/capability/impl/VoidFluidHandlerItemStack.java b/src/main/java/gregtech/api/capability/impl/VoidFluidHandlerItemStack.java index 507b62db7e4..2cfbab45a9b 100755 --- a/src/main/java/gregtech/api/capability/impl/VoidFluidHandlerItemStack.java +++ b/src/main/java/gregtech/api/capability/impl/VoidFluidHandlerItemStack.java @@ -4,10 +4,11 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack; -import static net.minecraftforge.fluids.capability.templates.EmptyFluidHandler.EMPTY_TANK_PROPERTIES_ARRAY; import javax.annotation.Nonnull; +import static net.minecraftforge.fluids.capability.templates.EmptyFluidHandler.EMPTY_TANK_PROPERTIES_ARRAY; + /** * Implements an item that voids fluids */ @@ -15,7 +16,7 @@ public class VoidFluidHandlerItemStack extends FluidHandlerItemStack { /** * Voids as much fluid as you can throw at it - * + * * @param container The container itemStack. */ public VoidFluidHandlerItemStack(@Nonnull ItemStack container) { @@ -24,9 +25,9 @@ public VoidFluidHandlerItemStack(@Nonnull ItemStack container) { /** * Voids fluid a certain amount at a time - * + * * @param container The container itemStack. - * @param capacity max amount to void in each operation + * @param capacity max amount to void in each operation */ public VoidFluidHandlerItemStack(@Nonnull ItemStack container, final int capacity) { super(container, capacity); diff --git a/src/main/java/gregtech/api/cover/CoverBehavior.java b/src/main/java/gregtech/api/cover/CoverBehavior.java index 32f5fab675d..e4a1765302c 100644 --- a/src/main/java/gregtech/api/cover/CoverBehavior.java +++ b/src/main/java/gregtech/api/cover/CoverBehavior.java @@ -76,7 +76,7 @@ public boolean canConnectRedstone() { } public void writeToNBT(NBTTagCompound tagCompound) { - if(redstoneSignalOutput > 0) { + if (redstoneSignalOutput > 0) { tagCompound.setInteger("RedstoneSignal", redstoneSignalOutput); } } @@ -132,7 +132,7 @@ public List getDrops() { */ public void onRemoved() { } - + public boolean shouldRenderConnected() { return true; } diff --git a/src/main/java/gregtech/api/cover/ICoverable.java b/src/main/java/gregtech/api/cover/ICoverable.java index ea7df5cc21a..061223ca08f 100644 --- a/src/main/java/gregtech/api/cover/ICoverable.java +++ b/src/main/java/gregtech/api/cover/ICoverable.java @@ -71,8 +71,8 @@ public interface ICoverable { default void renderCovers(CCRenderState renderState, Matrix4 translation, BlockRenderLayer layer) { renderState.lightMatrix.locate(getWorld(), getPos()); double coverPlateThickness = getCoverPlateThickness(); - IVertexOperation[] platePipeline = new IVertexOperation[] {new ColourMultiplier(GTUtility.convertRGBtoOpaqueRGBA_CL(getPaintingColor()))}; - IVertexOperation[] coverPipeline = new IVertexOperation[] {renderState.lightMatrix}; + IVertexOperation[] platePipeline = new IVertexOperation[]{new ColourMultiplier(GTUtility.convertRGBtoOpaqueRGBA_CL(getPaintingColor()))}; + IVertexOperation[] coverPipeline = new IVertexOperation[]{renderState.lightMatrix}; for (EnumFacing sideFacing : EnumFacing.values()) { CoverBehavior coverBehavior = getCoverAtSide(sideFacing); @@ -164,7 +164,7 @@ static EnumFacing traceCoverSide(RayTraceResult result) { return ((CoverSideData) rayTraceResult.cuboid6.data).side; } else if (rayTraceResult.cuboid6.data instanceof BlockPipe.PipeConnectionData) { return ((PipeConnectionData) rayTraceResult.cuboid6.data).side; - } else if(rayTraceResult.cuboid6.data instanceof PrimaryBoxData) { + } else if (rayTraceResult.cuboid6.data instanceof PrimaryBoxData) { PrimaryBoxData primaryBoxData = (PrimaryBoxData) rayTraceResult.cuboid6.data; return primaryBoxData.usePlacementGrid ? determineGridSideHit(result) : result.sideHit; } //unknown hit type, fall through @@ -175,20 +175,27 @@ static EnumFacing traceCoverSide(RayTraceResult result) { static EnumFacing determineGridSideHit(RayTraceResult result) { return GTUtility.determineWrenchingSide(result.sideHit, - (float) (result.hitVec.x - result.getBlockPos().getX()), - (float) (result.hitVec.y - result.getBlockPos().getY()), - (float) (result.hitVec.z - result.getBlockPos().getZ())); + (float) (result.hitVec.x - result.getBlockPos().getX()), + (float) (result.hitVec.y - result.getBlockPos().getY()), + (float) (result.hitVec.z - result.getBlockPos().getZ())); } static Cuboid6 getCoverPlateBox(EnumFacing side, double plateThickness) { switch (side) { - case UP: return new Cuboid6(0.0, 1.0 - plateThickness, 0.0, 1.0, 1.0, 1.0); - case DOWN: return new Cuboid6(0.0, 0.0, 0.0, 1.0, plateThickness, 1.0); - case NORTH: return new Cuboid6(0.0, 0.0, 0.0, 1.0, 1.0, plateThickness); - case SOUTH: return new Cuboid6(0.0, 0.0, 1.0 - plateThickness, 1.0, 1.0, 1.0); - case WEST: return new Cuboid6(0.0, 0.0, 0.0, plateThickness, 1.0, 1.0); - case EAST: return new Cuboid6(1.0 - plateThickness, 0.0, 0.0, 1.0, 1.0, 1.0); - default: throw new UnsupportedOperationException(); + case UP: + return new Cuboid6(0.0, 1.0 - plateThickness, 0.0, 1.0, 1.0, 1.0); + case DOWN: + return new Cuboid6(0.0, 0.0, 0.0, 1.0, plateThickness, 1.0); + case NORTH: + return new Cuboid6(0.0, 0.0, 0.0, 1.0, 1.0, plateThickness); + case SOUTH: + return new Cuboid6(0.0, 0.0, 1.0 - plateThickness, 1.0, 1.0, 1.0); + case WEST: + return new Cuboid6(0.0, 0.0, 0.0, plateThickness, 1.0, 1.0); + case EAST: + return new Cuboid6(1.0 - plateThickness, 0.0, 0.0, 1.0, 1.0, 1.0); + default: + throw new UnsupportedOperationException(); } } } diff --git a/src/main/java/gregtech/api/gui/IScissored.java b/src/main/java/gregtech/api/gui/IScissored.java index 7f93a85063f..3ee4a44f251 100755 --- a/src/main/java/gregtech/api/gui/IScissored.java +++ b/src/main/java/gregtech/api/gui/IScissored.java @@ -1,6 +1,6 @@ package gregtech.api.gui; -import java.awt.Rectangle; +import java.awt.*; public interface IScissored { diff --git a/src/main/java/gregtech/api/gui/ModularUI.java b/src/main/java/gregtech/api/gui/ModularUI.java index ea8902d5ba8..6296f508292 100644 --- a/src/main/java/gregtech/api/gui/ModularUI.java +++ b/src/main/java/gregtech/api/gui/ModularUI.java @@ -197,8 +197,8 @@ public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, TextureArea for (int row = 0; row < 3; row++) { for (int col = 0; col < 9; col++) { this.widget(new SlotWidget(inventoryPlayer, col + (row + 1) * 9, x + col * 18, y + row * 18) - .setBackgroundTexture(imageLocation) - .setLocationInfo(true, false)); + .setBackgroundTexture(imageLocation) + .setLocationInfo(true, false)); } } return bindPlayerHotbar(inventoryPlayer, imageLocation, x, y + 58); @@ -207,8 +207,8 @@ public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, TextureArea public Builder bindPlayerHotbar(InventoryPlayer inventoryPlayer, TextureArea imageLocation, int x, int y) { for (int slot = 0; slot < 9; slot++) { this.widget(new SlotWidget(inventoryPlayer, slot, x + slot * 18, y) - .setBackgroundTexture(imageLocation) - .setLocationInfo(true, true)); + .setBackgroundTexture(imageLocation) + .setLocationInfo(true, true)); } return this; } diff --git a/src/main/java/gregtech/api/gui/Widget.java b/src/main/java/gregtech/api/gui/Widget.java index 4fccba4dc1e..0b4213fe7b9 100644 --- a/src/main/java/gregtech/api/gui/Widget.java +++ b/src/main/java/gregtech/api/gui/Widget.java @@ -236,8 +236,8 @@ protected final void writeClientAction(int id, Consumer packetBuff protected void drawHoveringText(ItemStack itemStack, List tooltip, int maxTextWidth, int mouseX, int mouseY) { Minecraft mc = Minecraft.getMinecraft(); GuiUtils.drawHoveringText(itemStack, tooltip, mouseX, mouseY, - sizes.getScreenWidth(), - sizes.getScreenHeight(), maxTextWidth, mc.fontRenderer); + sizes.getScreenWidth(), + sizes.getScreenHeight(), maxTextWidth, mc.fontRenderer); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/gregtech/api/gui/impl/ModularUIContainer.java b/src/main/java/gregtech/api/gui/impl/ModularUIContainer.java index 8a090230eef..94e627b76bb 100644 --- a/src/main/java/gregtech/api/gui/impl/ModularUIContainer.java +++ b/src/main/java/gregtech/api/gui/impl/ModularUIContainer.java @@ -35,12 +35,12 @@ public ModularUIContainer(ModularUI modularUI) { this.modularUI = modularUI; modularUI.guiWidgets.values().forEach(widget -> widget.setUiAccess(this)); modularUI.guiWidgets.values().stream() - .flatMap(widget -> widget.getNativeWidgets().stream()) - .forEach(nativeWidget -> { - Slot slot = nativeWidget.getHandle(); - slotMap.put(slot, nativeWidget); - addSlotToContainer(slot); - }); + .flatMap(widget -> widget.getNativeWidgets().stream()) + .forEach(nativeWidget -> { + Slot slot = nativeWidget.getHandle(); + slotMap.put(slot, nativeWidget); + addSlotToContainer(slot); + }); modularUI.triggerOpenListeners(); } @@ -53,13 +53,13 @@ public void notifySizeChange() { @Override public void notifyWidgetChange() { List nativeWidgets = modularUI.guiWidgets.values().stream() - .flatMap(widget -> widget.getNativeWidgets().stream()) - .collect(Collectors.toList()); + .flatMap(widget -> widget.getNativeWidgets().stream()) + .collect(Collectors.toList()); Set removedWidgets = new HashSet<>(slotMap.values()); removedWidgets.removeAll(nativeWidgets); - if(!removedWidgets.isEmpty()) { - for(INativeWidget removedWidget : removedWidgets) { + if (!removedWidgets.isEmpty()) { + for (INativeWidget removedWidget : removedWidgets) { Slot slotHandle = removedWidget.getHandle(); this.slotMap.remove(slotHandle); //replace removed slot with empty placeholder to avoid list index shift @@ -72,16 +72,16 @@ public void notifyWidgetChange() { Set addedWidgets = new HashSet<>(nativeWidgets); addedWidgets.removeAll(slotMap.values()); - if(!addedWidgets.isEmpty()) { + if (!addedWidgets.isEmpty()) { int[] emptySlotIndexes = inventorySlots.stream() - .filter(it -> it instanceof EmptySlotPlaceholder) - .mapToInt(slot -> slot.slotNumber).toArray(); + .filter(it -> it instanceof EmptySlotPlaceholder) + .mapToInt(slot -> slot.slotNumber).toArray(); int currentIndex = 0; - for(INativeWidget addedWidget : addedWidgets) { + for (INativeWidget addedWidget : addedWidgets) { Slot slotHandle = addedWidget.getHandle(); //add or replace empty slot in inventory this.slotMap.put(slotHandle, addedWidget); - if(currentIndex < emptySlotIndexes.length) { + if (currentIndex < emptySlotIndexes.length) { int slotIndex = emptySlotIndexes[currentIndex++]; slotHandle.slotNumber = slotIndex; this.inventorySlots.set(slotIndex, slotHandle); @@ -155,17 +155,17 @@ public ItemStack slotClick(int slotId, int dragType, @Nonnull ClickType clickTyp private List getShiftClickSlots(ItemStack itemStack, boolean fromContainer) { return slotMap.values().stream() - .filter(it -> it.canMergeSlot(itemStack)) - .filter(it -> it.getSlotLocationInfo().isPlayerInventory == fromContainer) - .sorted(Comparator.comparing(s -> (fromContainer ? -1 : 1) * s.getHandle().slotNumber)) - .collect(Collectors.toList()); + .filter(it -> it.canMergeSlot(itemStack)) + .filter(it -> it.getSlotLocationInfo().isPlayerInventory == fromContainer) + .sorted(Comparator.comparing(s -> (fromContainer ? -1 : 1) * s.getHandle().slotNumber)) + .collect(Collectors.toList()); } @Override public boolean attemptMergeStack(ItemStack itemStack, boolean fromContainer, boolean simulate) { List inventorySlots = getShiftClickSlots(itemStack, fromContainer).stream() - .map(INativeWidget::getHandle) - .collect(Collectors.toList()); + .map(INativeWidget::getHandle) + .collect(Collectors.toList()); return GTUtility.mergeItemStack(itemStack, inventorySlots, simulate); } diff --git a/src/main/java/gregtech/api/gui/impl/ModularUIGui.java b/src/main/java/gregtech/api/gui/impl/ModularUIGui.java index 4d88a964368..bc6c3508969 100644 --- a/src/main/java/gregtech/api/gui/impl/ModularUIGui.java +++ b/src/main/java/gregtech/api/gui/impl/ModularUIGui.java @@ -249,7 +249,7 @@ protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOEx @Override protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) { boolean result = modularUI.guiWidgets.values().stream().anyMatch(widget -> - widget.mouseDragged(mouseX, mouseY, clickedMouseButton, timeSinceLastClick)); + widget.mouseDragged(mouseX, mouseY, clickedMouseButton, timeSinceLastClick)); if (!result) { super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick); } diff --git a/src/main/java/gregtech/api/gui/impl/ModularUIGuiHandler.java b/src/main/java/gregtech/api/gui/impl/ModularUIGuiHandler.java index 62aaa165306..b2de47b31dd 100644 --- a/src/main/java/gregtech/api/gui/impl/ModularUIGuiHandler.java +++ b/src/main/java/gregtech/api/gui/impl/ModularUIGuiHandler.java @@ -44,10 +44,10 @@ public Class getContainerClass() { @Override public IRecipeTransferError transferRecipe(ModularUIContainer container, @Nonnull IRecipeLayout recipeLayout, @Nonnull EntityPlayer player, boolean maxTransfer, boolean doTransfer) { Optional transferHandler = container.getModularUI() - .getFlatVisibleWidgetCollection().stream() - .filter(it -> it instanceof IRecipeTransferHandlerWidget) - .map(it -> (IRecipeTransferHandlerWidget) it) - .findFirst(); + .getFlatVisibleWidgetCollection().stream() + .filter(it -> it instanceof IRecipeTransferHandlerWidget) + .map(it -> (IRecipeTransferHandlerWidget) it) + .findFirst(); if (!transferHandler.isPresent()) { return transferHelper.createInternalError(); } diff --git a/src/main/java/gregtech/api/gui/resources/AdoptableTextureArea.java b/src/main/java/gregtech/api/gui/resources/AdoptableTextureArea.java index 2d1653b8103..8cabcae5a86 100644 --- a/src/main/java/gregtech/api/gui/resources/AdoptableTextureArea.java +++ b/src/main/java/gregtech/api/gui/resources/AdoptableTextureArea.java @@ -31,17 +31,17 @@ public void drawSubArea(double x, double y, int width, int height, double drawnU super.drawSubArea(x + width - pixelCornerWidth, y + height - pixelCornerHeight, pixelCornerWidth, pixelCornerHeight, 1.0 - cornerWidth, 1.0 - cornerHeight, cornerWidth, cornerHeight); //draw horizontal connections super.drawSubArea(x + pixelCornerWidth, y, width - 2 * pixelCornerWidth, pixelCornerHeight, - cornerWidth, 0.0, 1.0 - 2 * cornerWidth, cornerHeight); + cornerWidth, 0.0, 1.0 - 2 * cornerWidth, cornerHeight); super.drawSubArea(x + pixelCornerWidth, y + height - pixelCornerHeight, width - 2 * pixelCornerWidth, pixelCornerHeight, - cornerWidth, 1.0 - cornerHeight, 1.0 - 2 * cornerWidth, cornerHeight); + cornerWidth, 1.0 - cornerHeight, 1.0 - 2 * cornerWidth, cornerHeight); //draw vertical connections super.drawSubArea(x, y + pixelCornerHeight, pixelCornerWidth, height - 2 * pixelCornerHeight, - 0.0, cornerHeight, cornerWidth, 1.0 - 2 * cornerHeight); + 0.0, cornerHeight, cornerWidth, 1.0 - 2 * cornerHeight); super.drawSubArea(x + width - pixelCornerWidth, y + pixelCornerHeight, pixelCornerWidth, height - 2 * pixelCornerHeight, - 1.0 - cornerWidth, cornerHeight, cornerWidth, 1.0 - 2 * cornerHeight); + 1.0 - cornerWidth, cornerHeight, cornerWidth, 1.0 - 2 * cornerHeight); //draw central body super.drawSubArea(x + pixelCornerWidth, y + pixelCornerHeight, - width - 2 * pixelCornerWidth, height - 2 * pixelCornerHeight, - cornerWidth, cornerHeight, 1.0 - 2 * cornerWidth, 1.0 - 2 * cornerHeight); + width - 2 * pixelCornerWidth, height - 2 * pixelCornerHeight, + cornerWidth, cornerHeight, 1.0 - 2 * cornerWidth, 1.0 - 2 * cornerHeight); } } diff --git a/src/main/java/gregtech/api/gui/resources/SizedTextureArea.java b/src/main/java/gregtech/api/gui/resources/SizedTextureArea.java index 56b675ce0b8..1a5e1823f20 100644 --- a/src/main/java/gregtech/api/gui/resources/SizedTextureArea.java +++ b/src/main/java/gregtech/api/gui/resources/SizedTextureArea.java @@ -17,12 +17,12 @@ public SizedTextureArea(ResourceLocation imageLocation, double offsetX, double o @Override public SizedTextureArea getSubArea(double offsetX, double offsetY, double width, double height) { return new SizedTextureArea(imageLocation, - this.offsetX + (imageWidth * offsetX), - this.offsetY + (imageHeight * offsetY), - this.imageWidth * width, - this.imageHeight * height, - this.pixelImageWidth * width, - this.pixelImageHeight * height); + this.offsetX + (imageWidth * offsetX), + this.offsetY + (imageHeight * offsetY), + this.imageWidth * width, + this.imageHeight * height, + this.pixelImageWidth * width, + this.pixelImageHeight * height); } public static SizedTextureArea fullImage(String imageLocation, int imageWidth, int imageHeight) { diff --git a/src/main/java/gregtech/api/gui/resources/TextureArea.java b/src/main/java/gregtech/api/gui/resources/TextureArea.java index 64102ceb95e..4edfd4991b9 100644 --- a/src/main/java/gregtech/api/gui/resources/TextureArea.java +++ b/src/main/java/gregtech/api/gui/resources/TextureArea.java @@ -46,18 +46,18 @@ public static TextureArea fullImage(String imageLocation) { public static TextureArea areaOfImage(String imageLocation, int imageSizeX, int imageSizeY, int u, int v, int width, int height) { return new TextureArea(new ResourceLocation(imageLocation), - u / (imageSizeX * 1.0), - v / (imageSizeY * 1.0), - (u + width) / (imageSizeX * 1.0), - (v + height) / (imageSizeY * 1.0)); + u / (imageSizeX * 1.0), + v / (imageSizeY * 1.0), + (u + width) / (imageSizeX * 1.0), + (v + height) / (imageSizeY * 1.0)); } public TextureArea getSubArea(double offsetX, double offsetY, double width, double height) { return new TextureArea(imageLocation, - this.offsetX + (imageWidth * offsetX), - this.offsetY + (imageHeight * offsetY), - this.imageWidth * width, - this.imageHeight * height); + this.offsetX + (imageWidth * offsetX), + this.offsetY + (imageHeight * offsetY), + this.imageWidth * width, + this.imageHeight * height); } @SideOnly(Side.CLIENT) @@ -72,7 +72,7 @@ public void drawRotated(int x, int y, Size areaSize, PositionedRect positionedRe public static Transformation createOrientation(Size areaSize, int orientation) { Transformation transformation = new Rotation(Math.toRadians(orientation * 90.0), 0.0, 0.0, 1.0) - .at(new Vector3(areaSize.width / 2.0, areaSize.height / 2.0, 0.0)); + .at(new Vector3(areaSize.width / 2.0, areaSize.height / 2.0, 0.0)); Size orientedSize = transformSize(transformation, areaSize); double offsetX = (areaSize.width - orientedSize.width) / 2.0; double offsetY = (areaSize.height - orientedSize.height) / 2.0; diff --git a/src/main/java/gregtech/api/gui/widgets/AdvancedTextWidget.java b/src/main/java/gregtech/api/gui/widgets/AdvancedTextWidget.java index 91889014779..69c55bdf7ba 100644 --- a/src/main/java/gregtech/api/gui/widgets/AdvancedTextWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/AdvancedTextWidget.java @@ -9,7 +9,10 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiUtilRenderComponents; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.text.*; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.event.ClickEvent; import net.minecraft.util.text.event.ClickEvent.Action; import net.minecraft.util.text.event.HoverEvent; @@ -159,8 +162,8 @@ private void formatDisplayText() { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; int maxTextWidthResult = maxWidthLimit == 0 ? Integer.MAX_VALUE : maxWidthLimit; this.displayText = displayText.stream() - .flatMap(c -> GuiUtilRenderComponents.splitText(c, maxTextWidthResult, fontRenderer, true, true).stream()) - .collect(Collectors.toList()); + .flatMap(c -> GuiUtilRenderComponents.splitText(c, maxTextWidthResult, fontRenderer, true, true).stream()) + .collect(Collectors.toList()); } @Override @@ -214,7 +217,7 @@ public boolean mouseClicked(int mouseX, int mouseY, int button) { ITextComponent textComponent = getTextUnderMouse(mouseX, mouseY); if (textComponent != null) { if (handleCustomComponentClick(textComponent) || - getWrapScreen().handleComponentClick(textComponent)) { + getWrapScreen().handleComponentClick(textComponent)) { playButtonClickSound(); return true; } diff --git a/src/main/java/gregtech/api/gui/widgets/ClickButtonWidget.java b/src/main/java/gregtech/api/gui/widgets/ClickButtonWidget.java index 2b85969e5c9..3b6f45f8b46 100644 --- a/src/main/java/gregtech/api/gui/widgets/ClickButtonWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/ClickButtonWidget.java @@ -54,8 +54,8 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; String text = I18n.format(displayText); fontRenderer.drawString(text, - position.x + size.width / 2 - fontRenderer.getStringWidth(text) / 2, - position.y + size.height / 2 - fontRenderer.FONT_HEIGHT / 2, textColor); + position.x + size.width / 2 - fontRenderer.getStringWidth(text) / 2, + position.y + size.height / 2 - fontRenderer.FONT_HEIGHT / 2, textColor); GlStateManager.color(rColorForOverlay, gColorForOverlay, bColorForOverlay, 1.0F); } diff --git a/src/main/java/gregtech/api/gui/widgets/CycleButtonWidget.java b/src/main/java/gregtech/api/gui/widgets/CycleButtonWidget.java index b10ec0fbcd5..3f710f3c66d 100644 --- a/src/main/java/gregtech/api/gui/widgets/CycleButtonWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/CycleButtonWidget.java @@ -89,8 +89,8 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; String text = I18n.format(optionNames[currentOption]); fontRenderer.drawStringWithShadow(text, - pos.x + size.width / 2 - fontRenderer.getStringWidth(text) / 2, - pos.y + size.height / 2 - fontRenderer.FONT_HEIGHT / 2 + 1, textColor); + pos.x + size.width / 2 - fontRenderer.getStringWidth(text) / 2, + pos.y + size.height / 2 - fontRenderer.FONT_HEIGHT / 2 + 1, textColor); GlStateManager.color(rColorForOverlay, gColorForOverlay, bColorForOverlay, 1.0F); } @@ -136,11 +136,10 @@ public boolean mouseClicked(int mouseX, int mouseY, int button) { super.mouseClicked(mouseX, mouseY, button); if (isMouseOverElement(mouseX, mouseY)) { //Allow only the RMB to reverse cycle - if(button == RIGHT_MOUSE) { + if (button == RIGHT_MOUSE) { //Wrap from the first option to the last if needed this.currentOption = currentOption == 0 ? optionNames.length - 1 : currentOption - 1; - } - else { + } else { this.currentOption = (currentOption + 1) % optionNames.length; } writeClientAction(1, buf -> buf.writeVarInt(currentOption)); diff --git a/src/main/java/gregtech/api/gui/widgets/LabelWidget.java b/src/main/java/gregtech/api/gui/widgets/LabelWidget.java index dd834a1570d..2086ce2b9a7 100644 --- a/src/main/java/gregtech/api/gui/widgets/LabelWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/LabelWidget.java @@ -67,7 +67,7 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) { fontRenderer.drawString(resultText, pos.x, pos.y, color); } else { fontRenderer.drawString(resultText, - pos.x - fontRenderer.getStringWidth(resultText) / 2, pos.y, color); + pos.x - fontRenderer.getStringWidth(resultText) / 2, pos.y, color); } GlStateManager.color(rColorForOverlay, gColorForOverlay, bColorForOverlay, 1.0F); } diff --git a/src/main/java/gregtech/api/gui/widgets/ProgressWidget.java b/src/main/java/gregtech/api/gui/widgets/ProgressWidget.java index ec5df04c9f7..719246386e4 100644 --- a/src/main/java/gregtech/api/gui/widgets/ProgressWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/ProgressWidget.java @@ -55,17 +55,17 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) { //fuck this precision-dependent things, they are so fucking annoying if (moveType == MoveType.HORIZONTAL) { filledBarArea.drawSubArea(pos.x, pos.y, (int) (size.width * lastProgressValue), size.height, - 0.0, 0.0, ((int) (size.width * lastProgressValue)) / (size.width * 1.0), 1.0); + 0.0, 0.0, ((int) (size.width * lastProgressValue)) / (size.width * 1.0), 1.0); } else if (moveType == MoveType.VERTICAL) { int progressValueScaled = (int) (size.height * lastProgressValue); filledBarArea.drawSubArea(pos.x, pos.y + size.height - progressValueScaled, size.width, progressValueScaled, - 0.0, 1.0 - (progressValueScaled / (size.height * 1.0)), - 1.0, (progressValueScaled / (size.height * 1.0))); + 0.0, 1.0 - (progressValueScaled / (size.height * 1.0)), + 1.0, (progressValueScaled / (size.height * 1.0))); } else if (moveType == MoveType.VERTICAL_INVERTED) { int progressValueScaled = (int) (size.height * lastProgressValue); filledBarArea.drawSubArea(pos.x, pos.y, size.width, progressValueScaled, - 0.0, 0.0, - 1.0, (progressValueScaled / (size.height * 1.0))); + 0.0, 0.0, + 1.0, (progressValueScaled / (size.height * 1.0))); } } } diff --git a/src/main/java/gregtech/api/gui/widgets/ScrollableListWidget.java b/src/main/java/gregtech/api/gui/widgets/ScrollableListWidget.java index db7ed8011ee..14677eb98bd 100644 --- a/src/main/java/gregtech/api/gui/widgets/ScrollableListWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/ScrollableListWidget.java @@ -107,7 +107,7 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) { drawGradientRect(scrollX + 1, scrollSliderY, paneSize - 2, scrollSliderHeight, 0xFF555555, 0xFF454545); RenderUtil.useScissor(position.x, position.y, size.width - paneSize, size.height, () -> - super.drawInBackground(finalMouseX, finalMouseY, context)); + super.drawInBackground(finalMouseX, finalMouseY, context)); GlStateManager.color(rColorForOverlay, gColorForOverlay, bColorForOverlay, 1.0F); } @@ -131,14 +131,14 @@ private boolean isWidgetOverlapsScissor(Widget widget) { final int x1 = position.x + size.width - 1; final int y1 = position.y + size.height - 1; return isPositionInsideScissor(x0, y0) || - isPositionInsideScissor(x0, y1) || - isPositionInsideScissor(x1, y0) || - isPositionInsideScissor(x1, y1); + isPositionInsideScissor(x0, y1) || + isPositionInsideScissor(x1, y0) || + isPositionInsideScissor(x1, y1); } private boolean isBoxInsideScissor(Rectangle rectangle) { return isPositionInsideScissor(rectangle.x, rectangle.y) && - isPositionInsideScissor(rectangle.x + rectangle.width - 1, rectangle.y + rectangle.height - 1); + isPositionInsideScissor(rectangle.x + rectangle.width - 1, rectangle.y + rectangle.height - 1); } @Override @@ -201,7 +201,7 @@ public Object getIngredientOverMouse(int mouseX, int mouseY) { public List> getPhantomTargets(Object ingredient) { //for phantom targets, show only ones who are fully inside scissor box to avoid visual glitches return super.getPhantomTargets(ingredient).stream() - .filter(it -> isBoxInsideScissor(it.getArea())) - .collect(Collectors.toList()); + .filter(it -> isBoxInsideScissor(it.getArea())) + .collect(Collectors.toList()); } } diff --git a/src/main/java/gregtech/api/gui/widgets/SimpleTextWidget.java b/src/main/java/gregtech/api/gui/widgets/SimpleTextWidget.java index eb23201221e..7381d723882 100644 --- a/src/main/java/gregtech/api/gui/widgets/SimpleTextWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/SimpleTextWidget.java @@ -51,8 +51,8 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) { String text = formatLocale.isEmpty() ? (I18n.hasKey(lastText) ? I18n.format(lastText) : lastText) : I18n.format(formatLocale, lastText); Position position = getPosition(); fontRenderer.drawString(text, - position.x - fontRenderer.getStringWidth(text) / 2, - position.y - fontRenderer.FONT_HEIGHT / 2, color); + position.x - fontRenderer.getStringWidth(text) / 2, + position.y - fontRenderer.FONT_HEIGHT / 2, color); GlStateManager.color(rColorForOverlay, gColorForOverlay, bColorForOverlay, 1.0F); } diff --git a/src/main/java/gregtech/api/gui/widgets/SliderWidget.java b/src/main/java/gregtech/api/gui/widgets/SliderWidget.java index f6eedd59eb0..4584ec27684 100644 --- a/src/main/java/gregtech/api/gui/widgets/SliderWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/SliderWidget.java @@ -97,14 +97,14 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) { if (backgroundArea != null) { backgroundArea.draw(pos.x, pos.y, size.width, size.height); } - if(displayString == null) { + if (displayString == null) { this.displayString = getDisplayString(); } sliderIcon.draw(pos.x + (int) (this.sliderPosition * (float) (size.width - 8)), pos.y, sliderWidth, size.height); FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; fontRenderer.drawString(displayString, - pos.x + size.width / 2 - fontRenderer.getStringWidth(displayString) / 2, - pos.y + size.height / 2 - fontRenderer.FONT_HEIGHT / 2, textColor); + pos.x + size.width / 2 - fontRenderer.getStringWidth(displayString) / 2, + pos.y + size.height / 2 - fontRenderer.FONT_HEIGHT / 2, textColor); GlStateManager.color(rColorForOverlay, gColorForOverlay, bColorForOverlay, 1.0F); } diff --git a/src/main/java/gregtech/api/gui/widgets/SlotWidget.java b/src/main/java/gregtech/api/gui/widgets/SlotWidget.java index 48384ad31b1..041c84ca0d5 100644 --- a/src/main/java/gregtech/api/gui/widgets/SlotWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/SlotWidget.java @@ -1,9 +1,5 @@ package gregtech.api.gui.widgets; -import java.awt.Rectangle; - -import javax.annotation.Nonnull; - import gregtech.api.gui.INativeWidget; import gregtech.api.gui.IRenderContext; import gregtech.api.gui.IScissored; @@ -22,6 +18,9 @@ import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.SlotItemHandler; +import javax.annotation.Nonnull; +import java.awt.*; + public class SlotWidget extends Widget implements INativeWidget { protected final Slot slotReference; diff --git a/src/main/java/gregtech/api/gui/widgets/TankWidget.java b/src/main/java/gregtech/api/gui/widgets/TankWidget.java index 7575ef936ca..149b1699543 100644 --- a/src/main/java/gregtech/api/gui/widgets/TankWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/TankWidget.java @@ -246,7 +246,7 @@ private int tryClickContainer(boolean isShiftKeyDown) { FluidStack initialFluid = fluidTank.getFluid(); for (int i = 0; i < maxAttempts; i++) { FluidActionResult result = FluidUtil.tryFillContainer(currentStack, - (IFluidHandler) fluidTank, Integer.MAX_VALUE, null, false); + (IFluidHandler) fluidTank, Integer.MAX_VALUE, null, false); if (!result.isSuccess()) break; ItemStack remainingStack = result.getResult(); if (!remainingStack.isEmpty() && !player.inventory.addItemStackToInventory(remainingStack)) @@ -258,7 +258,7 @@ private int tryClickContainer(boolean isShiftKeyDown) { if (performedFill) { SoundEvent soundevent = initialFluid.getFluid().getFillSound(initialFluid); player.world.playSound(null, player.posX, player.posY + 0.5, player.posZ, - soundevent, SoundCategory.BLOCKS, 1.0F, 1.0F); + soundevent, SoundCategory.BLOCKS, 1.0F, 1.0F); gui.entityPlayer.inventory.setItemStack(currentStack); return currentStack.getCount(); } @@ -268,7 +268,7 @@ private int tryClickContainer(boolean isShiftKeyDown) { boolean performedEmptying = false; for (int i = 0; i < maxAttempts; i++) { FluidActionResult result = FluidUtil.tryEmptyContainer(currentStack, - (IFluidHandler) fluidTank, Integer.MAX_VALUE, null, false); + (IFluidHandler) fluidTank, Integer.MAX_VALUE, null, false); if (!result.isSuccess()) break; ItemStack remainingStack = result.getResult(); if (!remainingStack.isEmpty() && !player.inventory.addItemStackToInventory(remainingStack)) @@ -281,7 +281,7 @@ private int tryClickContainer(boolean isShiftKeyDown) { if (performedEmptying && filledFluid != null) { SoundEvent soundevent = filledFluid.getFluid().getEmptySound(filledFluid); player.world.playSound(null, player.posX, player.posY + 0.5, player.posZ, - soundevent, SoundCategory.BLOCKS, 1.0F, 1.0F); + soundevent, SoundCategory.BLOCKS, 1.0F, 1.0F); gui.entityPlayer.inventory.setItemStack(currentStack); return currentStack.getCount(); } @@ -296,7 +296,7 @@ public boolean mouseClicked(int mouseX, int mouseY, int button) { if (isMouseOverElement(mouseX, mouseY)) { ItemStack currentStack = gui.entityPlayer.inventory.getItemStack(); if (button == 0 && (allowClickEmptying || allowClickFilling) && - currentStack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null)) { + currentStack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null)) { boolean isShiftKeyDown = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); writeClientAction(1, writer -> writer.writeBoolean(isShiftKeyDown)); playButtonClickSound(); diff --git a/src/main/java/gregtech/api/gui/widgets/ToggleButtonWidget.java b/src/main/java/gregtech/api/gui/widgets/ToggleButtonWidget.java index 4571a2aa1cb..12e758756ee 100644 --- a/src/main/java/gregtech/api/gui/widgets/ToggleButtonWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/ToggleButtonWidget.java @@ -66,7 +66,7 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) { @Override public void drawInForeground(int mouseX, int mouseY) { - if(isMouseOverElement(mouseX, mouseY) && tooltipText != null) { + if (isMouseOverElement(mouseX, mouseY) && tooltipText != null) { String postfix = isPressed ? ".enabled" : ".disabled"; String tooltipHoverString = tooltipText + postfix; List hoverList = Arrays.asList(I18n.format(tooltipHoverString).split("/n")); diff --git a/src/main/java/gregtech/api/gui/widgets/WidgetUIAccess.java b/src/main/java/gregtech/api/gui/widgets/WidgetUIAccess.java index 61c0ade3f29..5c8d907f9bb 100644 --- a/src/main/java/gregtech/api/gui/widgets/WidgetUIAccess.java +++ b/src/main/java/gregtech/api/gui/widgets/WidgetUIAccess.java @@ -25,6 +25,7 @@ public interface WidgetUIAccess { /** * Attempts to perform a slot merging (shift-click) for a given stack * with the slots either from player inventory, or a container + * * @return true if stack was merged */ boolean attemptMergeStack(ItemStack itemStack, boolean fromContainer, boolean simulate); diff --git a/src/main/java/gregtech/api/gui/widgets/tab/HorizontalTabListRenderer.java b/src/main/java/gregtech/api/gui/widgets/tab/HorizontalTabListRenderer.java index da72c19918f..cc9633f8540 100644 --- a/src/main/java/gregtech/api/gui/widgets/tab/HorizontalTabListRenderer.java +++ b/src/main/java/gregtech/api/gui/widgets/tab/HorizontalTabListRenderer.java @@ -71,8 +71,8 @@ private static final class TopTextures { private static TextureArea getTabTexture(boolean isTabFirst, boolean startLeft, boolean isTabSelected) { return isTabFirst ? (startLeft ? (isTabSelected ? startTabActiveTexture : startTabInactiveTexture) : - (isTabSelected ? endTabActiveTexture : endTabInactiveTexture)) : - (isTabSelected ? middleTabActiveTexture : middleTabInactiveTexture); + (isTabSelected ? endTabActiveTexture : endTabInactiveTexture)) : + (isTabSelected ? middleTabActiveTexture : middleTabInactiveTexture); } } @@ -89,8 +89,8 @@ private static final class BottomTextures { private static TextureArea getTabTexture(boolean isTabFirst, boolean startLeft, boolean isTabSelected) { return isTabFirst ? (startLeft ? (isTabSelected ? startTabActiveTexture : startTabInactiveTexture) : - (isTabSelected ? endTabActiveTexture : endTabInactiveTexture)) : - (isTabSelected ? middleTabActiveTexture : middleTabInactiveTexture); + (isTabSelected ? endTabActiveTexture : endTabInactiveTexture)) : + (isTabSelected ? middleTabActiveTexture : middleTabInactiveTexture); } } diff --git a/src/main/java/gregtech/api/gui/widgets/tab/ItemTabInfo.java b/src/main/java/gregtech/api/gui/widgets/tab/ItemTabInfo.java index 71fd681b8a2..7d8266f1afa 100644 --- a/src/main/java/gregtech/api/gui/widgets/tab/ItemTabInfo.java +++ b/src/main/java/gregtech/api/gui/widgets/tab/ItemTabInfo.java @@ -39,6 +39,6 @@ public void renderHoverText(int posX, int posY, int xSize, int ySize, int guiWid Minecraft mc = Minecraft.getMinecraft(); ScaledResolution resolution = new ScaledResolution(mc); GuiUtils.drawHoveringText(Lists.newArrayList(localizedText), mouseX, mouseY, - resolution.getScaledWidth(), resolution.getScaledHeight(), -1, mc.fontRenderer); + resolution.getScaledWidth(), resolution.getScaledHeight(), -1, mc.fontRenderer); } } diff --git a/src/main/java/gregtech/api/gui/widgets/tab/VerticalTabListRenderer.java b/src/main/java/gregtech/api/gui/widgets/tab/VerticalTabListRenderer.java index 1135319cb4a..7d5a7b5bc94 100644 --- a/src/main/java/gregtech/api/gui/widgets/tab/VerticalTabListRenderer.java +++ b/src/main/java/gregtech/api/gui/widgets/tab/VerticalTabListRenderer.java @@ -72,8 +72,8 @@ private static final class LeftTextures { private static TextureArea getTabTexture(boolean isTabFirst, boolean startTop, boolean isTabSelected) { return isTabFirst ? (startTop ? (isTabSelected ? startTabActiveTexture : startTabInactiveTexture) : - (isTabSelected ? endTabActiveTexture : endTabInactiveTexture)) : - (isTabSelected ? middleTabActiveTexture : middleTabInactiveTexture); + (isTabSelected ? endTabActiveTexture : endTabInactiveTexture)) : + (isTabSelected ? middleTabActiveTexture : middleTabInactiveTexture); } } @@ -90,8 +90,8 @@ private static final class RightTextures { private static TextureArea getTabTexture(boolean isTabFirst, boolean startTop, boolean isTabSelected) { return isTabFirst ? (startTop ? (isTabSelected ? startTabActiveTexture : startTabInactiveTexture) : - (isTabSelected ? endTabActiveTexture : endTabInactiveTexture)) : - (isTabSelected ? middleTabActiveTexture : middleTabInactiveTexture); + (isTabSelected ? endTabActiveTexture : endTabInactiveTexture)) : + (isTabSelected ? middleTabActiveTexture : middleTabInactiveTexture); } } diff --git a/src/main/java/gregtech/api/items/IToolItem.java b/src/main/java/gregtech/api/items/IToolItem.java index df009693b56..46fd706c867 100755 --- a/src/main/java/gregtech/api/items/IToolItem.java +++ b/src/main/java/gregtech/api/items/IToolItem.java @@ -25,12 +25,12 @@ default boolean damageItem(ItemStack stack, int damage, boolean simulate) { * DO NOT USE METHODS BELOW TO CHECK IF TOOL CAN RECEIVE SPECIFIED AMOUNT OF DAMAGE, * Use this method with simulate = true to check so, because it can be different for electric items! * - * @param stack the item to damage - * @param damage the damage to apply + * @param stack the item to damage + * @param damage the damage to apply * @param allowPartial normally you should pass false, when true an electric item - will discharge all its remaining charge if it cannot do the - full operation and tell you the equivalent damage - * @param simulate pass true to do a dry run of the process + * will discharge all its remaining charge if it cannot do the + * full operation and tell you the equivalent damage + * @param simulate pass true to do a dry run of the process * @return the actual damage applied */ int damageItem(ItemStack stack, int damage, boolean allowPartial, boolean simulate); @@ -46,4 +46,4 @@ default boolean damageItem(ItemStack stack, int damage, boolean simulate) { * Only used for rendering purposes */ int getMaxItemDamage(ItemStack stack); -} \ No newline at end of file +} diff --git a/src/main/java/gregtech/api/items/gui/PlayerInventoryHolder.java b/src/main/java/gregtech/api/items/gui/PlayerInventoryHolder.java index 51670ee9d59..84581a2ffff 100644 --- a/src/main/java/gregtech/api/items/gui/PlayerInventoryHolder.java +++ b/src/main/java/gregtech/api/items/gui/PlayerInventoryHolder.java @@ -28,7 +28,7 @@ public PlayerInventoryHolder(EntityPlayer entityPlayer, EnumHand hand) { this.hand = hand; this.sampleItem = player.getHeldItem(hand); Preconditions.checkArgument(sampleItem.getItem() instanceof ItemUIFactory, - "Current Item should implement ItemUIFactory"); + "Current Item should implement ItemUIFactory"); } public static void openHandItemUI(EntityPlayer player, EnumHand hand) { @@ -72,7 +72,7 @@ public void setCurrentItem(ItemStack item) { if (!ItemStack.areItemsEqual(sampleItem, itemStack)) return; Preconditions.checkArgument(item.getItem() instanceof ItemUIFactory, - "Current Item should implement ItemUIFactory"); + "Current Item should implement ItemUIFactory"); this.sampleItem = item; player.setHeldItem(hand, item); } diff --git a/src/main/java/gregtech/api/items/materialitem/MaterialSetModelGen.java b/src/main/java/gregtech/api/items/materialitem/MaterialSetModelGen.java index 4fae7372df4..055c3d150f1 100644 --- a/src/main/java/gregtech/api/items/materialitem/MaterialSetModelGen.java +++ b/src/main/java/gregtech/api/items/materialitem/MaterialSetModelGen.java @@ -10,21 +10,21 @@ public class MaterialSetModelGen { private static final String PATTERN_NO_OVERLAY = - "{\n" + - " \"parent\": \"item/generated\",\n" + - " \"textures\": {\n" + - " \"layer0\": \"$MAIN$\"\n" + - " }\n" + - "}"; + "{\n" + + " \"parent\": \"item/generated\",\n" + + " \"textures\": {\n" + + " \"layer0\": \"$MAIN$\"\n" + + " }\n" + + "}"; private static final String PATTERN_WITH_OVERLAY = - "{\n" + - " \"parent\": \"item/generated\",\n" + - " \"textures\": {\n" + - " \"layer0\": \"$MAIN$\",\n" + - " \"layer1\": \"$OVERLAY$\"\n" + - " }\n" + - "}"; + "{\n" + + " \"parent\": \"item/generated\",\n" + + " \"textures\": {\n" + + " \"layer0\": \"$MAIN$\",\n" + + " \"layer1\": \"$OVERLAY$\"\n" + + " }\n" + + "}"; public static void main(String[] args) throws Exception { File gregtechRoot = new File("src/main/resources/assets/gregtech"); diff --git a/src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java b/src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java index 99886b6146f..83f9397c32e 100644 --- a/src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java +++ b/src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java @@ -6,11 +6,11 @@ import gregtech.api.damagesources.DamageSources; import gregtech.api.items.metaitem.StandardMetaItem; import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.material.Material; +import gregtech.api.unification.material.MaterialRegistry; import gregtech.api.unification.material.Materials; import gregtech.api.unification.material.info.MaterialIconSet; -import gregtech.api.unification.material.MaterialRegistry; import gregtech.api.unification.material.properties.DustProperty; -import gregtech.api.unification.material.Material; import gregtech.api.unification.material.properties.PropertyKey; import gregtech.api.unification.ore.OrePrefix; import net.minecraft.block.BlockCauldron; @@ -72,10 +72,14 @@ public void registerOreDict() { private void registerSpecialOreDict(ItemStack item, Material material, OrePrefix prefix) { if (prefix.equals(OrePrefix.dust)) OreDictUnifier.registerOre(item, OrePrefix.DUST_REGULAR, material); - else if (prefix.equals(OrePrefix.oreChunk)) OreDictUnifier.registerOre(item, OrePrefix.oreGravel.name(), material); - else if (prefix.equals(OrePrefix.oreEnderChunk)) OreDictUnifier.registerOre(item, OrePrefix.oreEndstone.name(), material); - else if (prefix.equals(OrePrefix.oreNetherChunk)) OreDictUnifier.registerOre(item, OrePrefix.oreNetherrack.name(), material); - else if (prefix.equals(OrePrefix.oreSandyChunk)) OreDictUnifier.registerOre(item, OrePrefix.oreSand.name(), material); + else if (prefix.equals(OrePrefix.oreChunk)) + OreDictUnifier.registerOre(item, OrePrefix.oreGravel.name(), material); + else if (prefix.equals(OrePrefix.oreEnderChunk)) + OreDictUnifier.registerOre(item, OrePrefix.oreEndstone.name(), material); + else if (prefix.equals(OrePrefix.oreNetherChunk)) + OreDictUnifier.registerOre(item, OrePrefix.oreNetherrack.name(), material); + else if (prefix.equals(OrePrefix.oreSandyChunk)) + OreDictUnifier.registerOre(item, OrePrefix.oreSand.name(), material); if (material == Materials.Plutonium239) { OreDictUnifier.registerOre(item, prefix.name() + material.toCamelCaseString() + "239"); diff --git a/src/main/java/gregtech/api/items/metaitem/ElectricStats.java b/src/main/java/gregtech/api/items/metaitem/ElectricStats.java index 036453958ab..a22d268069d 100644 --- a/src/main/java/gregtech/api/items/metaitem/ElectricStats.java +++ b/src/main/java/gregtech/api/items/metaitem/ElectricStats.java @@ -5,8 +5,8 @@ import gregtech.api.capability.impl.ElectricItem; import gregtech.api.items.metaitem.stats.IItemBehaviour; import gregtech.api.items.metaitem.stats.IItemCapabilityProvider; -import gregtech.api.items.metaitem.stats.IItemMaxStackSizeProvider; import gregtech.api.items.metaitem.stats.IItemComponent; +import gregtech.api.items.metaitem.stats.IItemMaxStackSizeProvider; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -43,8 +43,8 @@ public ElectricStats(long maxCharge, long tier, boolean chargeable, boolean disc public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { ItemStack itemStack = player.getHeldItem(hand); IElectricItem electricItem = itemStack.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null); - if(electricItem != null && electricItem.canProvideChargeExternally() && player.isSneaking()) { - if(!world.isRemote) { + if (electricItem != null && electricItem.canProvideChargeExternally() && player.isSneaking()) { + if (!world.isRemote) { boolean isInDischargeMode = isInDischargeMode(itemStack); String locale = "metaitem.electric.discharge_mode." + (isInDischargeMode ? "disabled" : "enabled"); player.sendStatusMessage(new TextComponentTranslation(locale), true); @@ -58,23 +58,23 @@ public ActionResult onItemRightClick(World world, EntityPlayer player @Override public void onUpdate(ItemStack itemStack, Entity entity) { IElectricItem electricItem = itemStack.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null); - if(!entity.world.isRemote && entity instanceof EntityPlayer && electricItem != null && - electricItem.canProvideChargeExternally() && - isInDischargeMode(itemStack) && electricItem.getCharge() > 0L) { + if (!entity.world.isRemote && entity instanceof EntityPlayer && electricItem != null && + electricItem.canProvideChargeExternally() && + isInDischargeMode(itemStack) && electricItem.getCharge() > 0L) { EntityPlayer entityPlayer = (EntityPlayer) entity; InventoryPlayer inventoryPlayer = entityPlayer.inventory; long transferLimit = electricItem.getTransferLimit(); - for(int i = 0; i < inventoryPlayer.getSizeInventory(); i++) { + for (int i = 0; i < inventoryPlayer.getSizeInventory(); i++) { ItemStack itemInSlot = inventoryPlayer.getStackInSlot(i); IElectricItem slotElectricItem = itemInSlot.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null); - if(slotElectricItem != null && !slotElectricItem.canProvideChargeExternally()) { + if (slotElectricItem != null && !slotElectricItem.canProvideChargeExternally()) { long chargedAmount = chargeElectricItem(transferLimit, electricItem, slotElectricItem); - if(chargedAmount > 0L) { + if (chargedAmount > 0L) { transferLimit -= chargedAmount; - if(transferLimit == 0L) break; + if (transferLimit == 0L) break; } } } @@ -84,7 +84,7 @@ public void onUpdate(ItemStack itemStack, Entity entity) { private static long chargeElectricItem(long maxDischargeAmount, IElectricItem source, IElectricItem target) { long maxDischarged = source.discharge(maxDischargeAmount, source.getTier(), false, false, true); long maxReceived = target.charge(maxDischarged, source.getTier(), false, true); - if(maxReceived > 0L) { + if (maxReceived > 0L) { long resultDischarged = source.discharge(maxReceived, source.getTier(), false, true, false); target.charge(resultDischarged, source.getTier(), false, false); return resultDischarged; @@ -94,16 +94,16 @@ private static long chargeElectricItem(long maxDischargeAmount, IElectricItem so private static void setInDischargeMode(ItemStack itemStack, boolean isDischargeMode) { NBTTagCompound tagCompound = itemStack.getTagCompound(); - if(isDischargeMode) { - if(tagCompound == null) { + if (isDischargeMode) { + if (tagCompound == null) { tagCompound = new NBTTagCompound(); itemStack.setTagCompound(tagCompound); } tagCompound.setBoolean("DischargeMode", true); } else { - if(tagCompound != null) { + if (tagCompound != null) { tagCompound.removeTag("DischargeMode"); - if(tagCompound.isEmpty()) { + if (tagCompound.isEmpty()) { itemStack.setTagCompound(null); } } @@ -113,7 +113,7 @@ private static void setInDischargeMode(ItemStack itemStack, boolean isDischargeM @Override public void addInformation(ItemStack itemStack, List lines) { IElectricItem electricItem = itemStack.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null); - if(electricItem != null && electricItem.canProvideChargeExternally()) { + if (electricItem != null && electricItem.canProvideChargeExternally()) { lines.add(I18n.format("metaitem.electric.discharge_mode.tooltip")); } } diff --git a/src/main/java/gregtech/api/items/metaitem/FoodStats.java b/src/main/java/gregtech/api/items/metaitem/FoodStats.java index f1c2bb04b5b..14de9de9690 100644 --- a/src/main/java/gregtech/api/items/metaitem/FoodStats.java +++ b/src/main/java/gregtech/api/items/metaitem/FoodStats.java @@ -82,8 +82,7 @@ public ItemStack onFoodEaten(ItemStack itemStack, EntityPlayer player) { return containerItemCopy; } - if (player != null) - { + if (player != null) { if (!player.inventory.addItemStackToInventory(containerItemCopy)) player.dropItem(containerItemCopy, false, false); } diff --git a/src/main/java/gregtech/api/items/metaitem/MetaItem.java b/src/main/java/gregtech/api/items/metaitem/MetaItem.java index 0d3bdc47815..24f989f3058 100644 --- a/src/main/java/gregtech/api/items/metaitem/MetaItem.java +++ b/src/main/java/gregtech/api/items/metaitem/MetaItem.java @@ -169,7 +169,7 @@ protected int getColorForItemStack(ItemStack stack, int tintIndex) { return metaValueItem.getColorProvider().getItemStackColor(stack, tintIndex); } IFluidHandlerItem fluidContainerItem = ItemHandlerHelper.copyStackWithSize(stack, 1) - .getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); + .getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); if (tintIndex == 0 && fluidContainerItem != null) { FluidStack fluidStack = fluidContainerItem.drain(Integer.MAX_VALUE, false); return fluidStack == null ? 0x666666 : RenderUtil.getFluidColor(fluidStack); @@ -427,7 +427,7 @@ public Multimap getAttributeModifiers(@Nonnull Entity HashMultimap modifiers = HashMultimap.create(); T metaValueItem = getItem(stack); if (metaValueItem != null) { - for(IItemBehaviour behaviour : getBehaviours(stack)) { + for (IItemBehaviour behaviour : getBehaviours(stack)) { modifiers.putAll(behaviour.getAttributeModifiers(slot, stack)); } } @@ -437,7 +437,7 @@ public Multimap getAttributeModifiers(@Nonnull Entity @Override public boolean isEnchantable(@Nonnull ItemStack stack) { T metaValueItem = getItem(stack); - if(metaValueItem != null) { + if (metaValueItem != null) { IEnchantabilityHelper helper = metaValueItem.getEnchantabilityHelper(); return helper != null && helper.isEnchantable(stack); } @@ -447,7 +447,7 @@ public boolean isEnchantable(@Nonnull ItemStack stack) { @Override public int getItemEnchantability(@Nonnull ItemStack stack) { T metaValueItem = getItem(stack); - if(metaValueItem != null) { + if (metaValueItem != null) { IEnchantabilityHelper helper = metaValueItem.getEnchantabilityHelper(); return helper == null ? 0 : helper.getItemEnchantability(stack); } @@ -457,7 +457,7 @@ public int getItemEnchantability(@Nonnull ItemStack stack) { @Override public boolean canApplyAtEnchantingTable(@Nonnull ItemStack stack, @Nonnull Enchantment enchantment) { T metaValueItem = getItem(stack); - if(metaValueItem != null) { + if (metaValueItem != null) { IEnchantabilityHelper helper = metaValueItem.getEnchantabilityHelper(); return helper != null && helper.canApplyAtEnchantingTable(stack, enchantment); } @@ -474,8 +474,8 @@ public void onUpdate(@Nonnull ItemStack stack, @Nonnull World worldIn, @Nonnull @Override public boolean shouldCauseReequipAnimation(@Nonnull ItemStack oldStack, @Nonnull ItemStack newStack, boolean slotChanged) { //if item is equal, and old item has electric item capability, remove charge tags to stop reequip animation when charge is altered - if(ItemStack.areItemsEqual(oldStack, newStack) && oldStack.hasCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null) && - oldStack.hasTagCompound() && newStack.hasTagCompound()) { + if (ItemStack.areItemsEqual(oldStack, newStack) && oldStack.hasCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null) && + oldStack.hasTagCompound() && newStack.hasTagCompound()) { oldStack = oldStack.copy(); newStack = newStack.copy(); oldStack.getTagCompound().removeTag("Charge"); @@ -498,7 +498,7 @@ public String getItemStackDisplayName(ItemStack stack) { return item.getNameProvider().getItemStackDisplayName(stack, unlocalizedName); } IFluidHandlerItem fluidHandlerItem = ItemHandlerHelper.copyStackWithSize(stack, 1) - .getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); + .getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); if (fluidHandlerItem != null) { FluidStack fluidInside = fluidHandlerItem.drain(Integer.MAX_VALUE, false); return I18n.format(unlocalizedName, fluidInside == null ? I18n.format("metaitem.fluid_cell.empty") : fluidInside.getLocalizedName()); @@ -521,21 +521,21 @@ public void addInformation(@Nonnull ItemStack itemStack, @Nullable World worldIn IElectricItem electricItem = itemStack.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null); if (electricItem != null) { lines.add(I18n.format("metaitem.generic.electric_item.tooltip", - electricItem.getCharge(), - electricItem.getMaxCharge(), - GTValues.VN[electricItem.getTier()])); + electricItem.getCharge(), + electricItem.getMaxCharge(), + GTValues.VN[electricItem.getTier()])); } IFluidHandlerItem fluidHandler = ItemHandlerHelper.copyStackWithSize(itemStack, 1) - .getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); + .getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); if (fluidHandler != null) { IFluidTankProperties fluidTankProperties = fluidHandler.getTankProperties()[0]; FluidStack fluid = fluidTankProperties.getContents(); if (fluid != null) { lines.add(I18n.format("metaitem.generic.fluid_container.tooltip", - fluid.amount, - fluidTankProperties.getCapacity(), - fluid.getLocalizedName())); + fluid.amount, + fluidTankProperties.getCapacity(), + fluid.getLocalizedName())); } else lines.add(I18n.format("metaitem.generic.fluid_container.tooltip_empty")); } @@ -734,7 +734,7 @@ protected void addItemComponentsInternal(IItemComponent... stats) { this.behaviours.add((IItemBehaviour) itemComponent); ((IItemBehaviour) itemComponent).onAddedToItem(this); } - if(itemComponent instanceof IEnchantabilityHelper) { + if (itemComponent instanceof IEnchantabilityHelper) { this.enchantabilityHelper = (IEnchantabilityHelper) itemComponent; } this.allStats.add(itemComponent); @@ -890,9 +890,9 @@ public ItemStack getChargedStackWithOverride(IElectricItem source) { @Override public String toString() { return new ToStringBuilder(this) - .append("metaValue", metaValue) - .append("unlocalizedName", unlocalizedName) - .toString(); + .append("metaValue", metaValue) + .append("unlocalizedName", unlocalizedName) + .toString(); } } diff --git a/src/main/java/gregtech/api/items/metaitem/stats/IItemUseManager.java b/src/main/java/gregtech/api/items/metaitem/stats/IItemUseManager.java index 0da05d4af15..4e3a05c593f 100644 --- a/src/main/java/gregtech/api/items/metaitem/stats/IItemUseManager.java +++ b/src/main/java/gregtech/api/items/metaitem/stats/IItemUseManager.java @@ -10,15 +10,18 @@ default boolean canStartUsing(ItemStack stack, EntityPlayer player) { return true; } - default void onItemUseStart(ItemStack stack, EntityPlayer player) {} + default void onItemUseStart(ItemStack stack, EntityPlayer player) { + } EnumAction getUseAction(ItemStack stack); int getMaxItemUseDuration(ItemStack stack); - default void onItemUsingTick(ItemStack stack, EntityPlayer player, int count) {} + default void onItemUsingTick(ItemStack stack, EntityPlayer player, int count) { + } - default void onPlayerStoppedItemUsing(ItemStack stack, EntityPlayer player, int timeLeft) {} + default void onPlayerStoppedItemUsing(ItemStack stack, EntityPlayer player, int timeLeft) { + } default ItemStack onItemUseFinish(ItemStack stack, EntityPlayer player) { return stack; diff --git a/src/main/java/gregtech/api/items/toolitem/AbstractToolItemCapabilityProvider.java b/src/main/java/gregtech/api/items/toolitem/AbstractToolItemCapabilityProvider.java index 473495deb9f..b931acf1847 100644 --- a/src/main/java/gregtech/api/items/toolitem/AbstractToolItemCapabilityProvider.java +++ b/src/main/java/gregtech/api/items/toolitem/AbstractToolItemCapabilityProvider.java @@ -32,7 +32,7 @@ public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFa @Override @SuppressWarnings("unchecked") public R getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { - if(capability == getCapability()) { + if (capability == getCapability()) { return getCapability().cast((T) this); } return null; diff --git a/src/main/java/gregtech/api/items/toolitem/IToolStats.java b/src/main/java/gregtech/api/items/toolitem/IToolStats.java index fbdd2d0ee27..6551c4a6636 100644 --- a/src/main/java/gregtech/api/items/toolitem/IToolStats.java +++ b/src/main/java/gregtech/api/items/toolitem/IToolStats.java @@ -165,7 +165,7 @@ default int getColor(ItemStack stack, int tintIndex) { /** * @return The MC tool classes for cross-mod compatibility. - * Default: no tool classes. + * Default: no tool classes. */ default Set getToolClasses(ItemStack stack) { return Collections.emptySet(); diff --git a/src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java b/src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java index 1d009c04e66..8837f57839e 100755 --- a/src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java +++ b/src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java @@ -18,9 +18,9 @@ import gregtech.api.items.metaitem.stats.IItemComponent; import gregtech.api.items.metaitem.stats.IItemContainerItemProvider; import gregtech.api.unification.material.Material; -import gregtech.api.unification.material.info.MaterialIconSet; import gregtech.api.unification.material.MaterialRegistry; import gregtech.api.unification.material.Materials; +import gregtech.api.unification.material.info.MaterialIconSet; import gregtech.api.unification.material.properties.DustProperty; import gregtech.api.unification.material.properties.PropertyKey; import gregtech.api.unification.material.properties.ToolProperty; @@ -270,7 +270,7 @@ public boolean canHarvestBlock(@Nonnull IBlockState state, @Nonnull ItemStack st public int getHarvestLevel(@Nonnull ItemStack stack, @Nonnull String toolClass, EntityPlayer player, IBlockState blockState) { if (blockState == null) { GTLog.logger.warn("ToolMetaItem.getHarvestLevel called for tool '{}' without providing IBlockState. Offending stack trace:\n {}", - toolClass, Arrays.stream(Thread.currentThread().getStackTrace()).skip(1).map(StackTraceElement::toString).collect(Collectors.joining("\n "))); + toolClass, Arrays.stream(Thread.currentThread().getStackTrace()).skip(1).map(StackTraceElement::toString).collect(Collectors.joining("\n "))); return -1; } T metaToolValueItem = getItem(stack); @@ -363,7 +363,7 @@ public int damageItem(ItemStack stack, int vanillaDamage, boolean allowPartial, } capability.discharge(energyAmount, capability.getTier(), true, false, simulate); } - if ( capability == null || (capability.getCharge() <= 0 || GTUtility.getRandomIntXSTR(100) <= 4)) { + if (capability == null || (capability.getCharge() <= 0 || GTUtility.getRandomIntXSTR(100) <= 4)) { T toolMetaItem = getItem(stack); if (toolMetaItem == null) { return 0; @@ -479,20 +479,20 @@ public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantmen public static int getMaterialEnchantability(Material material) { if (material.getMaterialIconSet() == MaterialIconSet.SHINY || - material.getMaterialIconSet() == MaterialIconSet.RUBY) { + material.getMaterialIconSet() == MaterialIconSet.RUBY) { return 33; //all shiny metals have gold enchantability } else if (material.getMaterialIconSet() == MaterialIconSet.DULL || - material.getMaterialIconSet() == MaterialIconSet.METALLIC) { + material.getMaterialIconSet() == MaterialIconSet.METALLIC) { return 21; //dull metals have iron enchantability } else if (material.getMaterialIconSet() == MaterialIconSet.GEM_VERTICAL || - material.getMaterialIconSet() == MaterialIconSet.GEM_HORIZONTAL || - material.getMaterialIconSet() == MaterialIconSet.DIAMOND || - material.getMaterialIconSet() == MaterialIconSet.OPAL || - material.getMaterialIconSet() == MaterialIconSet.NETHERSTAR) { + material.getMaterialIconSet() == MaterialIconSet.GEM_HORIZONTAL || + material.getMaterialIconSet() == MaterialIconSet.DIAMOND || + material.getMaterialIconSet() == MaterialIconSet.OPAL || + material.getMaterialIconSet() == MaterialIconSet.NETHERSTAR) { return 15; //standard gems have diamond enchantability } else if (material.getMaterialIconSet() == MaterialIconSet.WOOD || - material.getMaterialIconSet() == MaterialIconSet.ROUGH || - material.getMaterialIconSet() == MaterialIconSet.FINE) { + material.getMaterialIconSet() == MaterialIconSet.ROUGH || + material.getMaterialIconSet() == MaterialIconSet.FINE) { return 11; //wood and stone has their default enchantability } return 10; //otherwise return lowest enchantability @@ -853,7 +853,7 @@ private Map bakeEnchantmentsMap(ItemStack itemStack, Colle for (EnchantmentData enchantmentData : prop.toolEnchantments) { if (enchantments.containsKey(enchantmentData.enchantment)) { int level = Math.min(enchantments.get(enchantmentData.enchantment) + enchantmentData.level, - enchantmentData.enchantment.getMaxLevel()); + enchantmentData.enchantment.getMaxLevel()); enchantments.put(enchantmentData.enchantment, level); } else { enchantments.put(enchantmentData.enchantment, enchantmentData.level); @@ -863,7 +863,7 @@ private Map bakeEnchantmentsMap(ItemStack itemStack, Colle for (EnchantmentData enchantmentData : toolStats.getEnchantments(itemStack)) { if (enchantments.containsKey(enchantmentData.enchantment)) { int level = Math.min(enchantments.get(enchantmentData.enchantment) + enchantmentData.level, - enchantmentData.enchantment.getMaxLevel()); + enchantmentData.enchantment.getMaxLevel()); enchantments.put(enchantmentData.enchantment, level); } else { enchantments.put(enchantmentData.enchantment, enchantmentData.level); diff --git a/src/main/java/gregtech/api/items/toolitem/ToolMetaItemListener.java b/src/main/java/gregtech/api/items/toolitem/ToolMetaItemListener.java index 88b124f37a8..317c47769c8 100644 --- a/src/main/java/gregtech/api/items/toolitem/ToolMetaItemListener.java +++ b/src/main/java/gregtech/api/items/toolitem/ToolMetaItemListener.java @@ -63,7 +63,7 @@ public static void onAnvilChange(AnvilUpdateEvent event) { int repairCost = (MathHelper.clamp(toolMaterial.getHarvestLevel(), 2, 3) - 1) * materialUnitsRequired; if (toolDamage > 0.0 && materialUnitsRequired > 0 && unificationEntry != null && - unificationEntry.material == toolMaterial && unificationEntry.orePrefix == solidPrefix) { + unificationEntry.material == toolMaterial && unificationEntry.orePrefix == solidPrefix) { int durabilityToRegain = durabilityPerUnit * materialUnitsRequired; ItemStack resultStack = firstStack.copy(); toolMetaItem.regainItemDurability(resultStack, durabilityToRegain); diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java index 3b6935bbaa8..d0ebffa1d58 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java @@ -133,6 +133,7 @@ public boolean isFirstTick() { /** * Replacement for former getTimer() call. + * * @return Timer value, starting at zero, with a random offset [0, 20). */ public long getOffsetTimer() { @@ -309,7 +310,7 @@ public final void onCoverLeftClick(EntityPlayer playerIn, CuboidRayTraceResult r public final boolean onCoverRightClick(EntityPlayer playerIn, EnumHand hand, CuboidRayTraceResult result) { CoverBehavior coverBehavior = getCoverAtSide(result.sideHit); EnumActionResult coverResult = coverBehavior == null ? EnumActionResult.PASS : - coverBehavior.onRightClick(playerIn, hand, result); + coverBehavior.onRightClick(playerIn, hand, result); if (coverResult != EnumActionResult.PASS) { return coverResult == EnumActionResult.SUCCESS; } @@ -325,7 +326,7 @@ public final boolean onCoverScrewdriverClick(EntityPlayer playerIn, EnumHand han EnumFacing coverSide = ICoverable.traceCoverSide(result); CoverBehavior coverBehavior = coverSide == null ? null : getCoverAtSide(coverSide); EnumActionResult coverResult = coverBehavior == null ? EnumActionResult.PASS : - accessingActiveOutputSide ? EnumActionResult.PASS : coverBehavior.onScrewdriverClick(playerIn, hand, result); + accessingActiveOutputSide ? EnumActionResult.PASS : coverBehavior.onScrewdriverClick(playerIn, hand, result); if (coverResult != EnumActionResult.PASS) { return coverResult == EnumActionResult.SUCCESS; } @@ -490,7 +491,7 @@ public final boolean canConnectRedstone(@Nullable EnumFacing side) { //so check both top cover and bottom cover if (side == null) { return canConnectRedstone(EnumFacing.UP) || - canConnectRedstone(EnumFacing.DOWN); + canConnectRedstone(EnumFacing.DOWN); } CoverBehavior coverBehavior = getCoverAtSide(side); if (coverBehavior == null) { @@ -801,10 +802,10 @@ public T getCapability(Capability capability, EnumFacing side) { return GregtechTileCapabilities.CAPABILITY_COVERABLE.cast(this); } if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && - getFluidInventory().getTankProperties().length > 0) { + getFluidInventory().getTankProperties().length > 0) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(getFluidInventory()); } else if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && - getItemInventory().getSlots() > 0) { + getItemInventory().getSlots() > 0) { return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getItemInventory()); } T capabilityResult = null; @@ -973,7 +974,7 @@ public static boolean addItemsToItemHandler(final IItemHandler handler, ItemStack rest = ItemHandlerHelper.insertItemStacked(handler, stack, simulate); if (!rest.isEmpty()) throw new IllegalStateException( - String.format("Insertion failed, remaining stack contained %d items.", rest.getCount())); + String.format("Insertion failed, remaining stack contained %d items.", rest.getCount())); }); return canMerge; @@ -1232,7 +1233,7 @@ public boolean keepsInventory() { return false; } - public boolean getWitherProof(){ + public boolean getWitherProof() { return false; } } diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntityHolder.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntityHolder.java index 15701bf56ca..c4147e7b813 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntityHolder.java +++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntityHolder.java @@ -72,8 +72,8 @@ private void updateBlockOpacity() { public void scheduleChunkForRenderUpdate() { BlockPos pos = getPos(); getWorld().markBlockRangeForRenderUpdate( - pos.getX() - 1, pos.getY() - 1, pos.getZ() - 1, - pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1); + pos.getX() - 1, pos.getY() - 1, pos.getZ() - 1, + pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1); } public void notifyBlockUpdate() { @@ -114,8 +114,8 @@ private static ResourceLocation convertMetaTileEntityId(String metaTileEntityIdO //try to lookup by different registry IDs if (registeredModIDs == null) { registeredModIDs = registry.getKeys().stream() - .map(ResourceLocation::getNamespace) - .distinct().collect(Collectors.toList()); + .map(ResourceLocation::getNamespace) + .distinct().collect(Collectors.toList()); registeredModIDs.remove(GTValues.MODID); } for (String registryModId : registeredModIDs) { @@ -261,11 +261,11 @@ public void mirror(@Nonnull Mirror mirrorIn) { @Override public boolean shouldRenderInPass(int pass) { if (metaTileEntity == null) return false; - for (EnumFacing side: EnumFacing.VALUES){ + for (EnumFacing side : EnumFacing.VALUES) { CoverBehavior cover = metaTileEntity.getCoverAtSide(side); if (cover instanceof IFastRenderMetaTileEntity && ((IFastRenderMetaTileEntity) cover).shouldRenderInPass(pass)) { return true; - } else if(cover instanceof IRenderMetaTileEntity && ((IRenderMetaTileEntity) cover).shouldRenderInPass(pass)) { + } else if (cover instanceof IRenderMetaTileEntity && ((IRenderMetaTileEntity) cover).shouldRenderInPass(pass)) { return true; } } diff --git a/src/main/java/gregtech/api/metatileentity/SimpleGeneratorMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/SimpleGeneratorMetaTileEntity.java index 8c1110bfb71..30dd85deff2 100644 --- a/src/main/java/gregtech/api/metatileentity/SimpleGeneratorMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/SimpleGeneratorMetaTileEntity.java @@ -49,13 +49,13 @@ public SimpleGeneratorMetaTileEntity(ResourceLocation metaTileEntityId, FuelReci protected FuelRecipeLogic createWorkableHandler() { return new FuelRecipeLogic(this, recipeMap, - () -> energyContainer, () -> importFluids, GTValues.V[getTier()]); + () -> energyContainer, () -> importFluids, GTValues.V[getTier()]); } @Override protected FluidTankList createImportFluidHandler() { return new FluidTankList(false, new FilteredFluidHandler(16000) - .setFillPredicate(this::canInputFluid)); + .setFillPredicate(this::canInputFluid)); } @Override @@ -122,18 +122,18 @@ protected ModularUI.Builder createGuiTemplate(EntityPlayer player) { Builder builder = ModularUI.defaultBuilder(); builder.image(7, 16, 81, 55, GuiTextures.DISPLAY); TankWidget tankWidget = new TankWidget(importFluids.getTankAt(0), 69, 52, 18, 18) - .setHideTooltip(true).setAlwaysShowFull(true); + .setHideTooltip(true).setAlwaysShowFull(true); builder.widget(tankWidget); builder.label(11, 20, "gregtech.gui.fluid_amount", 0xFFFFFF); builder.dynamicLabel(11, 30, tankWidget::getFormattedFluidAmount, 0xFFFFFF); builder.dynamicLabel(11, 40, tankWidget::getFluidLocalizedName, 0xFFFFFF); return builder.label(6, 6, getMetaFullName()) - .widget(new FluidContainerSlotWidget(containerInventory, 0, 90, 17, false) - .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.IN_SLOT_OVERLAY)) - .widget(new ImageWidget(91, 36, 14, 15, GuiTextures.TANK_ICON)) - .widget(new SlotWidget(containerInventory, 1, 90, 54, true, false) - .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.OUT_SLOT_OVERLAY)) - .bindPlayerInventory(player.inventory); + .widget(new FluidContainerSlotWidget(containerInventory, 0, 90, 17, false) + .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.IN_SLOT_OVERLAY)) + .widget(new ImageWidget(91, 36, 14, 15, GuiTextures.TANK_ICON)) + .widget(new SlotWidget(containerInventory, 1, 90, 54, true, false) + .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.OUT_SLOT_OVERLAY)) + .bindPlayerInventory(player.inventory); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java index 5c2d2c52964..a7e5107404b 100644 --- a/src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java @@ -133,7 +133,7 @@ public void update() { super.update(); if (!getWorld().isRemote) { ((EnergyContainerHandler) this.energyContainer).dischargeOrRechargeEnergyContainers(chargerInventory, 0); - + if (getOffsetTimer() % 5 == 0) { EnumFacing currentOutputFacing = getOutputFacing(); if (isAutoOutputFluids()) { @@ -324,25 +324,25 @@ protected ModularUI.Builder createGuiTemplate(EntityPlayer player) { } ModularUI.Builder builder = workableRecipeMap.createUITemplate(workable::getProgressPercent, importItems, exportItems, importFluids, exportFluids, yOffset) - .widget(new LabelWidget(5, 5, getMetaFullName())) - .widget(new SlotWidget(chargerInventory, 0, 79, 62 + yOffset) - .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.CHARGER_OVERLAY)) - .widget(new ImageWidget(79, 42 + yOffset, 18, 18, GuiTextures.INDICATOR_NO_ENERGY) - .setPredicate(workable::isHasNotEnoughEnergy)) - .bindPlayerInventory(player.inventory, GuiTextures.SLOT, yOffset); + .widget(new LabelWidget(5, 5, getMetaFullName())) + .widget(new SlotWidget(chargerInventory, 0, 79, 62 + yOffset) + .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.CHARGER_OVERLAY)) + .widget(new ImageWidget(79, 42 + yOffset, 18, 18, GuiTextures.INDICATOR_NO_ENERGY) + .setPredicate(workable::isHasNotEnoughEnergy)) + .bindPlayerInventory(player.inventory, GuiTextures.SLOT, yOffset); int leftButtonStartX = 7; if (exportItems.getSlots() > 0) { builder.widget(new ToggleButtonWidget(leftButtonStartX, 62 + yOffset, 18, 18, - GuiTextures.BUTTON_ITEM_OUTPUT, this::isAutoOutputItems, this::setAutoOutputItems) - .setTooltipText("gregtech.gui.item_auto_output.tooltip")); + GuiTextures.BUTTON_ITEM_OUTPUT, this::isAutoOutputItems, this::setAutoOutputItems) + .setTooltipText("gregtech.gui.item_auto_output.tooltip")); leftButtonStartX += 18; } if (exportFluids.getTanks() > 0) { builder.widget(new ToggleButtonWidget(leftButtonStartX, 62 + yOffset, 18, 18, - GuiTextures.BUTTON_FLUID_OUTPUT, this::isAutoOutputFluids, this::setAutoOutputFluids) - .setTooltipText("gregtech.gui.fluid_auto_output.tooltip")); + GuiTextures.BUTTON_FLUID_OUTPUT, this::isAutoOutputFluids, this::setAutoOutputFluids) + .setTooltipText("gregtech.gui.fluid_auto_output.tooltip")); leftButtonStartX += 18; } diff --git a/src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java index 213f8a6aca2..f516a17a5d6 100644 --- a/src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java @@ -42,7 +42,7 @@ public abstract class SteamMetaTileEntity extends MetaTileEntity { public SteamMetaTileEntity(ResourceLocation metaTileEntityId, RecipeMap recipeMap, OrientedOverlayRenderer renderer, boolean isHighPressure) { super(metaTileEntityId); this.workableHandler = new RecipeLogicSteam(this, - recipeMap, isHighPressure, steamFluidTank, 1.0); + recipeMap, isHighPressure, steamFluidTank, 1.0); this.isHighPressure = isHighPressure; this.renderer = renderer; BRONZE_BACKGROUND_TEXTURE = getFullGuiTexture("%s_gui"); @@ -72,7 +72,7 @@ public boolean onWrenchClick(EntityPlayer playerIn, EnumHand hand, EnumFacing fa if (!playerIn.isSneaking()) { EnumFacing currentVentingSide = workableHandler.getVentingSide(); if (currentVentingSide == facing || - getFrontFacing() == facing) return false; + getFrontFacing() == facing) return false; workableHandler.setVentingSide(facing); return true; } @@ -100,7 +100,7 @@ protected boolean isBrickedCasing() { @Override public FluidTankList createImportFluidHandler() { this.steamFluidTank = new FilteredFluidHandler(getSteamCapacity()) - .setFillPredicate(ModHandler::isSteam); + .setFillPredicate(ModHandler::isSteam); return new FluidTankList(false, steamFluidTank); } @@ -111,14 +111,14 @@ public int getSteamCapacity() { protected TextureArea getFullGuiTexture(String pathTemplate) { String type = isHighPressure ? "steel" : "bronze"; return TextureArea.fullImage(String.format("textures/gui/steam/%s/%s.png", - type, pathTemplate.replace("%s", type))); + type, pathTemplate.replace("%s", type))); } public ModularUI.Builder createUITemplate(EntityPlayer player) { return ModularUI.builder(BRONZE_BACKGROUND_TEXTURE, 176, 166) - .widget(new LabelWidget(6, 6, getMetaFullName())) - .widget(new ImageWidget(79, 42, 18, 18, getFullGuiTexture("not_enough_steam_%s")) - .setPredicate(() -> workableHandler.isHasNotEnoughEnergy())) - .bindPlayerInventory(player.inventory, BRONZE_SLOT_BACKGROUND_TEXTURE, 0); + .widget(new LabelWidget(6, 6, getMetaFullName())) + .widget(new ImageWidget(79, 42, 18, 18, getFullGuiTexture("not_enough_steam_%s")) + .setPredicate(() -> workableHandler.isHasNotEnoughEnergy())) + .bindPlayerInventory(player.inventory, BRONZE_SLOT_BACKGROUND_TEXTURE, 0); } } diff --git a/src/main/java/gregtech/api/metatileentity/TickableTileEntityBase.java b/src/main/java/gregtech/api/metatileentity/TickableTileEntityBase.java index 165f1592229..f3a25dc678c 100644 --- a/src/main/java/gregtech/api/metatileentity/TickableTileEntityBase.java +++ b/src/main/java/gregtech/api/metatileentity/TickableTileEntityBase.java @@ -16,6 +16,7 @@ public boolean isFirstTick() { /** * Replacement for former getTimer(). + * * @return Timer value with a random offset of [0,20]. */ public long getOffsetTimer() { diff --git a/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java index 7424632ccd3..e1e297f8b67 100644 --- a/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java @@ -34,9 +34,9 @@ protected void reinitializeEnergyContainer() { long tierVoltage = GTValues.V[tier]; if (isEnergyEmitter()) { this.energyContainer = EnergyContainerHandler.emitterContainer(this, - tierVoltage * 64L, tierVoltage, getMaxInputOutputAmperage()); + tierVoltage * 64L, tierVoltage, getMaxInputOutputAmperage()); } else this.energyContainer = EnergyContainerHandler.receiverContainer(this, - tierVoltage * 64L, tierVoltage, getMaxInputOutputAmperage()); + tierVoltage * 64L, tierVoltage, getMaxInputOutputAmperage()); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/WorkableTieredMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/WorkableTieredMetaTileEntity.java index a64c9b13832..a6f507c7164 100644 --- a/src/main/java/gregtech/api/metatileentity/WorkableTieredMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/WorkableTieredMetaTileEntity.java @@ -4,9 +4,9 @@ import codechicken.lib.render.pipeline.IVertexOperation; import codechicken.lib.vec.Matrix4; import gregtech.api.GTValues; -import gregtech.api.capability.impl.RecipeLogicEnergy; import gregtech.api.capability.impl.FilteredFluidHandler; import gregtech.api.capability.impl.FluidTankList; +import gregtech.api.capability.impl.RecipeLogicEnergy; import gregtech.api.recipes.Recipe; import gregtech.api.recipes.RecipeMap; import gregtech.api.render.OrientedOverlayRenderer; diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java index 86a58d33be8..e7e54ad0176 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java @@ -86,6 +86,7 @@ public boolean shouldRenderOverlay(IMultiblockPart sourcePart) { /** * Override this method to change the Controller overlay + * * @return The overlay to render on the Multiblock Controller */ @Nonnull @@ -125,7 +126,7 @@ public static Predicate tilePredicate(BiFunction abilityPartPredicate(MultiblockAbility... allowedAbilities) { return tilePredicate((state, tile) -> tile instanceof IMultiblockAbilityPart && - ArrayUtils.contains(allowedAbilities, ((IMultiblockAbilityPart) tile).getAbility())); + ArrayUtils.contains(allowedAbilities, ((IMultiblockAbilityPart) tile).getAbility())); } public static Predicate partPredicate(Class baseClass) { @@ -167,12 +168,14 @@ public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, public Pair getParticleTexture() { return Pair.of(getBaseTexture(null).getParticleSprite(), getPaintingColor()); } + /** * if true allows all hatches to share but energy hatches and rotor holders * defualt true + * * @return */ - public boolean canShare(){ + public boolean canShare() { return true; } diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java index 61b5b4251ee..95a5add7be7 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java @@ -31,8 +31,8 @@ protected void addDisplayText(List textList) { ITextComponent tooltip = new TextComponentTranslation("gregtech.multiblock.invalid_structure.tooltip"); tooltip.setStyle(new Style().setColor(TextFormatting.GRAY)); textList.add(new TextComponentTranslation("gregtech.multiblock.invalid_structure") - .setStyle(new Style().setColor(TextFormatting.RED) - .setHoverEvent(new HoverEvent(Action.SHOW_TEXT, tooltip)))); + .setStyle(new Style().setColor(TextFormatting.RED) + .setHoverEvent(new HoverEvent(Action.SHOW_TEXT, tooltip)))); } } @@ -49,8 +49,8 @@ protected ModularUI.Builder createUITemplate(EntityPlayer entityPlayer) { builder.image(7, 4, 162, 121, GuiTextures.DISPLAY); builder.label(11, 9, getMetaFullName(), 0xFFFFFF); builder.widget(new AdvancedTextWidget(11, 19, this::addDisplayText, 0xFFFFFF) - .setMaxWidthLimit(156) - .setClickHandler(this::handleDisplayClick)); + .setMaxWidthLimit(156) + .setClickHandler(this::handleDisplayClick)); builder.bindPlayerInventory(entityPlayer.inventory, 134); return builder; } diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java b/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java index 4dfa6f15c60..d3e75888a7a 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java @@ -145,13 +145,13 @@ protected boolean checkStructureComponents(List parts, Map (IItemHandler) it).mapToInt(IItemHandler::getSlots).sum(); + .stream().map(it -> (IItemHandler) it).mapToInt(IItemHandler::getSlots).sum(); //noinspection SuspiciousMethodCalls int fluidInputsCount = abilities.getOrDefault(MultiblockAbility.IMPORT_FLUIDS, Collections.emptyList()).size(); //noinspection SuspiciousMethodCalls return itemInputsCount >= recipeMap.getMinInputs() && - fluidInputsCount >= recipeMap.getMinFluidInputs() && - abilities.containsKey(MultiblockAbility.INPUT_ENERGY); + fluidInputsCount >= recipeMap.getMinFluidInputs() && + abilities.containsKey(MultiblockAbility.INPUT_ENERGY); } @Override diff --git a/src/main/java/gregtech/api/model/AbstractBlockModelFactory.java b/src/main/java/gregtech/api/model/AbstractBlockModelFactory.java index 958a54662a2..f51ea2a0846 100644 --- a/src/main/java/gregtech/api/model/AbstractBlockModelFactory.java +++ b/src/main/java/gregtech/api/model/AbstractBlockModelFactory.java @@ -42,8 +42,8 @@ public void onResourceManagerReload(SimpleReloadableResourceManager resourceMana @Override public boolean resourceExists(ResourceLocation location) { return location.getNamespace().equals(GTValues.MODID) - && location.getPath().startsWith("blockstates/" + blockNamePrefix) - && !location.getPath().contains(".mcmeta"); + && location.getPath().startsWith("blockstates/" + blockNamePrefix) + && !location.getPath().contains(".mcmeta"); } @Override diff --git a/src/main/java/gregtech/api/multiblock/FactoryBlockPattern.java b/src/main/java/gregtech/api/multiblock/FactoryBlockPattern.java index 6871a2d99a2..6bdc1e053c1 100644 --- a/src/main/java/gregtech/api/multiblock/FactoryBlockPattern.java +++ b/src/main/java/gregtech/api/multiblock/FactoryBlockPattern.java @@ -164,8 +164,8 @@ public FactoryBlockPattern validateLayer(int layerIndex, Predicate( - (packet, buf) -> { - buf.writeVarInt(packet.serializedHolder.readableBytes()); - buf.writeBytes(packet.serializedHolder); - buf.writeVarInt(packet.uiFactoryId); - buf.writeVarInt(packet.windowId); - buf.writeVarInt(packet.initialWidgetUpdates.size()); - for (PacketUIWidgetUpdate widgetUpdate : packet.initialWidgetUpdates) { - widgetUpdateEncoder.encode(widgetUpdate, buf); - } - }, - (buf) -> { - ByteBuf directSliceBuffer = buf.readBytes(buf.readVarInt()); - ByteBuf copiedDataBuffer = Unpooled.copiedBuffer(directSliceBuffer); - directSliceBuffer.release(); - int uiFactoryId = buf.readVarInt(); - int windowId = buf.readVarInt(); - ArrayList initialWidgetUpdates = new ArrayList<>(); - int initialWidgetUpdatesCount = buf.readVarInt(); - for (int i = 0; i < initialWidgetUpdatesCount; i++) { - initialWidgetUpdates.add(widgetUpdateDecoder.decode(buf)); + (packet, buf) -> { + buf.writeVarInt(packet.serializedHolder.readableBytes()); + buf.writeBytes(packet.serializedHolder); + buf.writeVarInt(packet.uiFactoryId); + buf.writeVarInt(packet.windowId); + buf.writeVarInt(packet.initialWidgetUpdates.size()); + for (PacketUIWidgetUpdate widgetUpdate : packet.initialWidgetUpdates) { + widgetUpdateEncoder.encode(widgetUpdate, buf); + } + }, + (buf) -> { + ByteBuf directSliceBuffer = buf.readBytes(buf.readVarInt()); + ByteBuf copiedDataBuffer = Unpooled.copiedBuffer(directSliceBuffer); + directSliceBuffer.release(); + int uiFactoryId = buf.readVarInt(); + int windowId = buf.readVarInt(); + ArrayList initialWidgetUpdates = new ArrayList<>(); + int initialWidgetUpdatesCount = buf.readVarInt(); + for (int i = 0; i < initialWidgetUpdatesCount; i++) { + initialWidgetUpdates.add(widgetUpdateDecoder.decode(buf)); + } + return new PacketUIOpen( + uiFactoryId, + new PacketBuffer(copiedDataBuffer), + windowId, + initialWidgetUpdates); } - return new PacketUIOpen( - uiFactoryId, - new PacketBuffer(copiedDataBuffer), - windowId, - initialWidgetUpdates); - } )); registerPacket(2, PacketUIWidgetUpdate.class, new PacketCodec<>( - (packet, buf) -> { - buf.writeVarInt(packet.updateData.readableBytes()); - buf.writeBytes(packet.updateData); - buf.writeVarInt(packet.windowId); - buf.writeVarInt(packet.widgetId); - }, - (buf) -> { - ByteBuf directSliceBuffer = buf.readBytes(buf.readVarInt()); - ByteBuf copiedDataBuffer = Unpooled.copiedBuffer(directSliceBuffer); - directSliceBuffer.release(); - return new PacketUIWidgetUpdate( - buf.readVarInt(), - buf.readVarInt(), - new PacketBuffer(copiedDataBuffer)); - } + (packet, buf) -> { + buf.writeVarInt(packet.updateData.readableBytes()); + buf.writeBytes(packet.updateData); + buf.writeVarInt(packet.windowId); + buf.writeVarInt(packet.widgetId); + }, + (buf) -> { + ByteBuf directSliceBuffer = buf.readBytes(buf.readVarInt()); + ByteBuf copiedDataBuffer = Unpooled.copiedBuffer(directSliceBuffer); + directSliceBuffer.release(); + return new PacketUIWidgetUpdate( + buf.readVarInt(), + buf.readVarInt(), + new PacketBuffer(copiedDataBuffer)); + } )); registerPacket(3, PacketUIClientAction.class, new PacketCodec<>( - (packet, buf) -> { - buf.writeVarInt(packet.updateData.readableBytes()); - buf.writeBytes(packet.updateData); - buf.writeVarInt(packet.windowId); - buf.writeVarInt(packet.widgetId); - }, - (buf) -> { - ByteBuf directSliceBuffer = buf.readBytes(buf.readVarInt()); - ByteBuf copiedDataBuffer = Unpooled.copiedBuffer(directSliceBuffer); - directSliceBuffer.release(); - return new PacketUIClientAction( - buf.readVarInt(), - buf.readVarInt(), - new PacketBuffer(copiedDataBuffer)); - } + (packet, buf) -> { + buf.writeVarInt(packet.updateData.readableBytes()); + buf.writeBytes(packet.updateData); + buf.writeVarInt(packet.windowId); + buf.writeVarInt(packet.widgetId); + }, + (buf) -> { + ByteBuf directSliceBuffer = buf.readBytes(buf.readVarInt()); + ByteBuf copiedDataBuffer = Unpooled.copiedBuffer(directSliceBuffer); + directSliceBuffer.release(); + return new PacketUIClientAction( + buf.readVarInt(), + buf.readVarInt(), + new PacketBuffer(copiedDataBuffer)); + } )); registerPacket(4, PacketBlockParticle.class, new PacketCodec<>( - (packet, buf) -> { - buf.writeBlockPos(packet.blockPos); - buf.writeFloat((float) packet.entityPos.x); - buf.writeFloat((float) packet.entityPos.y); - buf.writeFloat((float) packet.entityPos.z); - buf.writeVarInt(packet.particlesAmount); - }, - (buf) -> new PacketBlockParticle(buf.readBlockPos(), - new Vector3(buf.readFloat(), buf.readFloat(), buf.readFloat()), - buf.readVarInt()) + (packet, buf) -> { + buf.writeBlockPos(packet.blockPos); + buf.writeFloat((float) packet.entityPos.x); + buf.writeFloat((float) packet.entityPos.y); + buf.writeFloat((float) packet.entityPos.z); + buf.writeVarInt(packet.particlesAmount); + }, + (buf) -> new PacketBlockParticle(buf.readBlockPos(), + new Vector3(buf.readFloat(), buf.readFloat(), buf.readFloat()), + buf.readVarInt()) )); registerPacket(5, PacketClipboard.class, new PacketCodec<>( - (packet, buf) -> buf.writeString(packet.text), - (buf) -> new PacketClipboard(buf.readString(32767)) + (packet, buf) -> buf.writeString(packet.text), + (buf) -> new PacketClipboard(buf.readString(32767)) )); registerServerExecutor(PacketUIClientAction.class, (packet, handler) -> { Container openContainer = handler.player.openContainer; if (openContainer instanceof ModularUIContainer && - openContainer.windowId == packet.windowId) { + openContainer.windowId == packet.windowId) { ModularUI modularUI = ((ModularUIContainer) openContainer).getModularUI(); PacketBuffer buffer = packet.updateData; modularUI.guiWidgets.get(packet.widgetId).handleClientAction(buffer.readVarInt(), buffer); @@ -221,7 +221,7 @@ private static void initClient() { }); registerClientExecutor(PacketUIWidgetUpdate.class, (packet, handler) -> { GuiScreen currentScreen = Minecraft.getMinecraft().currentScreen; - if(currentScreen instanceof ModularUIGui) { + if (currentScreen instanceof ModularUIGui) { ((ModularUIGui) currentScreen).handleWidgetUpdate(packet); } }); @@ -280,7 +280,7 @@ public void onClientPacket(FMLNetworkEvent.ClientCustomPacketEvent event) { PacketExecutor executor = (PacketExecutor) clientExecutors.get(packet.getClass()); NetHandlerPlayClient handler = (NetHandlerPlayClient) event.getHandler(); IThreadListener threadListener = FMLCommonHandler.instance().getWorldThread(handler); - if(threadListener.isCallingFromMinecraftThread()) { + if (threadListener.isCallingFromMinecraftThread()) { executor.execute(packet, handler); } else { threadListener.addScheduledTask(() -> executor.execute(packet, handler)); @@ -296,7 +296,7 @@ public void onServerPacket(FMLNetworkEvent.ServerCustomPacketEvent event) { PacketExecutor executor = (PacketExecutor) serverExecutors.get(packet.getClass()); NetHandlerPlayServer handler = (NetHandlerPlayServer) event.getHandler(); IThreadListener threadListener = FMLCommonHandler.instance().getWorldThread(handler); - if(threadListener.isCallingFromMinecraftThread()) { + if (threadListener.isCallingFromMinecraftThread()) { executor.execute(packet, handler); } else { threadListener.addScheduledTask(() -> executor.execute(packet, handler)); diff --git a/src/main/java/gregtech/api/pipenet/PipeNet.java b/src/main/java/gregtech/api/pipenet/PipeNet.java index 8e45c54ae40..87d3b8180b9 100644 --- a/src/main/java/gregtech/api/pipenet/PipeNet.java +++ b/src/main/java/gregtech/api/pipenet/PipeNet.java @@ -54,11 +54,11 @@ protected void onConnectionsUpdate() { public Map> getAllNodes() { return unmodifiableNodeByBlockPos; } - + public Node getNodeAt(BlockPos blockPos) { return nodeByBlockPos.get(blockPos); } - + public boolean containsNode(BlockPos blockPos) { return nodeByBlockPos.containsKey(blockPos); } @@ -131,7 +131,7 @@ protected void updateBlockedConnections(BlockPos nodePos, EnumFacing facing, boo if (isBlocked) { //need to unblock node before doing canNodesConnectCheck setBlocked(selfNode, facing, false); - if(canNodesConnect(selfNode, facing, getNodeAt(offsetPos), this)) { + if (canNodesConnect(selfNode, facing, getNodeAt(offsetPos), this)) { //now block again to call findAllConnectedBlocks setBlocked(selfNode, facing, true); HashMap> thisENet = findAllConnectedBlocks(nodePos); @@ -152,7 +152,7 @@ protected void updateBlockedConnections(BlockPos nodePos, EnumFacing facing, boo Node neighbourNode = pipeNetAtOffset.getNodeAt(offsetPos); //check connection availability from both networks if (canNodesConnect(selfNode, facing, neighbourNode, pipeNetAtOffset) && - pipeNetAtOffset.canNodesConnect(neighbourNode, facing.getOpposite(), selfNode, this)) { + pipeNetAtOffset.canNodesConnect(neighbourNode, facing.getOpposite(), selfNode, this)) { //so, side is unblocked now, and nodes can connect, merge two networks //our network consumes other one uniteNetworks(pipeNetAtOffset); @@ -177,7 +177,7 @@ protected void updateMark(BlockPos nodePos, int newMark) { if (secondNode == null) continue; //there is noting here if (!areNodeBlockedConnectionsCompatible(selfNode, facing, secondNode) || - !areNodesCustomContactable(selfNode.data, secondNode.data, otherPipeNet)) + !areNodesCustomContactable(selfNode.data, secondNode.data, otherPipeNet)) continue; //if connections aren't compatible, skip them if (areMarksCompatible(oldMark, secondNode.mark) == areMarksCompatible(newMark, secondNode.mark)) continue; //if compatibility didn't change, skip it @@ -253,8 +253,8 @@ private boolean areMarksCompatible(int mark1, int mark2) { */ protected final boolean canNodesConnect(Node first, EnumFacing firstFacing, Node second, PipeNet secondPipeNet) { return areNodeBlockedConnectionsCompatible(first, firstFacing, second) && - areMarksCompatible(first.mark, second.mark) && - areNodesCustomContactable(first.data, second.data, secondPipeNet); + areMarksCompatible(first.mark, second.mark) && + areNodesCustomContactable(first.data, second.data, secondPipeNet); } //we need to search only this network diff --git a/src/main/java/gregtech/api/pipenet/WorldPipeNet.java b/src/main/java/gregtech/api/pipenet/WorldPipeNet.java index 7aaebc37b50..a4185cdce9b 100644 --- a/src/main/java/gregtech/api/pipenet/WorldPipeNet.java +++ b/src/main/java/gregtech/api/pipenet/WorldPipeNet.java @@ -53,7 +53,7 @@ public void addNode(BlockPos nodePos, NodeDataType nodeData, int mark, int openC T pipeNet = getNetFromPos(offsetPos); Node secondNode = pipeNet == null ? null : pipeNet.getAllNodes().get(offsetPos); if (pipeNet != null && pipeNet.canAttachNode(nodeData) && - pipeNet.canNodesConnect(secondNode, facing.getOpposite(), node, null)) { + pipeNet.canNodesConnect(secondNode, facing.getOpposite(), node, null)) { if (myPipeNet == null) { myPipeNet = pipeNet; myPipeNet.addNode(nodePos, node); diff --git a/src/main/java/gregtech/api/pipenet/block/BlockPipe.java b/src/main/java/gregtech/api/pipenet/block/BlockPipe.java index 448310fcc50..cfcbd9f64c3 100644 --- a/src/main/java/gregtech/api/pipenet/block/BlockPipe.java +++ b/src/main/java/gregtech/api/pipenet/block/BlockPipe.java @@ -88,10 +88,10 @@ public BlockPipe() { public abstract void setTileEntityData(TileEntityPipeBase pipeTile, ItemStack itemStack); @Override - public abstract void getSubBlocks(CreativeTabs itemIn, NonNullList items); + public abstract void getSubBlocks(@Nonnull CreativeTabs itemIn, @Nonnull NonNullList items); @Override - public void breakBlock(World worldIn, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockState state) { IPipeTile pipeTile = getPipeTileEntity(worldIn, pos); if (pipeTile != null) { pipeTile.getCoverableImplementation().dropAllCovers(); @@ -102,12 +102,12 @@ public void breakBlock(World worldIn, BlockPos pos, IBlockState state) { } @Override - public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { + public void onBlockAdded(World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockState state) { worldIn.scheduleUpdate(pos, this, 1); } @Override - public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { + public void updateTick(@Nonnull World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Random rand) { IPipeTile pipeTile = getPipeTileEntity(worldIn, pos); if (pipeTile != null && !((TileEntityPipeBase) pipeTile).wasInDetachedConversionMode()) { int activeConnections = pipeTile.getOpenConnections(); @@ -118,7 +118,7 @@ public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random ra } @Override - public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + public void onBlockPlacedBy(@Nonnull World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull EntityLivingBase placer, @Nonnull ItemStack stack) { IPipeTile pipeTile = getPipeTileEntity(worldIn, pos); if (pipeTile != null) { setTileEntityData((TileEntityPipeBase) pipeTile, stack); @@ -149,7 +149,7 @@ public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, Enti } @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) { + public void neighborChanged(@Nonnull IBlockState state, @Nonnull World worldIn, @Nonnull BlockPos pos, @Nonnull Block blockIn, @Nonnull BlockPos fromPos) { IPipeTile pipeTile = getPipeTileEntity(worldIn, pos); if (pipeTile != null && !worldIn.isRemote) { EnumFacing facing = null; @@ -172,20 +172,20 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc } @Override - public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, @Nullable EnumFacing side) { + public boolean canConnectRedstone(@Nonnull IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nullable EnumFacing side) { IPipeTile pipeTile = getPipeTileEntity(world, pos); return pipeTile != null && pipeTile.getCoverableImplementation().canConnectRedstone(side); } @Override - public boolean shouldCheckWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldCheckWeakPower(@Nonnull IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nonnull EnumFacing side) { // The check in World::getRedstonePower in the vanilla code base is reversed. Setting this to false will // actually cause getWeakPower to be called, rather than prevent it. return false; } @Override - public int getWeakPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + public int getWeakPower(@Nonnull IBlockState blockState, @Nonnull IBlockAccess blockAccess, @Nonnull BlockPos pos, @Nonnull EnumFacing side) { IPipeTile pipeTile = getPipeTileEntity(blockAccess, pos); return pipeTile == null ? 0 : pipeTile.getCoverableImplementation().getOutputRedstoneSignal(side.getOpposite()); } @@ -205,7 +205,7 @@ public void updateActiveNodeStatus(World worldIn, BlockPos pos, IPipeTile pipeTile = getPipeTileEntity(world, pos); if (pipeTile == null) { return ItemStack.EMPTY; @@ -234,7 +235,7 @@ public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World wo } @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(@Nonnull World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull EntityPlayer playerIn, @Nonnull EnumHand hand, @Nonnull EnumFacing facing, float hitX, float hitY, float hitZ) { IPipeTile pipeTile = getPipeTileEntity(worldIn, pos); CuboidRayTraceResult rayTraceResult = (CuboidRayTraceResult) RayTracer.retraceBlock(worldIn, playerIn, pos); if (rayTraceResult == null || pipeTile == null) { @@ -296,7 +297,7 @@ public int onPipeToolUsed(ItemStack stack, EnumFacing coverSide, IPipeTile pipeTile = getPipeTileEntity(worldIn, pos); CuboidRayTraceResult rayTraceResult = (CuboidRayTraceResult) RayTracer.retraceBlock(worldIn, playerIn, pos); if (pipeTile == null || rayTraceResult == null) { @@ -310,25 +311,26 @@ public void onBlockClicked(World worldIn, BlockPos pos, EntityPlayer playerIn) { } } - protected ThreadLocal> tileEntities = new ThreadLocal<>(); + protected final ThreadLocal> tileEntities = new ThreadLocal<>(); @SuppressWarnings("unchecked") @Override - public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity te, ItemStack stack) { + public void harvestBlock(@Nonnull World worldIn, @Nonnull EntityPlayer player, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nullable TileEntity te, @Nonnull ItemStack stack) { tileEntities.set(te == null ? tileEntities.get() : (IPipeTile) te); super.harvestBlock(worldIn, player, pos, state, te, stack); tileEntities.set(null); } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public void getDrops(@Nonnull NonNullList drops, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nonnull IBlockState state, int fortune) { IPipeTile pipeTile = tileEntities.get() == null ? getPipeTileEntity(world, pos) : tileEntities.get(); if (pipeTile == null) return; drops.add(getDropItem(pipeTile)); } @Override - public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean isActualState) { + public void addCollisionBoxToList(@Nonnull IBlockState state, @Nonnull World worldIn, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List collidingBoxes, @Nullable Entity entityIn, boolean isActualState) { + // This iterator causes some heap memory overhead for (Cuboid6 axisAlignedBB : getCollisionBox(worldIn, pos, entityIn)) { AxisAlignedBB offsetBox = axisAlignedBB.aabb().offset(pos); if (offsetBox.intersects(entityBox)) collidingBoxes.add(offsetBox); @@ -337,20 +339,21 @@ public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos @Nullable @Override - public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { + public RayTraceResult collisionRayTrace(@Nonnull IBlockState blockState, World worldIn, @Nonnull BlockPos pos, @Nonnull Vec3d start, @Nonnull Vec3d end) { if (worldIn.isRemote) { return RayTracer.rayTraceCuboidsClosest(start, end, pos, getCollisionBox(worldIn, pos, Minecraft.getMinecraft().player)); } return RayTracer.rayTraceCuboidsClosest(start, end, pos, FULL_CUBE_COLLISION); } + @Nonnull @Override - public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) { + public BlockFaceShape getBlockFaceShape(@Nonnull IBlockAccess worldIn, @Nonnull IBlockState state, @Nonnull BlockPos pos, @Nonnull EnumFacing face) { return BlockFaceShape.UNDEFINED; } @Override - public boolean recolorBlock(World world, BlockPos pos, EnumFacing side, EnumDyeColor color) { + public boolean recolorBlock(World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side, @Nonnull EnumDyeColor color) { IPipeTile tileEntityPipe = (IPipeTile) world.getTileEntity(pos); if (tileEntityPipe != null && tileEntityPipe.getPipeType() != null && tileEntityPipe.getPipeType().isPaintable() && @@ -381,7 +384,8 @@ public IPipeTile getPipeTileEntity(TileEntity tileEntity } public boolean canConnect(IPipeTile selfTile, EnumFacing facing) { - if(selfTile.getPipeWorld().getBlockState(selfTile.getPipePos().offset(facing)).getBlock() == Blocks.AIR) return false; + if (selfTile.getPipeWorld().getBlockState(selfTile.getPipePos().offset(facing)).getBlock() == Blocks.AIR) + return false; TileEntity other = selfTile.getPipeWorld().getTileEntity(selfTile.getPipePos().offset(facing)); if (other instanceof IPipeTile) return canPipesConnect(selfTile, facing, (IPipeTile) other); @@ -456,7 +460,7 @@ private boolean hasPipeCollisionChangingItem(Entity entity) { } @Override - public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) { + public boolean canRenderInLayer(@Nonnull IBlockState state, @Nonnull BlockRenderLayer layer) { return true; } diff --git a/src/main/java/gregtech/api/pipenet/block/material/IMaterialPipeType.java b/src/main/java/gregtech/api/pipenet/block/material/IMaterialPipeType.java index 8b2071cdc25..e6be75677e2 100644 --- a/src/main/java/gregtech/api/pipenet/block/material/IMaterialPipeType.java +++ b/src/main/java/gregtech/api/pipenet/block/material/IMaterialPipeType.java @@ -8,6 +8,7 @@ public interface IMaterialPipeType extends IPipeType /** * Determines ore prefix used for this pipe type, which gives pipe ore dictionary key * when combined with pipe's material + * * @return ore prefix used for this pipe type */ OrePrefix getOrePrefix(); diff --git a/src/main/java/gregtech/api/pipenet/block/material/TileEntityMaterialPipeBase.java b/src/main/java/gregtech/api/pipenet/block/material/TileEntityMaterialPipeBase.java index 0b90fab3b71..2fd2045e954 100644 --- a/src/main/java/gregtech/api/pipenet/block/material/TileEntityMaterialPipeBase.java +++ b/src/main/java/gregtech/api/pipenet/block/material/TileEntityMaterialPipeBase.java @@ -4,9 +4,9 @@ import gregtech.api.pipenet.block.IPipeType; import gregtech.api.pipenet.tile.IPipeTile; import gregtech.api.pipenet.tile.TileEntityPipeBase; +import gregtech.api.unification.material.Material; import gregtech.api.unification.material.MaterialRegistry; import gregtech.api.unification.material.Materials; -import gregtech.api.unification.material.Material; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/gregtech/api/pipenet/block/simple/EmptyNodeData.java b/src/main/java/gregtech/api/pipenet/block/simple/EmptyNodeData.java index af6b6a9e076..1fb867c01fa 100644 --- a/src/main/java/gregtech/api/pipenet/block/simple/EmptyNodeData.java +++ b/src/main/java/gregtech/api/pipenet/block/simple/EmptyNodeData.java @@ -5,5 +5,6 @@ public class EmptyNodeData { public static final EmptyNodeData INSTANCE = new EmptyNodeData(); - private EmptyNodeData() {} + private EmptyNodeData() { + } } diff --git a/src/main/java/gregtech/api/pipenet/tickable/TickableWorldPipeNet.java b/src/main/java/gregtech/api/pipenet/tickable/TickableWorldPipeNet.java index fccb1bf4521..a55e98cd819 100644 --- a/src/main/java/gregtech/api/pipenet/tickable/TickableWorldPipeNet.java +++ b/src/main/java/gregtech/api/pipenet/tickable/TickableWorldPipeNet.java @@ -66,9 +66,9 @@ public void onChunkUnloaded(Chunk chunk) { protected void onWorldSet() { super.onWorldSet(); Map> pipeNetByLoadedChunks = pipeNets.stream() - .map(pipeNet -> Pair.of(pipeNet, getPipeNetLoadedChunks(pipeNet))) - .filter(pair -> !pair.getRight().isEmpty()) - .collect(Collectors.toMap(Pair::getLeft, Pair::getRight)); + .map(pipeNet -> Pair.of(pipeNet, getPipeNetLoadedChunks(pipeNet))) + .filter(pair -> !pair.getRight().isEmpty()) + .collect(Collectors.toMap(Pair::getLeft, Pair::getRight)); if (!pipeNetByLoadedChunks.isEmpty()) { this.tickingPipeNets.addAll(pipeNetByLoadedChunks.keySet()); this.loadedChunksByPipeNet.putAll(pipeNetByLoadedChunks); @@ -87,8 +87,8 @@ protected void addPipeNet(T pipeNet) { private List getPipeNetLoadedChunks(T pipeNet) { return pipeNet.getContainedChunks().stream() - .filter(this::isChunkLoaded) - .collect(Collectors.toList()); + .filter(this::isChunkLoaded) + .collect(Collectors.toList()); } @Override diff --git a/src/main/java/gregtech/api/pipenet/tile/PipeCoverableImplementation.java b/src/main/java/gregtech/api/pipenet/tile/PipeCoverableImplementation.java index 2cad00f7022..7b41b498cdf 100644 --- a/src/main/java/gregtech/api/pipenet/tile/PipeCoverableImplementation.java +++ b/src/main/java/gregtech/api/pipenet/tile/PipeCoverableImplementation.java @@ -125,7 +125,7 @@ public void onLoad() { @Override public final int getInputRedstoneSignal(EnumFacing side, boolean ignoreCover) { - if(!ignoreCover && getCoverAtSide(side) != null) { + if (!ignoreCover && getCoverAtSide(side) != null) { return 0; //covers block input redstone signal for machine } return sidedRedstoneInput[side.getIndex()]; @@ -135,10 +135,10 @@ public void updateInputRedstoneSignals() { for (EnumFacing side : EnumFacing.VALUES) { int redstoneValue = GTUtility.getRedstonePower(getWorld(), getPos(), side); int currentValue = sidedRedstoneInput[side.getIndex()]; - if(redstoneValue != currentValue) { + if (redstoneValue != currentValue) { this.sidedRedstoneInput[side.getIndex()] = redstoneValue; CoverBehavior coverBehavior = getCoverAtSide(side); - if(coverBehavior != null) { + if (coverBehavior != null) { coverBehavior.onRedstoneInputSignalChange(redstoneValue); } } @@ -184,16 +184,16 @@ public boolean canPlaceCoverOnSide(EnumFacing side) { public boolean canConnectRedstone(@Nullable EnumFacing side) { //so far null side means either upwards or downwards redstone wire connection //so check both top cover and bottom cover - if(side == null) { + if (side == null) { return canConnectRedstone(EnumFacing.UP) || - canConnectRedstone(EnumFacing.DOWN); + canConnectRedstone(EnumFacing.DOWN); } CoverBehavior behavior = getCoverAtSide(side); return behavior != null && behavior.canConnectRedstone(); } public int getOutputRedstoneSignal(@Nullable EnumFacing side) { - if(side == null) { + if (side == null) { return getHighestOutputRedstoneSignal(); } CoverBehavior behavior = getCoverAtSide(side); @@ -202,7 +202,7 @@ public int getOutputRedstoneSignal(@Nullable EnumFacing side) { public int getHighestOutputRedstoneSignal() { int highestSignal = 0; - for(EnumFacing side : EnumFacing.VALUES) { + for (EnumFacing side : EnumFacing.VALUES) { CoverBehavior behavior = getCoverAtSide(side); highestSignal = Math.max(highestSignal, behavior.getRedstoneSignalOutput()); } diff --git a/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java b/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java index c1ea11209c3..10a54e29c9f 100644 --- a/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java +++ b/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java @@ -59,7 +59,7 @@ public boolean wasInDetachedConversionMode() { public void setPipeData(BlockPipe pipeBlock, PipeType pipeType) { this.pipeBlock = pipeBlock; this.pipeType = pipeType; - if(!getWorld().isRemote) { + if (!getWorld().isRemote) { writeCustomData(-4, this::writePipeProperties); } } @@ -207,7 +207,7 @@ private void syncPipeConnections(AttachmentType type, EnumFacing side) { private void recomputeBlockedConnections() { int resultOpenConnections = 0; - for(int openConnections : openConnectionsMap.values()) { + for (int openConnections : openConnectionsMap.values()) { resultOpenConnections |= openConnections; } this.openConnections = resultOpenConnections; @@ -218,7 +218,7 @@ private void updateSideBlockedConnection(EnumFacing side) { WorldPipeNet worldPipeNet = getPipeBlock().getWorldPipeNet(getWorld()); boolean isSideOpen = false; int sideIndex = 1 << side.getIndex(); - for(int blockedConnections : openConnectionsMap.values()) { + for (int blockedConnections : openConnectionsMap.values()) { isSideOpen |= (blockedConnections & sideIndex) > 0; } worldPipeNet.updateBlockedConnections(getPos(), side, !isSideOpen); @@ -227,7 +227,7 @@ private void updateSideBlockedConnection(EnumFacing side) { private int withSideConnectionBlocked(int blockedConnections, EnumFacing side, boolean blocked) { int index = 1 << side.getIndex(); - if(!blocked) { + if (!blocked) { return blockedConnections | index; } else { return blockedConnections & ~index; @@ -264,10 +264,10 @@ public final T getCapability(@Nonnull Capability capability, @Nullable En boolean isCoverable = capability == GregtechTileCapabilities.CAPABILITY_COVERABLE; CoverBehavior coverBehavior = facing == null ? null : coverableImplementation.getCoverAtSide(facing); T defaultValue = getCapabilityInternal(capability, facing); - if(isCoverable) { + if (isCoverable) { return defaultValue; } - if(coverBehavior == null && facing != null) { + if (coverBehavior == null && facing != null) { //boolean isBlocked = (getBlockedConnections() & 1 << facing.getIndex()) > 0; return isConnectionOpenVisual(facing) ? defaultValue : null; } @@ -293,7 +293,7 @@ public NBTTagCompound writeToNBT(@Nonnull NBTTagCompound compound) { } compound.setInteger("PipeType", pipeType.ordinal()); NBTTagCompound blockedConnectionsTag = new NBTTagCompound(); - for(int attachmentType : openConnectionsMap.keys()) { + for (int attachmentType : openConnectionsMap.keys()) { int blockedConnections = openConnectionsMap.get(attachmentType); blockedConnectionsTag.setInteger(Integer.toString(attachmentType), blockedConnections); } @@ -314,7 +314,7 @@ public void readFromNBT(@Nonnull NBTTagCompound compound) { this.pipeType = getPipeTypeClass().getEnumConstants()[compound.getInteger("PipeType")]; NBTTagCompound blockedConnectionsTag = compound.getCompoundTag("BlockedConnectionsMap"); this.openConnectionsMap.clear(); - for(String attachmentTypeKey : blockedConnectionsTag.getKeySet()) { + for (String attachmentTypeKey : blockedConnectionsTag.getKeySet()) { int attachmentType = Integer.parseInt(attachmentTypeKey); int blockedConnections = blockedConnectionsTag.getInteger(attachmentTypeKey); this.openConnectionsMap.put(attachmentType, blockedConnections); @@ -369,7 +369,7 @@ public void receiveCustomData(int discriminator, PacketBuffer buf) { scheduleChunkForRenderUpdate(); } else if (discriminator == -3) { this.coverableImplementation.readCustomData(buf.readVarInt(), buf); - } else if(discriminator == -4) { + } else if (discriminator == -4) { readPipeProperties(buf); scheduleChunkForRenderUpdate(); } @@ -387,8 +387,8 @@ public void writeCoverCustomData(int id, Consumer writer) { public void scheduleChunkForRenderUpdate() { BlockPos pos = getPos(); getWorld().markBlockRangeForRenderUpdate( - pos.getX() - 1, pos.getY() - 1, pos.getZ() - 1, - pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1); + pos.getX() - 1, pos.getY() - 1, pos.getZ() - 1, + pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1); } @Override diff --git a/src/main/java/gregtech/api/recipes/CountableIngredient.java b/src/main/java/gregtech/api/recipes/CountableIngredient.java index 916a66670b9..818918d6ad3 100644 --- a/src/main/java/gregtech/api/recipes/CountableIngredient.java +++ b/src/main/java/gregtech/api/recipes/CountableIngredient.java @@ -58,7 +58,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; CountableIngredient that = (CountableIngredient) o; return count == that.count && - Objects.equals(ingredient, that.ingredient); + Objects.equals(ingredient, that.ingredient); } @Override @@ -69,8 +69,8 @@ public int hashCode() { @Override public String toString() { return "CountableIngredient{" + - "ingredient=" + Arrays.toString(ingredient.getMatchingStacks()) + - ", count=" + count + - '}'; + "ingredient=" + Arrays.toString(ingredient.getMatchingStacks()) + + ", count=" + count + + '}'; } } diff --git a/src/main/java/gregtech/api/recipes/FluidKey.java b/src/main/java/gregtech/api/recipes/FluidKey.java index 9714922cf7a..0ddc8ce6c17 100644 --- a/src/main/java/gregtech/api/recipes/FluidKey.java +++ b/src/main/java/gregtech/api/recipes/FluidKey.java @@ -21,7 +21,7 @@ public boolean equals(Object o) { if (!(o instanceof FluidKey)) return false; FluidKey fluidKey = (FluidKey) o; return Objects.equals(fluid, fluidKey.fluid) && - Objects.equals(tag, fluidKey.tag); + Objects.equals(tag, fluidKey.tag); } @Override @@ -32,8 +32,8 @@ public int hashCode() { @Override public String toString() { return "FluidKey{" + - "fluid=" + fluid + - ", tag=" + tag + - '}'; + "fluid=" + fluid + + ", tag=" + tag + + '}'; } } diff --git a/src/main/java/gregtech/api/recipes/ModHandler.java b/src/main/java/gregtech/api/recipes/ModHandler.java index b2d59c62df6..cb504c99126 100644 --- a/src/main/java/gregtech/api/recipes/ModHandler.java +++ b/src/main/java/gregtech/api/recipes/ModHandler.java @@ -49,7 +49,7 @@ public class ModHandler { */ public static boolean isWater(FluidStack fluid) { return new FluidStack(FluidRegistry.WATER, 1).isFluidEqual(fluid) - || Materials.DistilledWater.getFluid(1).isFluidEqual(fluid); + || Materials.DistilledWater.getFluid(1).isFluidEqual(fluid); } /** @@ -193,8 +193,8 @@ public static void addMirroredShapedRecipe(String regName, ItemStack result, Obj } IRecipe shapedOreRecipe = new ShapedOreRecipe(new ResourceLocation(GTValues.MODID, "general"), result.copy(), finalizeShapedRecipeInput(recipe)) - .setMirrored(true) - .setRegistryName(regName); + .setMirrored(true) + .setRegistryName(regName); ForgeRegistries.RECIPES.register(shapedOreRecipe); } @@ -240,8 +240,8 @@ public static void addShapedRecipe(String regName, ItemStack result, Object... r } IRecipe shapedOreRecipe = new ShapedOreRecipe(null, result.copy(), finalizeShapedRecipeInput(recipe)) - .setMirrored(false) //make all recipes not mirrored by default - .setRegistryName(regName); + .setMirrored(false) //make all recipes not mirrored by default + .setRegistryName(regName); ForgeRegistries.RECIPES.register(shapedOreRecipe); } @@ -263,8 +263,8 @@ public static void addShapedEnergyTransferRecipeWithOverride(String regName, Ite } IRecipe shapedOreRecipe = new ShapedOreEnergyTransferRecipe(null, result.copy(), chargePredicate, overrideCharge, transferMaxCharge, finalizeShapedRecipeInput(recipe)) - .setMirrored(false) //make all recipes not mirrored by default - .setRegistryName(regName); + .setMirrored(false) //make all recipes not mirrored by default + .setRegistryName(regName); ForgeRegistries.RECIPES.register(shapedOreRecipe); } @@ -280,20 +280,20 @@ private static boolean validateRecipe(String regName, Object... recipe) { skip = true; } else if (Arrays.asList(recipe).contains(null) || Arrays.asList(recipe).contains(ItemStack.EMPTY)) { GTLog.logger.error("Recipe cannot contain null elements or Empty ItemStacks. Recipe: {}", - Arrays.stream(recipe) - .map(o -> o == null ? "NULL" : o) - .map(o -> o == ItemStack.EMPTY ? "EMPTY STACK" : o) - .map(Object::toString) - .map(s -> "\"" + s + "\"") - .collect(Collectors.joining(", "))); + Arrays.stream(recipe) + .map(o -> o == null ? "NULL" : o) + .map(o -> o == ItemStack.EMPTY ? "EMPTY STACK" : o) + .map(Object::toString) + .map(s -> "\"" + s + "\"") + .collect(Collectors.joining(", "))); GTLog.logger.error("Stacktrace:", new IllegalArgumentException()); skip = true; } else if (ForgeRegistries.RECIPES.containsKey(new ResourceLocation(GTValues.MODID, regName))) { GTLog.logger.error("Tried to register recipe, {}, with duplicate key. Recipe: {}", regName, - Arrays.stream(recipe) - .map(Object::toString) - .map(s -> "\"" + s + "\"") - .collect(Collectors.joining(", "))); + Arrays.stream(recipe) + .map(Object::toString) + .map(s -> "\"" + s + "\"") + .collect(Collectors.joining(", "))); GTLog.logger.error("Stacktrace:", new IllegalArgumentException()); skip = true; } @@ -321,7 +321,7 @@ public static Object[] finalizeShapedRecipeInput(Object... recipe) { } return recipeList.toArray(); } - + public static Object finalizeIngredient(Object ingredient) { if (ingredient instanceof MetaItem.MetaValueItem) { ingredient = ((MetaItem.MetaValueItem) ingredient).getStackForm(); @@ -332,12 +332,12 @@ public static Object finalizeIngredient(Object ingredient) { } else if (ingredient instanceof UnificationEntry) { ingredient = ingredient.toString(); } else if (!(ingredient instanceof ItemStack - || ingredient instanceof Item - || ingredient instanceof Block - || ingredient instanceof String - || ingredient instanceof Character - || ingredient instanceof Boolean - || ingredient instanceof Ingredient)) { + || ingredient instanceof Item + || ingredient instanceof Block + || ingredient instanceof String + || ingredient instanceof Character + || ingredient instanceof Boolean + || ingredient instanceof Ingredient)) { throw new IllegalArgumentException(ingredient.getClass().getSimpleName() + " type is not suitable for crafting input."); } return ingredient; @@ -375,15 +375,15 @@ public static void addShapelessRecipe(String regName, ItemStack result, Object.. } recipe[i] = toolName; } else if (!(recipe[i] instanceof ItemStack - || recipe[i] instanceof Item - || recipe[i] instanceof Block - || recipe[i] instanceof String)) { + || recipe[i] instanceof Item + || recipe[i] instanceof Block + || recipe[i] instanceof String)) { throw new IllegalArgumentException(recipe.getClass().getSimpleName() + " type is not suitable for crafting input."); } } IRecipe shapelessRecipe = new ShapelessOreRecipe(null, result.copy(), recipe) - .setRegistryName(regName); + .setRegistryName(regName); try { //workaround for MC bug that makes all shaped recipe inputs that have enchanted items diff --git a/src/main/java/gregtech/api/recipes/RecipeBuilder.java b/src/main/java/gregtech/api/recipes/RecipeBuilder.java index 63daf1158da..51f6c83ce74 100644 --- a/src/main/java/gregtech/api/recipes/RecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/RecipeBuilder.java @@ -380,16 +380,16 @@ public List getFluidOutputs() { @Override public String toString() { return new ToStringBuilder(this) - .append("recipeMap", recipeMap) - .append("inputs", inputs) - .append("outputs", outputs) - .append("chancedOutputs", chancedOutputs) - .append("fluidInputs", fluidInputs) - .append("fluidOutputs", fluidOutputs) - .append("duration", duration) - .append("EUt", EUt) - .append("hidden", hidden) - .append("recipeStatus", recipeStatus) - .toString(); + .append("recipeMap", recipeMap) + .append("inputs", inputs) + .append("outputs", outputs) + .append("chancedOutputs", chancedOutputs) + .append("fluidInputs", fluidInputs) + .append("fluidOutputs", fluidOutputs) + .append("duration", duration) + .append("EUt", EUt) + .append("hidden", hidden) + .append("recipeStatus", recipeStatus) + .toString(); } } diff --git a/src/main/java/gregtech/api/recipes/RecipeMap.java b/src/main/java/gregtech/api/recipes/RecipeMap.java index 793c5b99332..8072d0b14e2 100644 --- a/src/main/java/gregtech/api/recipes/RecipeMap.java +++ b/src/main/java/gregtech/api/recipes/RecipeMap.java @@ -91,6 +91,7 @@ public RecipeMap(String unlocalizedName, this.recipeBuilderSample = defaultRecipe; RECIPE_MAP_REGISTRY.put(unlocalizedName, this); } + @ZenMethod public static List> getRecipeMaps() { return ImmutableList.copyOf(RECIPE_MAP_REGISTRY.values()); @@ -122,8 +123,8 @@ public static void setFoundInvalidRecipe(boolean foundInvalidRecipe) { if (currentOrePrefix != null) { Material currentMaterial = OrePrefix.getCurrentMaterial(); GTLog.logger.error("Error happened during processing ore registration of prefix {} and material {}. " + - "Seems like cross-mod compatibility issue. Report to GTCE github.", - currentOrePrefix, currentMaterial); + "Seems like cross-mod compatibility issue. Report to GTCE github.", + currentOrePrefix, currentMaterial); } } @@ -135,8 +136,8 @@ public RecipeMap setProgressBar(TextureArea progressBar, MoveType moveType) { public RecipeMap setSlotOverlay(boolean isOutput, boolean isFluid, TextureArea slotOverlay) { return this - .setSlotOverlay(isOutput, isFluid, false, slotOverlay) - .setSlotOverlay(isOutput, isFluid, true, slotOverlay); + .setSlotOverlay(isOutput, isFluid, false, slotOverlay) + .setSlotOverlay(isOutput, isFluid, true, slotOverlay); } public RecipeMap setSlotOverlay(boolean isOutput, boolean isFluid, boolean isLast, TextureArea slotOverlay) { @@ -182,7 +183,7 @@ public boolean removeRecipe(Recipe recipe) { if (recipeList.remove(recipe)) { //also iterate trough fluid mappings and remove recipe from them recipeFluidMap.values().forEach(fluidMap -> - fluidMap.removeIf(fluidRecipe -> fluidRecipe == recipe)); + fluidMap.removeIf(fluidRecipe -> fluidRecipe == recipe)); return true; } return false; @@ -276,6 +277,7 @@ public ModularUI.Builder createJeiUITemplate(IItemHandlerModifiable importItems, } private double timer = 0; + private double jeiProgressBar() { timer += 0.0005; if (timer > 1.0) timer = 0.0; @@ -341,12 +343,12 @@ protected void addInventorySlotGroup(ModularUI.Builder builder, IItemHandlerModi protected void addSlot(ModularUI.Builder builder, int x, int y, int slotIndex, IItemHandlerModifiable itemHandler, FluidTankList fluidHandler, boolean isFluid, boolean isOutputs) { if (!isFluid) { builder.widget(new SlotWidget(itemHandler, slotIndex, x, y, true, !isOutputs) - .setBackgroundTexture(getOverlaysForSlot(isOutputs, false, slotIndex == itemHandler.getSlots() - 1))); + .setBackgroundTexture(getOverlaysForSlot(isOutputs, false, slotIndex == itemHandler.getSlots() - 1))); } else { builder.widget(new TankWidget(fluidHandler.getTankAt(slotIndex), x, y, 18, 18) - .setAlwaysShowFull(true) - .setBackgroundTexture(getOverlaysForSlot(isOutputs, true, slotIndex == fluidHandler.getTanks() - 1)) - .setContainerClicking(true, !isOutputs)); + .setAlwaysShowFull(true) + .setBackgroundTexture(getOverlaysForSlot(isOutputs, true, slotIndex == fluidHandler.getTanks() - 1)) + .setContainerClicking(true, !isOutputs)); } } @@ -403,13 +405,13 @@ public List getRecipeList() { @Nullable public CTRecipe ctFindRecipe(long maxVoltage, IItemStack[] itemInputs, ILiquidStack[] fluidInputs, @Optional(valueLong = Integer.MAX_VALUE) int outputFluidTankCapacity) { List mcItemInputs = itemInputs == null ? Collections.emptyList() : - Arrays.stream(itemInputs) - .map(CraftTweakerMC::getItemStack) - .collect(Collectors.toList()); + Arrays.stream(itemInputs) + .map(CraftTweakerMC::getItemStack) + .collect(Collectors.toList()); List mcFluidInputs = fluidInputs == null ? Collections.emptyList() : - Arrays.stream(fluidInputs) - .map(CraftTweakerMC::getLiquidStack) - .collect(Collectors.toList()); + Arrays.stream(fluidInputs) + .map(CraftTweakerMC::getLiquidStack) + .collect(Collectors.toList()); Recipe backingRecipe = findRecipe(maxVoltage, mcItemInputs, mcFluidInputs, outputFluidTankCapacity, MatchingMode.DEFAULT); return backingRecipe == null ? null : new CTRecipe(this, backingRecipe); } @@ -418,8 +420,8 @@ public CTRecipe ctFindRecipe(long maxVoltage, IItemStack[] itemInputs, ILiquidSt @Method(modid = GTValues.MODID_CT) public List ccGetRecipeList() { return getRecipeList().stream() - .map(recipe -> new CTRecipe(this, recipe)) - .collect(Collectors.toList()); + .map(recipe -> new CTRecipe(this, recipe)) + .collect(Collectors.toList()); } @SideOnly(Side.CLIENT) @@ -487,8 +489,8 @@ public int getMaxFluidOutputs() { @ZenMethod public String toString() { return "RecipeMap{" + - "unlocalizedName='" + unlocalizedName + '\'' + - '}'; + "unlocalizedName='" + unlocalizedName + '\'' + + '}'; } @FunctionalInterface diff --git a/src/main/java/gregtech/api/recipes/RecipeMaps.java b/src/main/java/gregtech/api/recipes/RecipeMaps.java index 1a722afb3a2..da108de966d 100644 --- a/src/main/java/gregtech/api/recipes/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipes/RecipeMaps.java @@ -21,57 +21,57 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap COMPRESSOR_RECIPES = new RecipeMap<>("compressor", 1, 1, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder().duration(400).EUt(2), false) - .setSlotOverlay(false, false, GuiTextures.COMPRESSOR_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_COMPRESS, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.COMPRESSOR_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_COMPRESS, MoveType.HORIZONTAL); @ZenProperty public static final RecipeMap EXTRACTOR_RECIPES = new RecipeMap<>("extractor", 0, 1, 0, 1, 0, 0, 0, 1, new SimpleRecipeBuilder().duration(400).EUt(2), false) - .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, MoveType.HORIZONTAL); @ZenProperty public static final RecipeMap MACERATOR_RECIPES = new RecipeMap<>("macerator", 1, 1, 1, 3, 0, 0, 0, 0, new SimpleRecipeBuilder().duration(150).EUt(8), false) - .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) - .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_MACERATE, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) + .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_MACERATE, MoveType.HORIZONTAL); @ZenProperty public static final RecipeMap ORE_WASHER_RECIPES = new RecipeMap<>("ore_washer", 1, 1, 1, 3, 0, 1, 0, 0, new SimpleRecipeBuilder().duration(400).EUt(16), false) - .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) - .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_BATH, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) + .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_BATH, MoveType.HORIZONTAL); @ZenProperty public static final RecipeMap THERMAL_CENTRIFUGE_RECIPES = new RecipeMap<>("thermal_centrifuge", 1, 1, 1, 3, 0, 0, 0, 0, new SimpleRecipeBuilder().duration(400).EUt(60), false) - .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) - .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) + .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); @ZenProperty public static final RecipeMap FURNACE_RECIPES = new RecipeMapFurnace("electric_furnace", 1, 1, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.FURNACE_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.FURNACE_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); @ZenProperty public static final RecipeMap ASSEMBLER_RECIPES = new RecipeMap<>("assembler", 1, 9, 1, 1, 0, 1, 0, 0, new AssemblerRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT, MoveType.HORIZONTAL); @ZenProperty public static final RecipeMap FORMING_PRESS_RECIPES = new RecipeMapFormingPress("forming_press", 2, 6, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) - .setProgressBar(GuiTextures.PROGRESS_BAR_COMPRESS, MoveType.HORIZONTAL); + .setProgressBar(GuiTextures.PROGRESS_BAR_COMPRESS, MoveType.HORIZONTAL); @ZenProperty public static final RecipeMap ARC_FURNACE_RECIPES = new RecipeMap<>("arc_furnace", 1, 1, 1, 4, 1, 1, 0, 1, new ArcFurnaceRecipeBuilder(), false) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARC_FURNACE, MoveType.HORIZONTAL); + .setProgressBar(GuiTextures.PROGRESS_BAR_ARC_FURNACE, MoveType.HORIZONTAL); /** * Example: @@ -91,7 +91,7 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap SIFTER_RECIPES = new RecipeMap<>("sifter", 1, 1, 0, 6, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) - .setProgressBar(GuiTextures.PROGRESS_BAR_SIFT, MoveType.VERTICAL_INVERTED); + .setProgressBar(GuiTextures.PROGRESS_BAR_SIFT, MoveType.VERTICAL_INVERTED); /** * Example: @@ -107,8 +107,8 @@ public class RecipeMaps { */ @ZenProperty public static final RecipeMap LASER_ENGRAVER_RECIPES = new RecipeMap<>("laser_engraver", 2, 2, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, true, GuiTextures.LENS_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, true, GuiTextures.LENS_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); /** * Example: @@ -125,9 +125,9 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap MIXER_RECIPES = new RecipeMap<>("mixer", 0, 6, 0, 1, 0, 2, 0, 1, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY) - .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY) + .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, MoveType.HORIZONTAL); /** * Example: @@ -144,9 +144,9 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap AUTOCLAVE_RECIPES = new RecipeMap<>("autoclave", 1, 1, 1, 1, 1, 1, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY) - .setSlotOverlay(true, false, GuiTextures.CRYSTAL_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_CRYSTALLIZATION, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY) + .setSlotOverlay(true, false, GuiTextures.CRYSTAL_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_CRYSTALLIZATION, MoveType.HORIZONTAL); /** * Example: @@ -163,9 +163,9 @@ public class RecipeMaps { */ @ZenProperty public static final RecipeMap ELECTROMAGNETIC_SEPARATOR_RECIPES = new RecipeMap<>("electromagnetic_separator", 1, 1, 1, 3, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) - .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_MAGNET, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) + .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_MAGNET, MoveType.HORIZONTAL); /** * Example: @@ -181,7 +181,7 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap POLARIZER_RECIPES = new RecipeMap<>("polarizer", 1, 1, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) - .setProgressBar(GuiTextures.PROGRESS_BAR_MAGNET, MoveType.HORIZONTAL); + .setProgressBar(GuiTextures.PROGRESS_BAR_MAGNET, MoveType.HORIZONTAL); /** * Example: @@ -198,7 +198,7 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap CHEMICAL_BATH_RECIPES = new RecipeMap<>("chemical_bath", 1, 1, 1, 3, 1, 1, 0, 0, new SimpleRecipeBuilder(), false) - .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, MoveType.HORIZONTAL); + .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, MoveType.HORIZONTAL); /** * Example: @@ -213,8 +213,8 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap BREWING_RECIPES = new RecipeMap<>("brewery", 1, 1, 0, 0, 1, 1, 1, 1, new SimpleRecipeBuilder().duration(128).EUt(4), false) - .setSlotOverlay(false, false, GuiTextures.BREWER_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW_MULTIPLE, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.BREWER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW_MULTIPLE, MoveType.HORIZONTAL); /** * Example: @@ -268,7 +268,7 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap FERMENTING_RECIPES = new RecipeMap<>("fermenter", 0, 0, 0, 0, 1, 1, 1, 1, new SimpleRecipeBuilder().EUt(2), false) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); /** * Example: @@ -285,8 +285,8 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap FLUID_SOLIDFICATION_RECIPES = new RecipeMap<>("fluid_solidifier", 1, 1, 1, 1, 1, 1, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); /** * Example: @@ -328,7 +328,7 @@ public class RecipeMaps { .setSlotOverlay(false, false, false, GuiTextures.EXTRACTOR_OVERLAY) .setSlotOverlay(false, false, true, GuiTextures.CANISTER_OVERLAY) .setSlotOverlay(false, true, true, GuiTextures.CENTRIFUGE_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, MoveType.HORIZONTAL); + .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, MoveType.HORIZONTAL); /** * Examples: @@ -522,8 +522,8 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap WIREMILL_RECIPES = new RecipeMap<>("wiremill", 1, 1, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.WIREMILL_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_WIREMILL, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.WIREMILL_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_WIREMILL, MoveType.HORIZONTAL); /** * Example: @@ -545,8 +545,8 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap ALLOY_SMELTER_RECIPES = new RecipeMap<>("alloy_smelter", 1, 2, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.FURNACE_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.FURNACE_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); /** * Example: @@ -583,11 +583,11 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap LATHE_RECIPES = new RecipeMap<>("lathe", 1, 1, 1, 2, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.PIPE_OVERLAY_1) - .setSlotOverlay(true, false, false, GuiTextures.PIPE_OVERLAY_2) - .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY) - .setSpecialTexture(98, 24, 5, 18, GuiTextures.PROGRESS_BAR_LATHE_BASE) - .setProgressBar(GuiTextures.PROGRESS_BAR_LATHE, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.PIPE_OVERLAY_1) + .setSlotOverlay(true, false, false, GuiTextures.PIPE_OVERLAY_2) + .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY) + .setSpecialTexture(98, 24, 5, 18, GuiTextures.PROGRESS_BAR_LATHE_BASE) + .setProgressBar(GuiTextures.PROGRESS_BAR_LATHE, MoveType.HORIZONTAL); /** * Example: @@ -604,10 +604,10 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap CUTTER_RECIPES = new RecipeMap<>("cutter", 1, 1, 1, 2, 0, 1, 0, 0, new CutterRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.SAWBLADE_OVERLAY) - .setSlotOverlay(true, false, false, GuiTextures.CUTTER_OVERLAY) - .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_SLICE, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.SAWBLADE_OVERLAY) + .setSlotOverlay(true, false, false, GuiTextures.CUTTER_OVERLAY) + .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_SLICE, MoveType.HORIZONTAL); /** * Example: @@ -624,8 +624,8 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap EXTRUDER_RECIPES = new RecipeMap<>("extruder", 2, 2, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, true, GuiTextures.MOLD_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRUDER, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, true, GuiTextures.MOLD_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRUDER, MoveType.HORIZONTAL); /** * Example: @@ -648,15 +648,15 @@ public class RecipeMaps { @ZenProperty public static final RecipeMap PACKER_RECIPES = new RecipeMap<>("packer", 2, 2, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder().EUt(12).duration(10), false) - .setSlotOverlay(false, false, true, GuiTextures.BOX_OVERLAY) - .setSlotOverlay(true, false, GuiTextures.BOXED_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_PACKER, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, true, GuiTextures.BOX_OVERLAY) + .setSlotOverlay(true, false, GuiTextures.BOXED_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_PACKER, MoveType.HORIZONTAL); @ZenProperty public static final RecipeMap UNPACKER_RECIPES = new RecipeMap<>("unpacker", 2, 2, 1, 2, 0, 0, 0, 0, new SimpleRecipeBuilder().EUt(12).duration(10), false) - .setSlotOverlay(false, false, GuiTextures.BOXED_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_UNPACKER, MoveType.HORIZONTAL); + .setSlotOverlay(false, false, GuiTextures.BOXED_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_UNPACKER, MoveType.HORIZONTAL); @ZenProperty public static final RecipeMapAssemblyLine ASSEMBLY_LINE_RECIPES = new RecipeMapAssemblyLine<>("assembly_line", 4, 16, 1, 1, 0, 4, 0, 0, new SimpleRecipeBuilder(), false) diff --git a/src/main/java/gregtech/api/recipes/builders/ChemicalReactorRecipeBuilder.java b/src/main/java/gregtech/api/recipes/builders/ChemicalReactorRecipeBuilder.java index 55ffa73407f..1693206c9cc 100644 --- a/src/main/java/gregtech/api/recipes/builders/ChemicalReactorRecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/builders/ChemicalReactorRecipeBuilder.java @@ -1,6 +1,9 @@ package gregtech.api.recipes.builders; -import gregtech.api.recipes.*; +import gregtech.api.recipes.Recipe; +import gregtech.api.recipes.RecipeBuilder; +import gregtech.api.recipes.RecipeMap; +import gregtech.api.recipes.RecipeMaps; import gregtech.api.util.ValidationResult; public class ChemicalReactorRecipeBuilder extends RecipeBuilder { @@ -34,13 +37,13 @@ public ChemicalReactorRecipeBuilder disableLargeRecipe() { public void buildAndRegister() { if (!disableLargeRecipe) { RecipeMaps.LARGE_CHEMICAL_RECIPES.recipeBuilder().copy() - .inputsIngredients(this.inputs) - .outputs(this.outputs) - .fluidInputs(this.fluidInputs) - .fluidOutputs(this.fluidOutputs) - .duration(this.duration) - .EUt(this.EUt) - .buildAndRegister(); + .inputsIngredients(this.inputs) + .outputs(this.outputs) + .fluidInputs(this.fluidInputs) + .fluidOutputs(this.fluidOutputs) + .duration(this.duration) + .EUt(this.EUt) + .buildAndRegister(); } super.buildAndRegister(); diff --git a/src/main/java/gregtech/api/recipes/builders/CokeOvenRecipeBuilder.java b/src/main/java/gregtech/api/recipes/builders/CokeOvenRecipeBuilder.java index f0e40bfe06e..7d361a547ee 100644 --- a/src/main/java/gregtech/api/recipes/builders/CokeOvenRecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/builders/CokeOvenRecipeBuilder.java @@ -77,7 +77,7 @@ public CokeOvenRecipeBuilder fluidOutput(FluidStack fluidOutput) { public ValidationResult build() { return ValidationResult.newResult(validate(), - new CokeOvenRecipe(input, output, fluidOutput, duration)); + new CokeOvenRecipe(input, output, fluidOutput, duration)); } protected EnumValidationResult validate() { diff --git a/src/main/java/gregtech/api/recipes/builders/FusionRecipeBuilder.java b/src/main/java/gregtech/api/recipes/builders/FusionRecipeBuilder.java index 135e06946b8..ae00494eeb4 100644 --- a/src/main/java/gregtech/api/recipes/builders/FusionRecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/builders/FusionRecipeBuilder.java @@ -61,8 +61,8 @@ public ValidationResult build() { @Override public String toString() { return new ToStringBuilder(this) - .appendSuper(super.toString()) - .append(FusionEUToStartProperty.getInstance().getKey(), EUToStart) - .toString(); + .appendSuper(super.toString()) + .append(FusionEUToStartProperty.getInstance().getKey(), EUToStart) + .toString(); } } diff --git a/src/main/java/gregtech/api/recipes/builders/PBFRecipeBuilder.java b/src/main/java/gregtech/api/recipes/builders/PBFRecipeBuilder.java index b9e988ce605..1dbf928ba48 100644 --- a/src/main/java/gregtech/api/recipes/builders/PBFRecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/builders/PBFRecipeBuilder.java @@ -86,7 +86,7 @@ public PBFRecipeBuilder output(OrePrefix prefix, Material material) { public ValidationResult build() { return ValidationResult.newResult(validate(), - new PrimitiveBlastFurnaceRecipe(input, output, duration, fuelAmount)); + new PrimitiveBlastFurnaceRecipe(input, output, duration, fuelAmount)); } protected EnumValidationResult validate() { diff --git a/src/main/java/gregtech/api/recipes/builders/UniversalDistillationRecipeBuilder.java b/src/main/java/gregtech/api/recipes/builders/UniversalDistillationRecipeBuilder.java index 124421e720c..20eeea77c06 100644 --- a/src/main/java/gregtech/api/recipes/builders/UniversalDistillationRecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/builders/UniversalDistillationRecipeBuilder.java @@ -41,7 +41,7 @@ public void buildAndRegister() { boolean fluidsDivisible = isFluidStackDivisibleForDistillery(this.fluidInputs.get(0), ratio) && isFluidStackDivisibleForDistillery(this.fluidOutputs.get(i), ratio); - FluidStack dividedInputFluid = new FluidStack(this.fluidInputs.get(0), Math.max(1, this.fluidInputs.get(0).amount / ratio)); + FluidStack dividedInputFluid = new FluidStack(this.fluidInputs.get(0), Math.max(1, this.fluidInputs.get(0).amount / ratio)); FluidStack dividedOutputFluid = new FluidStack(this.fluidOutputs.get(i), Math.max(1, this.fluidOutputs.get(i).amount / ratio)); if (shouldDivide && fluidsDivisible) diff --git a/src/main/java/gregtech/api/recipes/crafttweaker/CTRecipe.java b/src/main/java/gregtech/api/recipes/crafttweaker/CTRecipe.java index ce96942e2c3..2b235a85a05 100644 --- a/src/main/java/gregtech/api/recipes/crafttweaker/CTRecipe.java +++ b/src/main/java/gregtech/api/recipes/crafttweaker/CTRecipe.java @@ -33,29 +33,29 @@ public CTRecipe(RecipeMap recipeMap, Recipe backingRecipe) { @ZenGetter("inputs") public List getInputs() { return this.backingRecipe.getInputs().stream() - .map(InputIngredient::new) - .collect(Collectors.toList()); + .map(InputIngredient::new) + .collect(Collectors.toList()); } @ZenGetter("outputs") public List getOutputs() { return this.backingRecipe.getOutputs().stream() - .map(MCItemStack::new) - .collect(Collectors.toList()); + .map(MCItemStack::new) + .collect(Collectors.toList()); } @ZenMethod public List getResultItemOutputs(@Optional(valueLong = -1) long randomSeed, @Optional(valueLong = 1) int tier) { return this.backingRecipe.getResultItemOutputs(Integer.MAX_VALUE, randomSeed == -1L ? new Random() : new Random(randomSeed), tier).stream() - .map(MCItemStack::new) - .collect(Collectors.toList()); + .map(MCItemStack::new) + .collect(Collectors.toList()); } @ZenGetter("changedOutputs") public List getChancedOutputs() { ArrayList result = new ArrayList<>(); this.backingRecipe.getChancedOutputs().forEach(chanceEntry -> - result.add(new ChancedEntry(new MCItemStack(chanceEntry.getItemStack()), chanceEntry.getChance(), chanceEntry.getBoostPerTier()))); + result.add(new ChancedEntry(new MCItemStack(chanceEntry.getItemStack()), chanceEntry.getChance(), chanceEntry.getBoostPerTier()))); return result; } @@ -63,13 +63,13 @@ public List getChancedOutputs() { @ZenGetter("chancedOutputs") public List getChancedOutputsFix() { return getChancedOutputs(); - } - + } + @ZenGetter("fluidInputs") public List getFluidInputs() { return this.backingRecipe.getFluidInputs().stream() - .map(MCLiquidStack::new) - .collect(Collectors.toList()); + .map(MCLiquidStack::new) + .collect(Collectors.toList()); } @ZenMethod @@ -80,8 +80,8 @@ public boolean hasInputFluid(ILiquidStack liquidStack) { @ZenGetter("fluidOutputs") public List getFluidOutputs() { return this.backingRecipe.getFluidOutputs().stream() - .map(MCLiquidStack::new) - .collect(Collectors.toList()); + .map(MCLiquidStack::new) + .collect(Collectors.toList()); } @ZenGetter("duration") diff --git a/src/main/java/gregtech/api/recipes/crafttweaker/CTRecipeBuilder.java b/src/main/java/gregtech/api/recipes/crafttweaker/CTRecipeBuilder.java index 537620b6c25..68d054e1e24 100644 --- a/src/main/java/gregtech/api/recipes/crafttweaker/CTRecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/crafttweaker/CTRecipeBuilder.java @@ -48,8 +48,8 @@ public CTRecipeBuilder hidden() { @ZenMethod public CTRecipeBuilder inputs(IIngredient... ingredients) { this.backingBuilder.inputsIngredients(Arrays.stream(ingredients) - .map(s -> new CountableIngredient(new CraftTweakerIngredientWrapper(s), s.getAmount())) - .collect(Collectors.toList())); + .map(s -> new CountableIngredient(new CraftTweakerIngredientWrapper(s), s.getAmount())) + .collect(Collectors.toList())); return this; } @@ -77,16 +77,16 @@ public CTRecipeBuilder circuit(int num) { @ZenMethod public CTRecipeBuilder fluidInputs(ILiquidStack... ingredients) { this.backingBuilder.fluidInputs(Arrays.stream(ingredients) - .map(CraftTweakerMC::getLiquidStack) - .collect(Collectors.toList())); + .map(CraftTweakerMC::getLiquidStack) + .collect(Collectors.toList())); return this; } @ZenMethod public CTRecipeBuilder outputs(IItemStack... ingredients) { this.backingBuilder.outputs(Arrays.stream(ingredients) - .map(CraftTweakerMC::getItemStack) - .collect(Collectors.toList())); + .map(CraftTweakerMC::getItemStack) + .collect(Collectors.toList())); return this; } @@ -99,8 +99,8 @@ public CTRecipeBuilder chancedOutput(IItemStack outputStack, int chanceValue, in @ZenMethod public CTRecipeBuilder fluidOutputs(ILiquidStack... ingredients) { this.backingBuilder.fluidOutputs(Arrays.stream(ingredients) - .map(CraftTweakerMC::getLiquidStack) - .collect(Collectors.toList())); + .map(CraftTweakerMC::getLiquidStack) + .collect(Collectors.toList())); return this; } @@ -109,8 +109,8 @@ public CTRecipeBuilder property(String key, int value) { boolean applied = this.backingBuilder.applyProperty(key, value); if (!applied) { throw new IllegalArgumentException("Property " + - key + " cannot be applied to recipe type " + - backingBuilder.getClass().getSimpleName()); + key + " cannot be applied to recipe type " + + backingBuilder.getClass().getSimpleName()); } return this; } @@ -120,8 +120,8 @@ public CTRecipeBuilder property(String key, IItemStack item) { boolean applied = this.backingBuilder.applyProperty(key, CraftTweakerMC.getItemStack(item)); if (!applied) { throw new IllegalArgumentException("Property " + - key + " cannot be applied to recipe type " + - backingBuilder.getClass().getSimpleName() + " for Item " + CraftTweakerMC.getItemStack(item).getDisplayName()); + key + " cannot be applied to recipe type " + + backingBuilder.getClass().getSimpleName() + " for Item " + CraftTweakerMC.getItemStack(item).getDisplayName()); } return this; } @@ -143,8 +143,8 @@ public static class CraftTweakerIngredientWrapper extends Ingredient { public CraftTweakerIngredientWrapper(IIngredient ingredient) { super(ingredient.getItems().stream() - .map(CraftTweakerMC::getItemStack) - .toArray(ItemStack[]::new)); + .map(CraftTweakerMC::getItemStack) + .toArray(ItemStack[]::new)); this.ingredient = ingredient; } diff --git a/src/main/java/gregtech/api/recipes/crafttweaker/InputIngredient.java b/src/main/java/gregtech/api/recipes/crafttweaker/InputIngredient.java index 114a4728de6..b78a11e0e6c 100644 --- a/src/main/java/gregtech/api/recipes/crafttweaker/InputIngredient.java +++ b/src/main/java/gregtech/api/recipes/crafttweaker/InputIngredient.java @@ -19,8 +19,8 @@ public class InputIngredient implements IIngredient { public InputIngredient(CountableIngredient backingIngredient) { iingredient = CraftTweakerMC - .getIIngredient(backingIngredient.getIngredient()) - .amount(backingIngredient.getCount()); + .getIIngredient(backingIngredient.getIngredient()) + .amount(backingIngredient.getCount()); } @Override diff --git a/src/main/java/gregtech/api/recipes/crafttweaker/MetaItemBracketHandler.java b/src/main/java/gregtech/api/recipes/crafttweaker/MetaItemBracketHandler.java index 9007ca83d5b..3f59050768c 100644 --- a/src/main/java/gregtech/api/recipes/crafttweaker/MetaItemBracketHandler.java +++ b/src/main/java/gregtech/api/recipes/crafttweaker/MetaItemBracketHandler.java @@ -6,11 +6,11 @@ import crafttweaker.api.item.IItemStack; import crafttweaker.mc1120.item.MCItemStack; import crafttweaker.zenscript.IBracketHandler; +import gregtech.api.items.materialitem.MetaPrefixItem; import gregtech.api.items.metaitem.MetaItem; import gregtech.api.items.metaitem.MetaItem.MetaValueItem; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.ore.OrePrefix; -import gregtech.api.items.materialitem.MetaPrefixItem; import net.minecraft.item.ItemStack; import stanhebben.zenscript.compiler.IEnvironmentGlobal; import stanhebben.zenscript.expression.ExpressionCallStatic; @@ -41,11 +41,11 @@ public static void rebuildComponentRegistry() { if (item instanceof MetaPrefixItem) { MetaPrefixItem metaPrefixItem = ((MetaPrefixItem) item); OrePrefix prefix = metaPrefixItem.getOrePrefix(); - for(ItemStack entry : ((MetaPrefixItem) item).getEntries()) { + for (ItemStack entry : ((MetaPrefixItem) item).getEntries()) { metaItemNames.put(prefix.name() + OreDictUnifier.getMaterial(entry).material.toCamelCaseString(), entry); } } - for(MetaValueItem entry : item.getAllItems()) { + for (MetaValueItem entry : item.getAllItems()) { if (!entry.unlocalizedName.equals("meta_item")) { metaItemNames.put(entry.unlocalizedName, entry.getStackForm()); } @@ -55,7 +55,7 @@ public static void rebuildComponentRegistry() { public static IItemStack getMetaItem(String name) { ItemStack item = metaItemNames.get(name); - if(item != null) { + if (item != null) { return new MCItemStack(item); } else { return null; @@ -72,7 +72,7 @@ public IZenSymbol resolve(IEnvironmentGlobal environment, List tokens) { nameBuilder.append(tokens.get(i).getValue()); } return position -> new ExpressionCallStatic(position, environment, method, - new ExpressionString(position, nameBuilder.toString())); + new ExpressionString(position, nameBuilder.toString())); } } diff --git a/src/main/java/gregtech/api/recipes/crafttweaker/MetaTileEntityBracketHandler.java b/src/main/java/gregtech/api/recipes/crafttweaker/MetaTileEntityBracketHandler.java index 809a8507cf8..ab3f0cf4f51 100644 --- a/src/main/java/gregtech/api/recipes/crafttweaker/MetaTileEntityBracketHandler.java +++ b/src/main/java/gregtech/api/recipes/crafttweaker/MetaTileEntityBracketHandler.java @@ -57,7 +57,7 @@ public IZenSymbol resolve(IEnvironmentGlobal environment, List tokens) { nameBuilder.append(tokens.get(i).getValue()); } return position -> new ExpressionCallStatic(position, environment, method, - new ExpressionString(position, nameBuilder.toString())); + new ExpressionString(position, nameBuilder.toString())); } } diff --git a/src/main/java/gregtech/api/recipes/ingredients/IntCircuitIngredient.java b/src/main/java/gregtech/api/recipes/ingredients/IntCircuitIngredient.java index a4bf2294ead..ad369557d8e 100644 --- a/src/main/java/gregtech/api/recipes/ingredients/IntCircuitIngredient.java +++ b/src/main/java/gregtech/api/recipes/ingredients/IntCircuitIngredient.java @@ -33,7 +33,7 @@ public static void setCircuitConfiguration(ItemStack itemStack, int configuratio public static int getCircuitConfiguration(ItemStack itemStack) { if (!MetaItems.INTEGRATED_CIRCUIT.isItemEqual(itemStack) || - !itemStack.hasTagCompound()) return 0; + !itemStack.hasTagCompound()) return 0; NBTTagCompound tagCompound = itemStack.getTagCompound(); return tagCompound.getInteger("Configuration"); } @@ -56,7 +56,7 @@ public IntCircuitIngredient(int... matchingConfigurations) { @Override public boolean apply(@Nullable ItemStack itemStack) { return itemStack != null && MetaItems.INTEGRATED_CIRCUIT.isItemEqual(itemStack) && - ArrayUtils.contains(matchingConfigurations, getCircuitConfiguration(itemStack)); + ArrayUtils.contains(matchingConfigurations, getCircuitConfiguration(itemStack)); } @Override diff --git a/src/main/java/gregtech/api/recipes/ingredients/NBTIngredient.java b/src/main/java/gregtech/api/recipes/ingredients/NBTIngredient.java index b0f5bd303ac..2e7f67a81f3 100644 --- a/src/main/java/gregtech/api/recipes/ingredients/NBTIngredient.java +++ b/src/main/java/gregtech/api/recipes/ingredients/NBTIngredient.java @@ -19,8 +19,8 @@ public boolean apply(@Nullable ItemStack input) { if (input == null) return false; return this.stack.getItem() == input.getItem() && - this.stack.getItemDamage() == input.getItemDamage() && - ItemStack.areItemStackShareTagsEqual(this.stack, input); + this.stack.getItemDamage() == input.getItemDamage() && + ItemStack.areItemStackShareTagsEqual(this.stack, input); } @Override diff --git a/src/main/java/gregtech/api/recipes/machines/FuelRecipeMap.java b/src/main/java/gregtech/api/recipes/machines/FuelRecipeMap.java index d22cab1b6ee..5e95f907627 100644 --- a/src/main/java/gregtech/api/recipes/machines/FuelRecipeMap.java +++ b/src/main/java/gregtech/api/recipes/machines/FuelRecipeMap.java @@ -41,8 +41,8 @@ public static List getRecipeMaps() { @ZenMethod public static FuelRecipeMap getByName(String unlocalizedName) { return RECIPE_MAPS.stream() - .filter(map -> map.unlocalizedName.equals(unlocalizedName)) - .findFirst().orElse(null); + .filter(map -> map.unlocalizedName.equals(unlocalizedName)) + .findFirst().orElse(null); } @ZenMethod diff --git a/src/main/java/gregtech/api/recipes/machines/RecipeMapFormingPress.java b/src/main/java/gregtech/api/recipes/machines/RecipeMapFormingPress.java index 6561fcad87a..8e114e192a5 100644 --- a/src/main/java/gregtech/api/recipes/machines/RecipeMapFormingPress.java +++ b/src/main/java/gregtech/api/recipes/machines/RecipeMapFormingPress.java @@ -46,11 +46,11 @@ public Recipe findRecipe(long voltage, List inputs, List ItemStack output = GTUtility.copyAmount(1, itemStack); output.setStackDisplayName(inputs.get(0).getDisplayName()); return this.recipeBuilder() - .notConsumable(new NBTIngredient(moldStack)) //recipe is reusable as long as mold stack matches - .inputs(GTUtility.copyAmount(1, itemStack)) - .outputs(output) - .duration(40).EUt(4) - .build().getResult(); + .notConsumable(new NBTIngredient(moldStack)) //recipe is reusable as long as mold stack matches + .inputs(GTUtility.copyAmount(1, itemStack)) + .outputs(output) + .duration(40).EUt(4) + .build().getResult(); } return null; } diff --git a/src/main/java/gregtech/api/recipes/machines/RecipeMapFurnace.java b/src/main/java/gregtech/api/recipes/machines/RecipeMapFurnace.java index c471f71287e..63f64c6e0a1 100644 --- a/src/main/java/gregtech/api/recipes/machines/RecipeMapFurnace.java +++ b/src/main/java/gregtech/api/recipes/machines/RecipeMapFurnace.java @@ -25,15 +25,15 @@ public Recipe findRecipe(long voltage, List inputs, List if (normalRecipe != null || inputs.size() == 0 || inputs.get(0).isEmpty()) return normalRecipe; - for(ItemStack input : inputs) { + for (ItemStack input : inputs) { ItemStack output = ModHandler.getSmeltingOutput(input); - if(!output.isEmpty()) { + if (!output.isEmpty()) { return this.recipeBuilder() - .inputs(GTUtility.copyAmount(1, input)) - .outputs(output) - .duration(128).EUt(4) - .build().getResult(); + .inputs(GTUtility.copyAmount(1, input)) + .outputs(output) + .duration(128).EUt(4) + .build().getResult(); } } diff --git a/src/main/java/gregtech/api/recipes/recipeproperties/FusionEUToStartProperty.java b/src/main/java/gregtech/api/recipes/recipeproperties/FusionEUToStartProperty.java index 6b766b8e1bb..267f48c0c1a 100644 --- a/src/main/java/gregtech/api/recipes/recipeproperties/FusionEUToStartProperty.java +++ b/src/main/java/gregtech/api/recipes/recipeproperties/FusionEUToStartProperty.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.TreeMap; -public class FusionEUToStartProperty extends RecipeProperty{ +public class FusionEUToStartProperty extends RecipeProperty { private static final String KEY = "eu_to_start"; @@ -38,7 +38,7 @@ private String getFusionTier(Long eu) { Map.Entry mapEntry = registeredFusionTiers.ceilingEntry(eu); - if(mapEntry == null) { + if (mapEntry == null) { throw new IllegalArgumentException("Value is above registered maximum EU values"); } diff --git a/src/main/java/gregtech/api/recipes/recipeproperties/ImplosionExplosiveProperty.java b/src/main/java/gregtech/api/recipes/recipeproperties/ImplosionExplosiveProperty.java index 0174dfa9c7f..b10d9529146 100644 --- a/src/main/java/gregtech/api/recipes/recipeproperties/ImplosionExplosiveProperty.java +++ b/src/main/java/gregtech/api/recipes/recipeproperties/ImplosionExplosiveProperty.java @@ -4,7 +4,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -public class ImplosionExplosiveProperty extends RecipeProperty{ +public class ImplosionExplosiveProperty extends RecipeProperty { private static final String KEY = "explosives"; diff --git a/src/main/java/gregtech/api/recipes/recipeproperties/RecipeProperty.java b/src/main/java/gregtech/api/recipes/recipeproperties/RecipeProperty.java index 918dc6eaa5e..0faa606db2e 100644 --- a/src/main/java/gregtech/api/recipes/recipeproperties/RecipeProperty.java +++ b/src/main/java/gregtech/api/recipes/recipeproperties/RecipeProperty.java @@ -29,6 +29,7 @@ public T castValue(Object value) { /** * Controls if the property should display any information in JEI + * * @return true to hide information from JEI */ public boolean isHidden() { diff --git a/src/main/java/gregtech/api/recipes/recipeproperties/RecipePropertyStorage.java b/src/main/java/gregtech/api/recipes/recipeproperties/RecipePropertyStorage.java index c3d37ee6cfd..96597a7afac 100644 --- a/src/main/java/gregtech/api/recipes/recipeproperties/RecipePropertyStorage.java +++ b/src/main/java/gregtech/api/recipes/recipeproperties/RecipePropertyStorage.java @@ -2,7 +2,10 @@ import gregtech.api.util.GTLog; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; public class RecipePropertyStorage { private static final String STACKTRACE = "Stacktrace:"; diff --git a/src/main/java/gregtech/api/render/MetaTileEntityRenderer.java b/src/main/java/gregtech/api/render/MetaTileEntityRenderer.java index 74a076945e9..f54ffc84fb7 100644 --- a/src/main/java/gregtech/api/render/MetaTileEntityRenderer.java +++ b/src/main/java/gregtech/api/render/MetaTileEntityRenderer.java @@ -88,12 +88,12 @@ public void renderItem(ItemStack rawStack, TransformType transformType) { renderState.startDrawing(GL11.GL_QUADS, DefaultVertexFormats.ITEM); metaTileEntity.setRenderContextStack(stack); metaTileEntity.renderMetaTileEntity(renderState, new Matrix4(), new IVertexOperation[0]); - if(metaTileEntity instanceof IFastRenderMetaTileEntity) { + if (metaTileEntity instanceof IFastRenderMetaTileEntity) { ((IFastRenderMetaTileEntity) metaTileEntity).renderMetaTileEntityFast(renderState, new Matrix4(), 0.0f); } metaTileEntity.setRenderContextStack(null); renderState.draw(); - if(metaTileEntity instanceof IRenderMetaTileEntity) { + if (metaTileEntity instanceof IRenderMetaTileEntity) { ((IRenderMetaTileEntity) metaTileEntity).renderMetaTileEntityDynamic(0.0, 0.0, 0.0, 0.0f); } GlStateManager.disableBlend(); diff --git a/src/main/java/gregtech/api/render/MetaTileEntityTESR.java b/src/main/java/gregtech/api/render/MetaTileEntityTESR.java index 2ff7cb34551..28603fca290 100644 --- a/src/main/java/gregtech/api/render/MetaTileEntityTESR.java +++ b/src/main/java/gregtech/api/render/MetaTileEntityTESR.java @@ -31,19 +31,19 @@ public class MetaTileEntityTESR extends TileEntitySpecialRenderer> coverFast = new ArrayList<>(); - for (EnumFacing side: EnumFacing.VALUES){ + for (EnumFacing side : EnumFacing.VALUES) { CoverBehavior cover = metaTileEntity.getCoverAtSide(side); if (cover instanceof IFastRenderMetaTileEntity) { coverFast.add(new Tuple<>((IFastRenderMetaTileEntity) cover, side)); - } else if (cover instanceof IRenderMetaTileEntity){ + } else if (cover instanceof IRenderMetaTileEntity) { ((IRenderMetaTileEntity) cover).renderMetaTileEntityDynamic(x, y, z, partialTicks); } } @@ -53,9 +53,10 @@ public void render(MetaTileEntityHolder te, double x, double y, double z, float } } - /** Used Specifically to render covers that are IFastRenderMetaTileEntity + /** + * Used Specifically to render covers that are IFastRenderMetaTileEntity * Adapted from renderTileEntityFastPart - * **/ + **/ private void renderCoverFast(MetaTileEntityHolder te, double x, double y, double z, float partialTicks, int destroyStage, float alpha, List> coverList) { Matrix4 translation = (new Matrix4()).translate(x, y, z); @@ -68,8 +69,7 @@ private void renderCoverFast(MetaTileEntityHolder te, double x, double y, double if (Minecraft.isAmbientOcclusionEnabled()) { GlStateManager.shadeModel(GL11.GL_SMOOTH); - } - else { + } else { GlStateManager.shadeModel(GL11.GL_FLAT); } buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); @@ -98,8 +98,7 @@ private void renderTileEntityFastPart(MetaTileEntityHolder te, double x, double if (Minecraft.isAmbientOcclusionEnabled()) { GlStateManager.shadeModel(GL11.GL_SMOOTH); - } - else { + } else { GlStateManager.shadeModel(GL11.GL_FLAT); } buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); @@ -139,7 +138,7 @@ public boolean isGlobalRenderer(@Nonnull MetaTileEntityHolder te) { if (((IRenderMetaTileEntity) te.getMetaTileEntity()).isGlobalRenderer()) { return true; } - } else if (te.getMetaTileEntity() instanceof IFastRenderMetaTileEntity){ + } else if (te.getMetaTileEntity() instanceof IFastRenderMetaTileEntity) { return ((IFastRenderMetaTileEntity) te.getMetaTileEntity()).isGlobalRenderer(); } return false; diff --git a/src/main/java/gregtech/api/render/SafeRenderer.java b/src/main/java/gregtech/api/render/SafeRenderer.java index 99380d0c345..62ddd7fe0fb 100644 --- a/src/main/java/gregtech/api/render/SafeRenderer.java +++ b/src/main/java/gregtech/api/render/SafeRenderer.java @@ -62,8 +62,8 @@ public void render(CCRenderState renderState, Matrix4 translation, IVertexOperat for (EnumFacing renderSide : EnumFacing.VALUES) { TextureAtlasSprite baseSprite = renderSide.getAxis() == Axis.Y ? - textures[renderSide.getIndex()] : - renderSide == EnumFacing.NORTH ? textures[3] : textures[2]; + textures[renderSide.getIndex()] : + renderSide == EnumFacing.NORTH ? textures[3] : textures[2]; Textures.renderFace(renderState, translation, pipeline, renderSide, mainBoxOuter, baseSprite); if (renderSide == EnumFacing.NORTH) continue; Textures.renderFace(renderState, translation, pipeline, renderSide, mainBoxInner, baseSprite); @@ -75,8 +75,8 @@ public void render(CCRenderState renderState, Matrix4 translation, IVertexOperat for (EnumFacing renderSide : EnumFacing.VALUES) { TextureAtlasSprite doorSprite = - renderSide == EnumFacing.NORTH ? textures[6] : - renderSide == EnumFacing.SOUTH ? textures[5] : textures[4]; + renderSide == EnumFacing.NORTH ? textures[6] : + renderSide == EnumFacing.SOUTH ? textures[5] : textures[4]; Textures.renderFace(renderState, translation, pipeline, renderSide, doorBox, doorSprite); } } diff --git a/src/main/java/gregtech/api/render/ToolRenderHandler.java b/src/main/java/gregtech/api/render/ToolRenderHandler.java index cb109f11642..567f7165f72 100644 --- a/src/main/java/gregtech/api/render/ToolRenderHandler.java +++ b/src/main/java/gregtech/api/render/ToolRenderHandler.java @@ -34,7 +34,9 @@ public class ToolRenderHandler implements IResourceManagerReloadListener { public static final ToolRenderHandler INSTANCE = new ToolRenderHandler(); - private ToolRenderHandler() {} + + private ToolRenderHandler() { + } private final TextureAtlasSprite[] destroyBlockIcons = new TextureAtlasSprite[10]; @@ -42,7 +44,7 @@ private ToolRenderHandler() {} public void onRenderWorldLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); //render block damage progress for all breakers - for(int breakerEntityId : event.getContext().damagedBlocks.keySet()) { + for (int breakerEntityId : event.getContext().damagedBlocks.keySet()) { Entity breakerEntity = mc.world.getEntityByID(breakerEntityId); if (!(breakerEntity instanceof EntityPlayer)) { continue; @@ -66,7 +68,7 @@ public void onRenderWorldLast(RenderWorldLastEvent event) { //render block selection only for current player PlayerControllerMP playerController = mc.playerController; - if(!playerController.getIsHittingBlock()) { + if (!playerController.getIsHittingBlock()) { ItemStack itemStack = mc.player.getHeldItem(EnumHand.MAIN_HAND); if (itemStack.getItem() instanceof IAOEItem) { RayTraceResult rayTraceResult = RayTracer.retrace(mc.player); @@ -87,7 +89,7 @@ private void preRenderSelectionOutline() { GlStateManager.disableTexture2D(); GlStateManager.depthMask(false); } - + private void postRenderSelectionOutline() { GlStateManager.depthMask(true); GlStateManager.enableTexture2D(); @@ -114,13 +116,13 @@ private void postRenderDamagedBlocks() { GlStateManager.depthMask(true); GlStateManager.popMatrix(); } - + public void drawSelectionOutlines(Minecraft mc, List blocksToRender, Entity entityIn, float partialTicks) { double d3 = entityIn.lastTickPosX + (entityIn.posX - entityIn.lastTickPosX) * partialTicks; double d4 = entityIn.lastTickPosY + (entityIn.posY - entityIn.lastTickPosY) * partialTicks; double d5 = entityIn.lastTickPosZ + (entityIn.posZ - entityIn.lastTickPosZ) * partialTicks; - for(BlockPos blockPos : blocksToRender) { + for (BlockPos blockPos : blocksToRender) { IBlockState blockState = mc.world.getBlockState(blockPos); AxisAlignedBB box = blockState.getSelectedBoundingBox(mc.world, blockPos).grow(0.002D).offset(-d3, -d4, -d5); RenderGlobal.drawSelectionBoundingBox(box, 0.0F, 0.0F, 0.0F, 0.4F); diff --git a/src/main/java/gregtech/api/render/UVMirror.java b/src/main/java/gregtech/api/render/UVMirror.java index 2d88602f994..486a2b8e9ee 100644 --- a/src/main/java/gregtech/api/render/UVMirror.java +++ b/src/main/java/gregtech/api/render/UVMirror.java @@ -3,7 +3,7 @@ import codechicken.lib.vec.uv.UV; import codechicken.lib.vec.uv.UVTransformation; -public class UVMirror extends UVTransformation{ +public class UVMirror extends UVTransformation { public final double minU; public final double maxU; public final double minV; @@ -20,12 +20,12 @@ public UVMirror(double minU, double maxU, double minV, double maxV) { public void apply(UV vec) { if (vec.u == minU) { vec.u = maxU; - } else if (vec.u == maxU){ + } else if (vec.u == maxU) { vec.u = minU; } if (vec.v == minV) { vec.v = maxV; - } else if (vec.v == maxV){ + } else if (vec.v == maxV) { vec.v = minV; } } diff --git a/src/main/java/gregtech/api/render/scene/WorldSceneRenderer.java b/src/main/java/gregtech/api/render/scene/WorldSceneRenderer.java index 9f0659c93b3..af0b2538135 100644 --- a/src/main/java/gregtech/api/render/scene/WorldSceneRenderer.java +++ b/src/main/java/gregtech/api/render/scene/WorldSceneRenderer.java @@ -11,7 +11,10 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.BlockRendererDispatcher; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.init.Blocks; @@ -102,7 +105,7 @@ public void render(int x, int y, int width, int height, int backgroundColor) { if (renderFilter != null && !renderFilter.test(pos)) continue; //do not render if position is skipped IBlockState blockState = world.getBlockState(pos); - for(BlockRenderLayer renderLayer : BlockRenderLayer.values()) { + for (BlockRenderLayer renderLayer : BlockRenderLayer.values()) { if (!blockState.getBlock().canRenderInLayer(blockState, renderLayer)) continue; ForgeHooksClient.setRenderLayer(renderLayer); dispatcher.renderBlock(blockState, pos, world, bufferBuilder); @@ -142,7 +145,7 @@ public void render(int x, int y, int width, int height, int backgroundColor) { private BlockPos handleMouseHit(Vec2f mousePosition) { //read depth of pixel under mouse GL11.glReadPixels((int) mousePosition.x, (int) mousePosition.y, 1, 1, - GL11.GL_DEPTH_COMPONENT, GL11.GL_FLOAT, PIXEL_DEPTH_BUFFER); + GL11.GL_DEPTH_COMPONENT, GL11.GL_FLOAT, PIXEL_DEPTH_BUFFER); //rewind buffer after write by glReadPixels PIXEL_DEPTH_BUFFER.rewind(); @@ -165,7 +168,7 @@ private BlockPos handleMouseHit(Vec2f mousePosition) { //call gluUnProject with retrieved parameters GLU.gluUnProject(mousePosition.x, mousePosition.y, pixelDepth, - MODELVIEW_MATRIX_BUFFER, PROJECTION_MATRIX_BUFFER, VIEWPORT_BUFFER, OBJECT_POS_BUFFER); + MODELVIEW_MATRIX_BUFFER, PROJECTION_MATRIX_BUFFER, VIEWPORT_BUFFER, OBJECT_POS_BUFFER); //rewind buffers after read by gluUnProject VIEWPORT_BUFFER.rewind(); diff --git a/src/main/java/gregtech/api/unification/OreDictUnifier.java b/src/main/java/gregtech/api/unification/OreDictUnifier.java index 86789352e6e..683703216fb 100644 --- a/src/main/java/gregtech/api/unification/OreDictUnifier.java +++ b/src/main/java/gregtech/api/unification/OreDictUnifier.java @@ -2,9 +2,9 @@ import com.google.common.base.CaseFormat; import com.google.common.base.Joiner; -import gregtech.api.unification.material.MaterialRegistry; import gregtech.api.unification.material.MarkerMaterial; import gregtech.api.unification.material.Material; +import gregtech.api.unification.material.MaterialRegistry; import gregtech.api.unification.material.properties.PropertyKey; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.*; @@ -169,8 +169,8 @@ public static Set getOreDictionaryNames(ItemStack itemStack) { public static List getAllWithOreDictionaryName(String oreDictionaryName) { return oreDictNameStacks.get(oreDictionaryName).stream() - .map(ItemStack::copy) - .collect(Collectors.toList()); + .map(ItemStack::copy) + .collect(Collectors.toList()); } @Nullable @@ -238,8 +238,8 @@ public static ItemStack get(String oreDictName) { public static List> getAllItemInfos() { return materialUnificationInfo.entrySet().stream() - .map(entry -> new SimpleEntry<>(entry.getKey().toItemStack(), entry.getValue())) - .collect(Collectors.toList()); + .map(entry -> new SimpleEntry<>(entry.getKey().toItemStack(), entry.getValue())) + .collect(Collectors.toList()); } public static List getAll(UnificationEntry unificationEntry) { diff --git a/src/main/java/gregtech/api/unification/crafttweaker/MaterialBracketHandler.java b/src/main/java/gregtech/api/unification/crafttweaker/MaterialBracketHandler.java index 081c9e12586..e14847f33df 100644 --- a/src/main/java/gregtech/api/unification/crafttweaker/MaterialBracketHandler.java +++ b/src/main/java/gregtech/api/unification/crafttweaker/MaterialBracketHandler.java @@ -38,7 +38,7 @@ public IZenSymbol resolve(IEnvironmentGlobal environment, List tokens) { nameBuilder.append(tokens.get(i).getValue()); } return position -> new ExpressionCallStatic(position, environment, method, - new ExpressionString(position, nameBuilder.toString())); + new ExpressionString(position, nameBuilder.toString())); } } diff --git a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java index ce950e6285a..a05ed42eae2 100644 --- a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java +++ b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java @@ -50,7 +50,7 @@ public static class Color { * Arrays containing all possible color values (without Colorless!) */ public static final MarkerMaterial[] VALUES = new MarkerMaterial[]{ - White, Orange, Magenta, LightBlue, Yellow, Lime, Pink, Gray, Silver, Cyan, Purple, Blue, Brown, Green, Red, Black + White, Orange, Magenta, LightBlue, Yellow, Lime, Pink, Gray, Silver, Cyan, Purple, Blue, Brown, Green, Red, Black }; /** diff --git a/src/main/java/gregtech/api/unification/material/Material.java b/src/main/java/gregtech/api/unification/material/Material.java index 184997e66e3..8df98a59263 100644 --- a/src/main/java/gregtech/api/unification/material/Material.java +++ b/src/main/java/gregtech/api/unification/material/Material.java @@ -136,9 +136,9 @@ public boolean hasFlags(MaterialFlag... flags) { protected void calculateDecompositionType() { if (!materialInfo.componentList.isEmpty() && - !hasFlag(MaterialFlags.DECOMPOSITION_BY_CENTRIFUGING) && - !hasFlag(MaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) && - !hasFlag(MaterialFlags.DISABLE_DECOMPOSITION)) { + !hasFlag(MaterialFlags.DECOMPOSITION_BY_CENTRIFUGING) && + !hasFlag(MaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) && + !hasFlag(MaterialFlags.DISABLE_DECOMPOSITION)) { boolean onlyMetalMaterials = true; for (MaterialStack materialStack : materialInfo.componentList) { Material material = materialStack.material; @@ -393,7 +393,6 @@ public static class Builder { * @param id The MetaItemSubID for this Material. Must be unique. * @param name The Name of this Material. Will be formatted as * "material." for the Translation Key. - * * @since GTCEu 2.0.0 */ public Builder(int id, String name) { @@ -422,7 +421,6 @@ public Builder fluid() { * Will be created without a Fluid Block. * * @param type The {@link FluidType} of this Material, either Fluid or Gas. - * * @throws IllegalArgumentException If a {@link FluidProperty} has already been added to this Material. */ public Builder fluid(FluidType type) { @@ -434,7 +432,6 @@ public Builder fluid(FluidType type) { * * @param type The {@link FluidType} of this Material, either Fluid or Gas. * @param hasBlock If true, create a Fluid Block for this Material. - * * @throws IllegalArgumentException If a {@link FluidProperty} has already been added to this Material. */ public Builder fluid(FluidType type, boolean hasBlock) { @@ -471,7 +468,6 @@ public Builder dust() { * @param harvestLevel The Harvest Level of this block for Mining.
* If this Material also has a {@link ToolProperty}, this value will * also be used to determine the tool's Mining Level. - * * @throws IllegalArgumentException If a {@link DustProperty} has already been added to this Material. */ public Builder dust(int harvestLevel) { @@ -485,7 +481,6 @@ public Builder dust(int harvestLevel) { * If this Material also has a {@link ToolProperty}, this value will * also be used to determine the tool's Mining Level. * @param burnTime The Burn Time (in ticks) of this Material as a Furnace Fuel. - * * @throws IllegalArgumentException If a {@link DustProperty} has already been added to this Material. */ public Builder dust(int harvestLevel, int burnTime) { @@ -514,7 +509,6 @@ public Builder ingot() { * If this Material also has a {@link ToolProperty}, this value will * also be used to determine the tool's Mining level.
* If this Material already had a Harvest Level defined, it will be overridden. - * * @throws IllegalArgumentException If an {@link IngotProperty} has already been added to this Material. */ public Builder ingot(int harvestLevel) { @@ -531,7 +525,6 @@ public Builder ingot(int harvestLevel) { * If this Material already had a Harvest Level defined, it will be overridden. * @param burnTime The Burn Time (in ticks) of this Material as a Furnace Fuel.
* If this Material already had a Burn Time defined, it will be overridden. - * * @throws IllegalArgumentException If an {@link IngotProperty} has already been added to this Material. */ public Builder ingot(int harvestLevel, int burnTime) { @@ -566,7 +559,6 @@ public Builder gem() { * If this Material also has a {@link ToolProperty}, this value will * also be used to determine the tool's Mining level.
* If this Material already had a Harvest Level defined, it will be overridden. - * * @throws IllegalArgumentException If a {@link GemProperty} has already been added to this Material. */ public Builder gem(int harvestLevel) { @@ -583,7 +575,6 @@ public Builder gem(int harvestLevel) { * If this Material already had a Harvest Level defined, it will be overridden. * @param burnTime The Burn Time (in ticks) of this Material as a Furnace Fuel.
* If this Material already had a Burn Time defined, it will be overridden. - * */ public Builder gem(int harvestLevel, int burnTime) { DustProperty prop = properties.getProperty(PropertyKey.DUST); @@ -785,44 +776,44 @@ public Material build() { private static class MaterialInfo { /** * The unlocalized name of this Material. - * + *

* Required. */ private final String name; /** * The MetaItem ID of this Material. - * + *

* Required. */ private final int metaItemSubId; /** * The color of this Material. - * + *

* Default: 0xFFFFFF if no Components, otherwise it will be the average of Components. */ private int color = -1; /** * The IconSet of this Material. - * + *

* Default: - GEM_VERTICAL if it has GemProperty. - * - DULL if has DustProperty or IngotProperty. - * - FLUID or GAS if only has FluidProperty or PlasmaProperty, depending on {@link FluidType}. + * - DULL if has DustProperty or IngotProperty. + * - FLUID or GAS if only has FluidProperty or PlasmaProperty, depending on {@link FluidType}. */ private MaterialIconSet iconSet; /** * The components of this Material. - * + *

* Default: none. */ private ImmutableList componentList; /** * The Element of this Material, if it is a direct Element. - * + *

* Default: none. */ private Element element; diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 0168da2692e..d70c70deadd 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -11,20 +11,20 @@ /** * Material Registration. - * + *

* All Material Builders should follow this general formatting: - * + *

* material = new MaterialBuilder(id, name) - * .ingot().fluid().ore() <--- types - * .color().iconSet() <--- appearance - * .flags() <--- special generation - * .element() / .components() <--- composition - * .toolStats() <--- - * .oreByProducts() | additional properties - * ... <--- - * .blastTemp() <--- blast temperature - * .build(); - * + * .ingot().fluid().ore() <--- types + * .color().iconSet() <--- appearance + * .flags() <--- special generation + * .element() / .components() <--- composition + * .toolStats() <--- + * .oreByProducts() | additional properties + * ... <--- + * .blastTemp() <--- blast temperature + * .build(); + *

* Use defaults to your advantage! Some defaults: * - iconSet: DULL * - color: 0xFFFFFF diff --git a/src/main/java/gregtech/api/unification/material/properties/BlastProperty.java b/src/main/java/gregtech/api/unification/material/properties/BlastProperty.java index d3cbfc59192..c0b8424ccdf 100644 --- a/src/main/java/gregtech/api/unification/material/properties/BlastProperty.java +++ b/src/main/java/gregtech/api/unification/material/properties/BlastProperty.java @@ -6,7 +6,7 @@ public class BlastProperty implements IMaterialProperty { * Blast Furnace Temperature of this Material. * If below 1000K, Primitive Blast Furnace recipes will be also added. * If above 1750K, a Hot Ingot and its Vacuum Freezer recipe will be also added. - * + *

* If a Material with this Property has a Fluid, its temperature * will be set to this if it is the default Fluid temperature. */ diff --git a/src/main/java/gregtech/api/unification/material/properties/DustProperty.java b/src/main/java/gregtech/api/unification/material/properties/DustProperty.java index 12dc5a1a1c6..75e8fcf1099 100644 --- a/src/main/java/gregtech/api/unification/material/properties/DustProperty.java +++ b/src/main/java/gregtech/api/unification/material/properties/DustProperty.java @@ -6,7 +6,7 @@ public class DustProperty implements IMaterialProperty { /** * Tool level needed to harvest block of this Material. - * + *

* Default: 2 (Iron). */ //@ZenProperty @@ -15,7 +15,7 @@ public class DustProperty implements IMaterialProperty { /** * Burn time of this Material when used as fuel in Furnace smelting. * Zero or negative value indicates that this Material cannot be used as fuel. - * + *

* Default: 0. */ //@ZenProperty diff --git a/src/main/java/gregtech/api/unification/material/properties/FluidPipeProperties.java b/src/main/java/gregtech/api/unification/material/properties/FluidPipeProperties.java index 625a8483694..72198f3f769 100644 --- a/src/main/java/gregtech/api/unification/material/properties/FluidPipeProperties.java +++ b/src/main/java/gregtech/api/unification/material/properties/FluidPipeProperties.java @@ -38,7 +38,7 @@ public boolean equals(Object o) { if (!(o instanceof FluidPipeProperties)) return false; FluidPipeProperties that = (FluidPipeProperties) o; return maxFluidTemperature == that.maxFluidTemperature && - throughput == that.throughput; + throughput == that.throughput; } @Override diff --git a/src/main/java/gregtech/api/unification/material/properties/IngotProperty.java b/src/main/java/gregtech/api/unification/material/properties/IngotProperty.java index 7ad94d72f6e..88162984844 100644 --- a/src/main/java/gregtech/api/unification/material/properties/IngotProperty.java +++ b/src/main/java/gregtech/api/unification/material/properties/IngotProperty.java @@ -20,7 +20,7 @@ public class IngotProperty implements IMaterialProperty { /** * Specifies a Material into which this Material Macerates into. - * + *

* Default: this Material. */ private Material macerateInto; diff --git a/src/main/java/gregtech/api/unification/material/properties/MaterialProperties.java b/src/main/java/gregtech/api/unification/material/properties/MaterialProperties.java index bd71f09f4de..55760434572 100644 --- a/src/main/java/gregtech/api/unification/material/properties/MaterialProperties.java +++ b/src/main/java/gregtech/api/unification/material/properties/MaterialProperties.java @@ -33,7 +33,8 @@ public > boolean hasProperty(PropertyKey key) public > void setProperty(PropertyKey key, IMaterialProperty value) { if (value == null) throw new IllegalArgumentException("Material Property must not be null!"); - if (hasProperty(key)) throw new IllegalArgumentException("Material Property " + key.toString() + " already registered!"); + if (hasProperty(key)) + throw new IllegalArgumentException("Material Property " + key.toString() + " already registered!"); propertyMap.put(key, value); } diff --git a/src/main/java/gregtech/api/unification/material/properties/OreProperty.java b/src/main/java/gregtech/api/unification/material/properties/OreProperty.java index d213dddc03f..7227f33542d 100644 --- a/src/main/java/gregtech/api/unification/material/properties/OreProperty.java +++ b/src/main/java/gregtech/api/unification/material/properties/OreProperty.java @@ -11,7 +11,7 @@ public class OreProperty implements IMaterialProperty { /** * List of Ore byproducts. - * + *

* Default: none, meaning only this property's Material. */ //@ZenProperty @@ -19,7 +19,7 @@ public class OreProperty implements IMaterialProperty { /** * Crushed Ore output amount multiplier during Maceration. - * + *

* Default: 1 (no multiplier). */ //@ZenProperty @@ -27,7 +27,7 @@ public class OreProperty implements IMaterialProperty { /** * Byproducts output amount multiplier during Maceration. - * + *

* Default: 1 (no multiplier). */ //@ZenProperty @@ -35,7 +35,7 @@ public class OreProperty implements IMaterialProperty { /** * Material to which smelting of this Ore will result. - * + *

* Material will have a Dust Property. * Default: none. */ @@ -45,7 +45,7 @@ public class OreProperty implements IMaterialProperty { /** * Material in which this Ore should be washed to give additional output. - * + *

* Material will have a Fluid Property. * Default: none. */ @@ -57,7 +57,7 @@ public class OreProperty implements IMaterialProperty { * During Electromagnetic Separation, this Ore will be separated * into this Material and the Material specified by this field. * Limit 2 Materials - * + *

* Material will have a Dust Property. * Default: none. */ @@ -134,7 +134,7 @@ public void verifyProperty(MaterialProperties properties) { if (directSmeltResult != null) directSmeltResult.getProperties().ensureSet(PropertyKey.DUST, true); if (washedIn != null) washedIn.getProperties().ensureSet(PropertyKey.FLUID, true); if (!separatedInto.isEmpty()) { - for(Material m : separatedInto) { + for (Material m : separatedInto) { m.getProperties().ensureSet(PropertyKey.DUST, true); } } diff --git a/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java b/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java index a1bb2905e71..3c04e295083 100644 --- a/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java +++ b/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java @@ -13,7 +13,7 @@ public class ToolProperty implements IMaterialProperty { /** * Speed of tools made from this Material. - * + *

* Default: */ //@ZenProperty @@ -21,7 +21,7 @@ public class ToolProperty implements IMaterialProperty { /** * Attack damage of tools made from this Material - * + *

* Default: */ //@ZenProperty @@ -29,7 +29,7 @@ public class ToolProperty implements IMaterialProperty { /** * Durability of tools made from this Material. - * + *

* Default: */ //@ZenProperty @@ -37,7 +37,7 @@ public class ToolProperty implements IMaterialProperty { /** * Enchantment to be applied to tools made from this Material. - * + *

* Default: none. */ //@ZenProperty diff --git a/src/main/java/gregtech/api/unification/material/properties/WireProperties.java b/src/main/java/gregtech/api/unification/material/properties/WireProperties.java index fdfea594410..6cf89ba741c 100644 --- a/src/main/java/gregtech/api/unification/material/properties/WireProperties.java +++ b/src/main/java/gregtech/api/unification/material/properties/WireProperties.java @@ -32,8 +32,8 @@ public boolean equals(Object o) { if (!(o instanceof WireProperties)) return false; WireProperties that = (WireProperties) o; return voltage == that.voltage && - amperage == that.amperage && - lossPerBlock == that.lossPerBlock; + amperage == that.amperage && + lossPerBlock == that.lossPerBlock; } @Override diff --git a/src/main/java/gregtech/api/unification/material/properties/package-info.java b/src/main/java/gregtech/api/unification/material/properties/package-info.java index 636c2132c71..c3d9b752f5b 100644 --- a/src/main/java/gregtech/api/unification/material/properties/package-info.java +++ b/src/main/java/gregtech/api/unification/material/properties/package-info.java @@ -1,7 +1,7 @@ /** * Material Properties are a replacement for the old nested hierarchy of Material Types * (IngotMaterial, DustMaterial, etc.).

- * + *

* To create your own Material Property, it should follow this general structure: * 

{@code
  *     public class MyProperty extends IMaterialProperty {
@@ -39,7 +39,7 @@
  *         }
  *     }
  * }


- * + *

* You must also create a new {@link gregtech.api.unification.material.properties.PropertyKey} Object, like: * 

{@code
  *     public static final PropertyKey MY_PROPERTY = new PropertyKey<>("my_property", MyProperty.class);
diff --git a/src/main/java/gregtech/api/unification/ore/OrePrefix.java b/src/main/java/gregtech/api/unification/ore/OrePrefix.java
index 9ed80e2b753..1a31637293d 100644
--- a/src/main/java/gregtech/api/unification/ore/OrePrefix.java
+++ b/src/main/java/gregtech/api/unification/ore/OrePrefix.java
@@ -3,8 +3,8 @@
 import com.google.common.base.Preconditions;
 import gregtech.api.unification.material.MarkerMaterials;
 import gregtech.api.unification.material.Material;
-import gregtech.api.unification.material.info.MaterialIconType;
 import gregtech.api.unification.material.Materials;
+import gregtech.api.unification.material.info.MaterialIconType;
 import gregtech.api.unification.material.properties.IMaterialProperty;
 import gregtech.api.unification.material.properties.PropertyKey;
 import gregtech.api.unification.stack.MaterialStack;
@@ -22,7 +22,8 @@
 import static gregtech.api.GTValues.M;
 import static gregtech.api.unification.material.info.MaterialFlags.*;
 import static gregtech.api.unification.ore.OrePrefix.Conditions.*;
-import static gregtech.api.unification.ore.OrePrefix.Flags.*;
+import static gregtech.api.unification.ore.OrePrefix.Flags.ENABLE_UNIFICATION;
+import static gregtech.api.unification.ore.OrePrefix.Flags.SELF_REFERENCING;
 
 public class OrePrefix {
 
@@ -422,7 +423,7 @@ private static void excludeAllGems(Material material) {
     public final List secondaryMaterials = new ArrayList<>();
     public float heatDamage = 0.0F; // Negative for Frost Damage
 
-    OrePrefix(String name, long materialAmount, Material material, MaterialIconType materialIconType, long flags, Predicate condition) {
+    OrePrefix(String name, long materialAmount, @Nullable Material material, @Nullable MaterialIconType materialIconType, long flags, @Nullable Predicate condition) {
         Preconditions.checkArgument(!PREFIXES.containsKey(name), "OrePrefix " + name + " already registered!");
         this.name = name;
         this.id = idCounter.getAndIncrement();
@@ -485,7 +486,7 @@ public boolean doGenerateItem(Material material) {
         return !isSelfReferencing && generationCondition != null && !isIgnored(material) && generationCondition.test(material);
     }
 
-    public void setGenerationCondition(Predicate in) {
+    public void setGenerationCondition(@Nullable Predicate in) {
         generationCondition = in;
     }
 
@@ -543,7 +544,7 @@ private void runGeneratedMaterialHandlers() {
         currentProcessingPrefix.set(null);
     }
 
-    @SideOnly(Side.CLIENT)
+    @SideOnly(Side.CLIENT) // todo clean this up
     public String getLocalNameForItem(Material material) {
         String specifiedUnlocalized = "item." + material.toString() + "." + this.name;
         if (I18n.hasKey(specifiedUnlocalized)) return I18n.format(specifiedUnlocalized);
diff --git a/src/main/java/gregtech/api/unification/ore/StoneTypes.java b/src/main/java/gregtech/api/unification/ore/StoneTypes.java
index 880a7c047a6..3de7b1f48a5 100755
--- a/src/main/java/gregtech/api/unification/ore/StoneTypes.java
+++ b/src/main/java/gregtech/api/unification/ore/StoneTypes.java
@@ -18,54 +18,54 @@
 public class StoneTypes {
 
     public static final StoneType STONE = new StoneType(0, "stone", new ResourceLocation("blocks/stone"), SoundType.STONE, OrePrefix.ore, Materials.Stone, "pickaxe", 0,
-        () -> Blocks.STONE.getDefaultState().withProperty(BlockStone.VARIANT, EnumType.STONE),
-        state -> state.getBlock() instanceof BlockStone && state.getValue(BlockStone.VARIANT) == BlockStone.EnumType.STONE);
+            () -> Blocks.STONE.getDefaultState().withProperty(BlockStone.VARIANT, EnumType.STONE),
+            state -> state.getBlock() instanceof BlockStone && state.getValue(BlockStone.VARIANT) == BlockStone.EnumType.STONE);
 
     public static StoneType GRANITE = new StoneType(1, "granite", new ResourceLocation("blocks/stone_granite"), SoundType.STONE, OrePrefix.oreGranite, Materials.Granite, "pickaxe", 0,
-        () -> Blocks.STONE.getDefaultState().withProperty(BlockStone.VARIANT, EnumType.GRANITE),
-        state -> state.getBlock() instanceof BlockStone && state.getValue(BlockStone.VARIANT) == EnumType.GRANITE);
+            () -> Blocks.STONE.getDefaultState().withProperty(BlockStone.VARIANT, EnumType.GRANITE),
+            state -> state.getBlock() instanceof BlockStone && state.getValue(BlockStone.VARIANT) == EnumType.GRANITE);
 
     public static StoneType DIORITE = new StoneType(2, "diorite", new ResourceLocation("blocks/stone_diorite"), SoundType.STONE, OrePrefix.oreDiorite, Materials.Diorite, "pickaxe", 0,
-        () -> Blocks.STONE.getDefaultState().withProperty(BlockStone.VARIANT, EnumType.DIORITE),
-        state -> state.getBlock() instanceof BlockStone && state.getValue(BlockStone.VARIANT) == EnumType.DIORITE);
+            () -> Blocks.STONE.getDefaultState().withProperty(BlockStone.VARIANT, EnumType.DIORITE),
+            state -> state.getBlock() instanceof BlockStone && state.getValue(BlockStone.VARIANT) == EnumType.DIORITE);
 
     public static StoneType ANDESITE = new StoneType(3, "andesite", new ResourceLocation("blocks/stone_andesite"), SoundType.STONE, OrePrefix.oreAndesite, Materials.Andesite, "pickaxe", 0,
-        () -> Blocks.STONE.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.ANDESITE),
-        state -> state.getBlock() instanceof BlockStone && state.getValue(BlockStone.VARIANT) == EnumType.ANDESITE);
+            () -> Blocks.STONE.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.ANDESITE),
+            state -> state.getBlock() instanceof BlockStone && state.getValue(BlockStone.VARIANT) == EnumType.ANDESITE);
 
     public static StoneType GRAVEL = new StoneType(4, "gravel", new ResourceLocation("blocks/gravel"), SoundType.SAND, OrePrefix.oreGravel, Materials.Flint, "shovel", AFFECTED_BY_GRAVITY,
-        Blocks.GRAVEL::getDefaultState,
-        state -> state.getBlock() instanceof BlockGravel);
+            Blocks.GRAVEL::getDefaultState,
+            state -> state.getBlock() instanceof BlockGravel);
 
     public static StoneType NETHERRACK = new StoneType(5, "netherrack", new ResourceLocation("blocks/netherrack"), SoundType.STONE, OrePrefix.oreNetherrack, Materials.Netherrack, "pickaxe", 0,
-        Blocks.NETHERRACK::getDefaultState,
-        state -> state.getBlock() == Blocks.NETHERRACK);
+            Blocks.NETHERRACK::getDefaultState,
+            state -> state.getBlock() == Blocks.NETHERRACK);
 
     public static StoneType ENDSTONE = new StoneType(6, "endstone", new ResourceLocation("blocks/end_stone"), SoundType.STONE, OrePrefix.oreEndstone, Materials.Endstone, "pickaxe", 0,
-        Blocks.END_STONE::getDefaultState,
-        state -> state.getBlock() == Blocks.END_STONE);
+            Blocks.END_STONE::getDefaultState,
+            state -> state.getBlock() == Blocks.END_STONE);
 
     public static StoneType SANDSTONE = new StoneType(7, "sandstone", new ResourceLocation("blocks/sandstone_normal"), new ResourceLocation("blocks/sandstone_top"), SoundType.STONE, OrePrefix.oreSand, Materials.SiliconDioxide, "pickaxe", 0,
-        () -> Blocks.SANDSTONE.getDefaultState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.DEFAULT),
-        state -> state.getBlock() instanceof BlockSandStone && state.getValue(BlockSandStone.TYPE) == BlockSandStone.EnumType.DEFAULT);
+            () -> Blocks.SANDSTONE.getDefaultState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.DEFAULT),
+            state -> state.getBlock() instanceof BlockSandStone && state.getValue(BlockSandStone.TYPE) == BlockSandStone.EnumType.DEFAULT);
 
     public static StoneType RED_SANDSTONE = new StoneType(8, "red_sandstone", new ResourceLocation("blocks/red_sandstone_normal"), new ResourceLocation("blocks/red_sandstone_top"), SoundType.STONE, OrePrefix.oreRedSand, Materials.SiliconDioxide, "pickaxe", 0,
-        () -> Blocks.RED_SANDSTONE.getDefaultState().withProperty(BlockRedSandstone.TYPE, BlockRedSandstone.EnumType.DEFAULT),
-        state -> state.getBlock() instanceof BlockRedSandstone && state.getValue(BlockRedSandstone.TYPE) == BlockRedSandstone.EnumType.DEFAULT);
+            () -> Blocks.RED_SANDSTONE.getDefaultState().withProperty(BlockRedSandstone.TYPE, BlockRedSandstone.EnumType.DEFAULT),
+            state -> state.getBlock() instanceof BlockRedSandstone && state.getValue(BlockRedSandstone.TYPE) == BlockRedSandstone.EnumType.DEFAULT);
 
     public static StoneType BLACK_GRANITE = new StoneType(9, "black_granite", new ResourceLocation(GTValues.MODID, "blocks/stones/granite/granite_black_stone"), SoundType.STONE, OrePrefix.oreBlackgranite, Materials.GraniteBlack, "pickaxe", 0,
-        () -> MetaBlocks.GRANITE.withVariant(GraniteVariant.BLACK_GRANITE, ChiselingVariant.NORMAL),
-        state -> state.getBlock() instanceof BlockGranite && ((BlockGranite) state.getBlock()).getVariant(state) == GraniteVariant.BLACK_GRANITE);
+            () -> MetaBlocks.GRANITE.withVariant(GraniteVariant.BLACK_GRANITE, ChiselingVariant.NORMAL),
+            state -> state.getBlock() instanceof BlockGranite && ((BlockGranite) state.getBlock()).getVariant(state) == GraniteVariant.BLACK_GRANITE);
 
     public static StoneType RED_GRANITE = new StoneType(10, "red_granite", new ResourceLocation(GTValues.MODID, "blocks/stones/granite/granite_red_stone"), SoundType.STONE, OrePrefix.oreRedgranite, Materials.GraniteRed, "pickaxe", 0,
-        () -> MetaBlocks.GRANITE.withVariant(GraniteVariant.RED_GRANITE, ChiselingVariant.NORMAL),
-        state -> state.getBlock() instanceof BlockGranite && ((BlockGranite) state.getBlock()).getVariant(state) == GraniteVariant.RED_GRANITE);
+            () -> MetaBlocks.GRANITE.withVariant(GraniteVariant.RED_GRANITE, ChiselingVariant.NORMAL),
+            state -> state.getBlock() instanceof BlockGranite && ((BlockGranite) state.getBlock()).getVariant(state) == GraniteVariant.RED_GRANITE);
 
     public static StoneType MARBLE = new StoneType(11, "marble", new ResourceLocation(GTValues.MODID, "blocks/stones/marble/marble_stone"), SoundType.STONE, OrePrefix.oreMarble, Materials.Marble, "pickaxe", 0,
-        () -> MetaBlocks.MINERAL.withVariant(MineralVariant.MARBLE, ChiselingVariant.NORMAL),
-        state -> state.getBlock() instanceof BlockMineral && ((BlockMineral) state.getBlock()).getVariant(state) == MineralVariant.MARBLE);
+            () -> MetaBlocks.MINERAL.withVariant(MineralVariant.MARBLE, ChiselingVariant.NORMAL),
+            state -> state.getBlock() instanceof BlockMineral && ((BlockMineral) state.getBlock()).getVariant(state) == MineralVariant.MARBLE);
 
     public static StoneType BASALT = new StoneType(12, "basalt", new ResourceLocation(GTValues.MODID, "blocks/stones/basalt/basalt_stone"), SoundType.STONE, OrePrefix.oreBasalt, Materials.Basalt, "pickaxe", 0,
-        () -> MetaBlocks.MINERAL.withVariant(MineralVariant.BASALT, ChiselingVariant.NORMAL),
-        state -> state.getBlock() instanceof BlockMineral && ((BlockMineral) state.getBlock()).getVariant(state) == MineralVariant.BASALT);
+            () -> MetaBlocks.MINERAL.withVariant(MineralVariant.BASALT, ChiselingVariant.NORMAL),
+            state -> state.getBlock() instanceof BlockMineral && ((BlockMineral) state.getBlock()).getVariant(state) == MineralVariant.BASALT);
 }
diff --git a/src/main/java/gregtech/api/util/AnnotatedMaterialHandlerLoader.java b/src/main/java/gregtech/api/util/AnnotatedMaterialHandlerLoader.java
index 4f0a76aca38..94fee09b4fe 100644
--- a/src/main/java/gregtech/api/util/AnnotatedMaterialHandlerLoader.java
+++ b/src/main/java/gregtech/api/util/AnnotatedMaterialHandlerLoader.java
@@ -73,7 +73,7 @@ public static void discoverAndLoadAnnotatedMaterialHandlers(ASMDataTable asmData
                 materialHandlersRegistered++;
             } else {
                 GTLog.logger.error("Failed to load material handler class {} from {}: {}",
-                    materialHandlerClassName, annotationData.getCandidate().getModContainer().getName(), denyReason, loadingError);
+                        materialHandlerClassName, annotationData.getCandidate().getModContainer().getName(), denyReason, loadingError);
                 GTLog.logger.error("Consult the mod author for fix on his side.");
             }
         }
diff --git a/src/main/java/gregtech/api/util/BlockInfo.java b/src/main/java/gregtech/api/util/BlockInfo.java
index ce1344d7fa6..0f5c31f9c08 100644
--- a/src/main/java/gregtech/api/util/BlockInfo.java
+++ b/src/main/java/gregtech/api/util/BlockInfo.java
@@ -32,7 +32,7 @@ public BlockInfo(IBlockState blockState, TileEntity tileEntity) {
         this.blockState = blockState;
         this.tileEntity = tileEntity;
         Preconditions.checkArgument(tileEntity == null || blockState.getBlock().hasTileEntity(blockState),
-            "Cannot create block info with tile entity for block not having it");
+                "Cannot create block info with tile entity for block not having it");
     }
 
     public IBlockState getBlockState() {
diff --git a/src/main/java/gregtech/api/util/ClipboardUtil.java b/src/main/java/gregtech/api/util/ClipboardUtil.java
index 1e079b3fada..4b023d2fc2b 100755
--- a/src/main/java/gregtech/api/util/ClipboardUtil.java
+++ b/src/main/java/gregtech/api/util/ClipboardUtil.java
@@ -4,8 +4,7 @@
 import gregtech.api.net.PacketClipboard;
 import net.minecraft.entity.player.EntityPlayerMP;
 
-import java.awt.Desktop;
-import java.awt.Toolkit;
+import java.awt.*;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
 
@@ -23,4 +22,4 @@ public static void copyToClipboard(final EntityPlayerMP player, final String tex
         PacketClipboard packet = new PacketClipboard(text);
         NetworkHandler.channel.sendTo(packet.toFMLPacket(), player);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/util/DirectionHelper.java b/src/main/java/gregtech/api/util/DirectionHelper.java
index 3321dc94041..6fd1443b258 100644
--- a/src/main/java/gregtech/api/util/DirectionHelper.java
+++ b/src/main/java/gregtech/api/util/DirectionHelper.java
@@ -21,9 +21,11 @@ public static EnumFacing getRelativeDown(EntityPlayer player) {
         EnumFacing down;
         switch (facing) {
             case UP:
-                down = player.getHorizontalFacing(); break;
+                down = player.getHorizontalFacing();
+                break;
             case DOWN:
-                down = player.getHorizontalFacing().getOpposite(); break;
+                down = player.getHorizontalFacing().getOpposite();
+                break;
             default:
                 down = EnumFacing.DOWN;
         }
diff --git a/src/main/java/gregtech/api/util/DyeUtil.java b/src/main/java/gregtech/api/util/DyeUtil.java
index 2fdb3dcb27d..d906a642761 100644
--- a/src/main/java/gregtech/api/util/DyeUtil.java
+++ b/src/main/java/gregtech/api/util/DyeUtil.java
@@ -21,8 +21,8 @@ public static EnumDyeColor determineDyeColor(int rgbColor) {
             Color c2 = new Color(dyeColor.colorValue);
 
             double distance = (c.getRed() - c2.getRed()) * (c.getRed() - c2.getRed())
-                + (c.getGreen() - c2.getGreen()) * (c.getGreen() - c2.getGreen())
-                + (c.getBlue() - c2.getBlue()) * (c.getBlue() - c2.getBlue());
+                    + (c.getGreen() - c2.getGreen()) * (c.getGreen() - c2.getGreen())
+                    + (c.getBlue() - c2.getBlue()) * (c.getBlue() - c2.getBlue());
 
             distances.put(distance, dyeColor);
         }
diff --git a/src/main/java/gregtech/api/util/FileUtility.java b/src/main/java/gregtech/api/util/FileUtility.java
index 45f5eb5cca4..ecb08443602 100644
--- a/src/main/java/gregtech/api/util/FileUtility.java
+++ b/src/main/java/gregtech/api/util/FileUtility.java
@@ -30,6 +30,7 @@ public static InputStream writeInputStream(String contents) {
 
     /**
      * Tries to extract JsonObject from file on given path
+     *
      * @param filePath path to file
      * @return JsonObject if extraction succeeds; otherwise null
      */
@@ -39,9 +40,9 @@ public static JsonObject tryExtractFromFile(Path filePath) {
             return jsonParser.parse(streamReader).getAsJsonObject();
         } catch (IOException exception) {
             GTLog.logger.error("Failed to read file on path {}", filePath, exception);
-        } catch (JsonParseException exception){
+        } catch (JsonParseException exception) {
             GTLog.logger.error("Failed to extract json from file", exception);
-        } catch (Exception exception){
+        } catch (Exception exception) {
             GTLog.logger.error("Failed to extract json from file on path {}", filePath, exception);
         }
 
diff --git a/src/main/java/gregtech/api/util/FluidTooltipUtil.java b/src/main/java/gregtech/api/util/FluidTooltipUtil.java
index ad3ec57556a..5722be0c774 100644
--- a/src/main/java/gregtech/api/util/FluidTooltipUtil.java
+++ b/src/main/java/gregtech/api/util/FluidTooltipUtil.java
@@ -18,12 +18,12 @@ public class FluidTooltipUtil {
 
     /**
      * Used to register a tooltip to a Fluid. A Fluid can only have one tooltip, on one line.
-     *
+     * 

      * Ignores a tooltip applied for Water, so that it will be handled correctly for the chemical formula.
      *
      * @param fluid   The fluid to register a tooltip for.
      * @param tooltip The tooltip.
-     * @return        False if either parameter is null or if tooltip is empty, true otherwise.
+     * @return False if either parameter is null or if tooltip is empty, true otherwise.
      */
     public static boolean registerTooltip(Fluid fluid, String tooltip) {
         if (fluid != null && tooltip != null && !tooltip.isEmpty()) {
@@ -37,7 +37,7 @@ public static boolean registerTooltip(Fluid fluid, String tooltip) {
      * Used to get a Fluid's tooltip.
      *
      * @param fluid The Fluid to get the tooltip of.
-     * @return      The tooltip.
+     * @return The tooltip.
      */
     public static String getFluidTooltip(Fluid fluid) {
         if (fluid == null)
@@ -50,7 +50,7 @@ public static String getFluidTooltip(Fluid fluid) {
      * Used to get a Fluid's tooltip.
      *
      * @param stack A FluidStack, containing the Fluid to get the tooltip of.
-     * @return      The tooltip.
+     * @return The tooltip.
      */
     public static String getFluidTooltip(FluidStack stack) {
         if (stack == null)
@@ -63,7 +63,7 @@ public static String getFluidTooltip(FluidStack stack) {
      * Used to get a Fluid's tooltip.
      *
      * @param fluidName A String representing a Fluid to get the tooltip of.
-     * @return          The tooltip.
+     * @return The tooltip.
      */
     public static String getFluidTooltip(String fluidName) {
         if (fluidName == null || fluidName.isEmpty())
diff --git a/src/main/java/gregtech/api/util/GTControlledRegistry.java b/src/main/java/gregtech/api/util/GTControlledRegistry.java
index e126688f3c3..15ece517b70 100644
--- a/src/main/java/gregtech/api/util/GTControlledRegistry.java
+++ b/src/main/java/gregtech/api/util/GTControlledRegistry.java
@@ -49,7 +49,7 @@ public void register(int id, K key, V value) {
         V objectWithId = getObjectById(id);
         if (objectWithId != null) {
             throw new IllegalArgumentException(String.format("Tried to reassign id %d to %s (%s), but it is already assigned to %s (%s)!",
-                id, value, key, objectWithId, getNameForObject(objectWithId)));
+                    id, value, key, objectWithId, getNameForObject(objectWithId)));
         }
         underlyingIntegerMap.put(value, id);
     }
diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java
index 155e6e33a0e..4e31ac757c3 100644
--- a/src/main/java/gregtech/api/util/GTUtility.java
+++ b/src/main/java/gregtech/api/util/GTUtility.java
@@ -83,7 +83,7 @@ public static Runnable combine(Runnable... runnables) {
     }
 
     public static Stream flatten(Object[] array) {
-        return Arrays.stream(array).flatMap(o -> o instanceof Object[] ? flatten((Object[]) o): Stream.of(o));
+        return Arrays.stream(array).flatMap(o -> o instanceof Object[] ? flatten((Object[]) o) : Stream.of(o));
     }
 
     public static void copyInventoryItems(IItemHandler src, IItemHandlerModifiable dest) {
@@ -159,8 +159,8 @@ public static int convertOpaqueRGBA_MCtoRGB(int alphaColor) {
     public static void setItem(ItemStack itemStack, ItemStack newStack) {
         try {
             Field itemField = Arrays.stream(ItemStack.class.getDeclaredFields())
-                .filter(field -> field.getType() == Item.class)
-                .findFirst().orElseThrow(ReflectiveOperationException::new);
+                    .filter(field -> field.getType() == Item.class)
+                    .findFirst().orElseThrow(ReflectiveOperationException::new);
             itemField.setAccessible(true);
             //replace item field instance
             itemField.set(itemStack, newStack.getItem());
@@ -183,6 +183,7 @@ public static void setItem(ItemStack itemStack, ItemStack newStack) {
      * field is used, and ItemStack.getItemDamage() can be overriden,
      * giving incorrect results for itemstack equality comparisons,
      * which still use raw ItemStack.itemDamage field
+     *
      * @return actual value of ItemStack.itemDamage field
      */
     public static int getActualItemDamageFromStack(ItemStack itemStack) {
@@ -194,7 +195,7 @@ public static int getActualItemDamageFromStack(ItemStack itemStack) {
      * If it's not possible to merge it fully, it will attempt to insert it into first empty slots
      *
      * @param itemStack item stack to merge. It WILL be modified.
-     * @param simulate if true, stack won't actually modify items in other slots
+     * @param simulate  if true, stack won't actually modify items in other slots
      * @return if merging of at least one item succeed, false otherwise
      */
     public static boolean mergeItemStack(ItemStack itemStack, List slots, boolean simulate) {
@@ -209,7 +210,7 @@ public static boolean mergeItemStack(ItemStack itemStack, List slots, bool
                 continue; //if itemstack cannot be placed into that slot, continue
             ItemStack stackInSlot = slot.getStack();
             if (!ItemStack.areItemsEqual(itemStack, stackInSlot) ||
-                !ItemStack.areItemStackTagsEqual(itemStack, stackInSlot))
+                    !ItemStack.areItemStackTagsEqual(itemStack, stackInSlot))
                 continue; //if itemstacks don't match, continue
             int slotMaxStackSize = Math.min(stackInSlot.getMaxStackSize(), slot.getItemStackLimit(stackInSlot));
             int amountToInsert = Math.min(itemStack.getCount(), slotMaxStackSize - stackInSlot.getCount());
@@ -252,19 +253,19 @@ public static boolean harvestBlock(World world, BlockPos pos, EntityPlayer playe
         IBlockState blockState = world.getBlockState(pos);
         TileEntity tileEntity = world.getTileEntity(pos);
 
-        if(blockState.getBlock().isAir(blockState, world, pos)) {
+        if (blockState.getBlock().isAir(blockState, world, pos)) {
             return false;
         }
 
-        if(!blockState.getBlock().canHarvestBlock(world, pos, player)) {
+        if (!blockState.getBlock().canHarvestBlock(world, pos, player)) {
             return false;
         }
 
         int expToDrop = 0;
-        if(!world.isRemote) {
+        if (!world.isRemote) {
             EntityPlayerMP playerMP = (EntityPlayerMP) player;
             expToDrop = ForgeHooks.onBlockBreakEvent(world, playerMP.interactionManager.getGameType(), playerMP, pos);
-            if(expToDrop == -1) {
+            if (expToDrop == -1) {
                 //notify client if block can't be removed because of BreakEvent cancelled on server side
                 playerMP.connection.sendPacket(new SPacketBlockChange(world, pos));
                 return false;
@@ -274,19 +275,19 @@ public static boolean harvestBlock(World world, BlockPos pos, EntityPlayer playe
         world.playEvent(player, 2001, pos, Block.getStateId(blockState));
 
         boolean wasRemovedByPlayer = blockState.getBlock().removedByPlayer(blockState, world, pos, player, !player.capabilities.isCreativeMode);
-        if(wasRemovedByPlayer) {
+        if (wasRemovedByPlayer) {
             blockState.getBlock().onPlayerDestroy(world, pos, blockState);
 
-            if(!world.isRemote && !player.capabilities.isCreativeMode) {
+            if (!world.isRemote && !player.capabilities.isCreativeMode) {
                 ItemStack stackInHand = player.getHeldItemMainhand();
                 blockState.getBlock().harvestBlock(world, player, pos, blockState, tileEntity, stackInHand);
-                if(expToDrop > 0) {
+                if (expToDrop > 0) {
                     blockState.getBlock().dropXpOnBlockBreak(world, pos, expToDrop);
                 }
             }
         }
 
-        if(!world.isRemote) {
+        if (!world.isRemote) {
             EntityPlayerMP playerMP = (EntityPlayerMP) player;
             playerMP.connection.sendPacket(new SPacketBlockChange(world, pos));
         } else {
@@ -398,7 +399,7 @@ public static byte getTierByVoltage(long voltage) {
                 return (byte) Math.max(0, tier - 1);
             }
         }
-        return (byte) Math.min(V.length -1, tier);
+        return (byte) Math.min(V.length - 1, tier);
     }
 
     public static BiomeDictionary.Type getBiomeTypeTagByName(String name) {
@@ -562,14 +563,14 @@ public int size() {
     public static List findPlayersUsing(MetaTileEntity metaTileEntity, double radius) {
         ArrayList result = new ArrayList<>();
         AxisAlignedBB box = new AxisAlignedBB(metaTileEntity.getPos())
-            .expand(radius, radius, radius)
-            .expand(-radius, -radius, -radius);
+                .expand(radius, radius, radius)
+                .expand(-radius, -radius, -radius);
         List entities = metaTileEntity.getWorld().getEntitiesWithinAABB(EntityPlayerMP.class, box);
         for (EntityPlayerMP player : entities) {
             if (player.openContainer instanceof ModularUIContainer) {
                 ModularUI modularUI = ((ModularUIContainer) player.openContainer).getModularUI();
                 if (modularUI.holder instanceof MetaTileEntityHolder &&
-                    ((MetaTileEntityHolder) modularUI.holder).getMetaTileEntity() == metaTileEntity) {
+                        ((MetaTileEntityHolder) modularUI.holder).getMetaTileEntity() == metaTileEntity) {
                     result.add(player);
                 }
             }
@@ -655,8 +656,11 @@ public static > IBlockState[] getAllPropertyValues(IBloc
 
     public static  Collector> toImmutableList() {
         return Collector.of(ImmutableList::builder, Builder::add,
-            (b1, b2) -> { b1.addAll(b2.build()); return b2; },
-            ImmutableList.Builder::build);
+                (b1, b2) -> {
+                    b1.addAll(b2.build());
+                    return b2;
+                },
+                ImmutableList.Builder::build);
     }
 
     public static  M selectItemInList(int index, M replacement, List list, Class minClass) {
@@ -688,7 +692,7 @@ public static void doOvervoltageExplosion(MetaTileEntity metaTileEntity, long vo
             double posY = pos.getY() + 0.5;
             double posZ = pos.getZ() + 0.5;
             ((WorldServer) metaTileEntity.getWorld()).spawnParticle(EnumParticleTypes.SMOKE_LARGE, posX, posY, posZ,
-                10, 0.2, 0.2, 0.2, 0.0);
+                    10, 0.2, 0.2, 0.2, 0.0);
             metaTileEntity.getWorld().createExplosion(null, posX, posY, posZ, getTierByVoltage(voltage), ConfigHolder.doExplosions);
         }
     }
@@ -700,7 +704,7 @@ public static int getRedstonePower(World world, BlockPos blockPos, EnumFacing si
             return worldPower;
         } else {
             IBlockState offsetState = world.getBlockState(offsetPos);
-            if(offsetState.getBlock() instanceof BlockRedstoneWire) {
+            if (offsetState.getBlock() instanceof BlockRedstoneWire) {
                 int wirePower = offsetState.getValue(BlockRedstoneWire.POWER);
                 return Math.max(worldPower, wirePower);
             }
@@ -710,10 +714,10 @@ public static int getRedstonePower(World world, BlockPos blockPos, EnumFacing si
 
     public static Comparator createItemStackComparator() {
         return Comparator.comparing(it -> Item.REGISTRY.getIDForObject(it.getItem()))
-            .thenComparing(ItemStack::getItemDamage)
-            .thenComparing(ItemStack::hasTagCompound)
-            .thenComparing(it -> -Objects.hashCode(it.getTagCompound()))
-            .thenComparing(it -> -it.getCount());
+                .thenComparing(ItemStack::getItemDamage)
+                .thenComparing(ItemStack::hasTagCompound)
+                .thenComparing(it -> -Objects.hashCode(it.getTagCompound()))
+                .thenComparing(it -> -it.getCount());
     }
 
     public static int getRandomIntXSTR(int bound) {
@@ -770,23 +774,23 @@ public static RayTraceResult rayTraceBlocks(Vec3d vec31, Vec3d vec32, boolean st
                     double d2 = 999.0D;
 
                     if (i > l)
-                        d0 = (double)l + 1.0D;
+                        d0 = (double) l + 1.0D;
                     else if (i < l)
-                        d0 = (double)l + 0.0D;
+                        d0 = (double) l + 0.0D;
                     else
                         flag2 = false;
 
                     if (j > i1)
-                        d1 = (double)i1 + 1.0D;
+                        d1 = (double) i1 + 1.0D;
                     else if (j < i1)
-                        d1 = (double)i1 + 0.0D;
+                        d1 = (double) i1 + 0.0D;
                     else
                         flag = false;
 
                     if (k > j1)
-                        d2 = (double)j1 + 1.0D;
+                        d2 = (double) j1 + 1.0D;
                     else if (k < j1)
-                        d2 = (double)j1 + 0.0D;
+                        d2 = (double) j1 + 0.0D;
                     else
                         flag1 = false;
 
diff --git a/src/main/java/gregtech/api/util/IntRange.java b/src/main/java/gregtech/api/util/IntRange.java
index 43951a5c7ed..44e0f0b7217 100644
--- a/src/main/java/gregtech/api/util/IntRange.java
+++ b/src/main/java/gregtech/api/util/IntRange.java
@@ -22,7 +22,7 @@ public boolean equals(Object o) {
         if (!(o instanceof IntRange)) return false;
         IntRange intRange = (IntRange) o;
         return minValue == intRange.minValue &&
-            maxValue == intRange.maxValue;
+                maxValue == intRange.maxValue;
     }
 
     @Override
@@ -33,8 +33,8 @@ public int hashCode() {
     @Override
     public String toString() {
         return "IntRange{" +
-            "minValue=" + minValue +
-            ", maxValue=" + maxValue +
-            '}';
+                "minValue=" + minValue +
+                ", maxValue=" + maxValue +
+                '}';
     }
 }
diff --git a/src/main/java/gregtech/api/util/InventoryUtils.java b/src/main/java/gregtech/api/util/InventoryUtils.java
index 9102e89b6ca..e0af0ef59ef 100755
--- a/src/main/java/gregtech/api/util/InventoryUtils.java
+++ b/src/main/java/gregtech/api/util/InventoryUtils.java
@@ -1,18 +1,19 @@
 package gregtech.api.util;
 
-import it.unimi.dsi.fastutil.*;
-import it.unimi.dsi.fastutil.objects.*;
+import it.unimi.dsi.fastutil.Hash;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenCustomHashMap;
 import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.*;
-import net.minecraftforge.items.*;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.IItemHandler;
 
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.stream.*;
+import java.util.stream.Collectors;
 
-import static gregtech.api.util.Predicates.*;
-import static gregtech.api.util.StreamUtils.*;
+import static gregtech.api.util.Predicates.not;
+import static gregtech.api.util.Predicates.or;
+import static gregtech.api.util.StreamUtils.streamFrom;
 
 public final class InventoryUtils {
     /**
@@ -22,9 +23,9 @@ public final class InventoryUtils {
     public static int getNumberOfEmptySlotsInInventory(IItemHandler inventory) {
         // IItemHandler#getSlots() is an int, so this cast is safe.
         return (int)
-            streamFrom(inventory)
-                .filter(ItemStack::isEmpty)
-                .count();
+                streamFrom(inventory)
+                        .filter(ItemStack::isEmpty)
+                        .count();
     }
 
     /**
@@ -37,10 +38,10 @@ public static int getNumberOfEmptySlotsInInventory(IItemHandler inventory) {
     public static List deepCopy(final IItemHandler inventory,
                                            final boolean keepEmpty) {
         return streamFrom(inventory)
-            .filter(or(x -> keepEmpty,
-                       not(ItemStack::isEmpty)))
-            .map(ItemStack::copy)
-            .collect(Collectors.toList());
+                .filter(or(x -> keepEmpty,
+                        not(ItemStack::isEmpty)))
+                .map(ItemStack::copy)
+                .collect(Collectors.toList());
     }
 
     /**
@@ -49,17 +50,17 @@ public static List deepCopy(final IItemHandler inventory,
      * are enough empty stacks left to accommodate the remaining items.
      * 


      * Precondition: the target inventory must not virtualize ItemStacks such that
-     *               they can exceed the maximum stackable size of the item as
-     *               defined by {@link net.minecraft.item.ItemStack#getMaxStackSize()}.
+     * they can exceed the maximum stackable size of the item as
+     * defined by {@link net.minecraft.item.ItemStack#getMaxStackSize()}.
      * 


      * Precondition: the target inventory must actually accept the types of items
-     *               you are trying to insert.
+     * you are trying to insert.
      * 


      *
      * @param inputItems the items you want to insert
      * @param inventory  the target inventory receiving items
      * @return {@code true} if inventory contains sufficient slots to merge and
-     *         insert all requested items, {@code false} otherwise.
+     * insert all requested items, {@code false} otherwise.
      */
     public static boolean simulateItemStackMerge(List inputItems,
                                                  IItemHandler inventory) {
@@ -68,7 +69,7 @@ public static boolean simulateItemStackMerge(List inputItems,
 
         // If there's enough empty output slots then we don't need to compute merges.
         final int emptySlots = getNumberOfEmptySlotsInInventory(inventory);
-        if(itemStacks.size() <= emptySlots)
+        if (itemStacks.size() <= emptySlots)
             return true;
 
         // Sort by the number of items in each stack so we merge smallest stacks first.
@@ -98,27 +99,27 @@ static List compactItemStacks(Collection inputItems) {
 
         return inputItems.stream()
 
-                         // keep only non-empty item stacks
-                         .filter(not(ItemStack::isEmpty))
-
-                         // Track the number of identical items
-                         .collect(Collectors.toMap(Function.identity(),
-                                                   ItemStack::getCount,
-                                                   Math::addExact,
-                                                   mapSupplier))
-
-                         // Create a single stack of the combined count for each item
-                         .entrySet().stream()
-                         .map(entry -> {
-                             ItemStack combined = entry.getKey().copy();
-                             combined.setCount(entry.getValue());
-                             return combined;
-                         })
-
-                         // Normalize these stacks into separate valid ItemStacks, flattening them into a List
-                         .map(InventoryUtils::normalizeItemStack)
-                         .flatMap(Collection::stream)
-                         .collect(Collectors.toList());
+                // keep only non-empty item stacks
+                .filter(not(ItemStack::isEmpty))
+
+                // Track the number of identical items
+                .collect(Collectors.toMap(Function.identity(),
+                        ItemStack::getCount,
+                        Math::addExact,
+                        mapSupplier))
+
+                // Create a single stack of the combined count for each item
+                .entrySet().stream()
+                .map(entry -> {
+                    ItemStack combined = entry.getKey().copy();
+                    combined.setCount(entry.getValue());
+                    return combined;
+                })
+
+                // Normalize these stacks into separate valid ItemStacks, flattening them into a List
+                .map(InventoryUtils::normalizeItemStack)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
     }
 
     /**
@@ -132,22 +133,22 @@ static List compactItemStacks(Collection inputItems) {
     static void mergeItemStacks(Collection source, Collection destination) {
         // Since we're mutating the collection during iteration, use an iterator.
         final Iterator sourceItemStacks = source.iterator();
-        while(sourceItemStacks.hasNext()) {
+        while (sourceItemStacks.hasNext()) {
             final ItemStack sourceItemStack = sourceItemStacks.next();
 
             // Find a matching item in the output bus, if any
-            for(ItemStack destItemStack : destination)
-                if(ItemStack.areItemsEqual(destItemStack, sourceItemStack) &&
-                   ItemStack.areItemStackTagsEqual(destItemStack, sourceItemStack)) {
+            for (ItemStack destItemStack : destination)
+                if (ItemStack.areItemsEqual(destItemStack, sourceItemStack) &&
+                        ItemStack.areItemStackTagsEqual(destItemStack, sourceItemStack)) {
                     // if it's possible to merge stacks
                     final int availableSlots = destItemStack.getMaxStackSize() - destItemStack.getCount();
-                    if(availableSlots > 0) {
+                    if (availableSlots > 0) {
                         final int itemCount = Math.min(availableSlots, sourceItemStack.getCount());
                         sourceItemStack.shrink(itemCount);
                         destItemStack.grow(itemCount);
 
                         // if the output stack was merged completely, remove it and stop looking
-                        if(sourceItemStack.isEmpty()) {
+                        if (sourceItemStack.isEmpty()) {
                             sourceItemStacks.remove();
                             break;
                         }
@@ -165,12 +166,12 @@ static void mergeItemStacks(Collection source, Collection
      * @return an immutable List of the resulting ItemStacks, in descending size order.
      */
     public static List normalizeItemStack(ItemStack stack) {
-        if(stack.isEmpty())
+        if (stack.isEmpty())
             return Collections.emptyList();
 
         int maxCount = stack.getMaxStackSize();
 
-        if(stack.getCount() <= maxCount)
+        if (stack.getCount() <= maxCount)
             return Collections.singletonList(stack.copy());
 
         return Collections.unmodifiableList(apportionStack(stack, maxCount));
@@ -186,9 +187,9 @@ public static List normalizeItemStack(ItemStack stack) {
      */
     public static List apportionStack(ItemStack stack,
                                                  final int maxCount) {
-        if(stack.isEmpty())
+        if (stack.isEmpty())
             throw new IllegalArgumentException("Cannot apportion an empty stack.");
-        if(maxCount <= 0)
+        if (maxCount <= 0)
             throw new IllegalArgumentException("Count must be non-zero and positive.");
 
         final ArrayList splitStacks = new ArrayList<>();
@@ -197,13 +198,13 @@ public static List apportionStack(ItemStack stack,
         int numStacks = count / maxCount;
         int remainder = count % maxCount;
 
-        for(int fullStackCount = numStacks; fullStackCount > 0; fullStackCount--) {
+        for (int fullStackCount = numStacks; fullStackCount > 0; fullStackCount--) {
             ItemStack fullStack = stack.copy();
             fullStack.setCount(maxCount);
             splitStacks.add(fullStack);
         }
 
-        if(remainder > 0) {
+        if (remainder > 0) {
             ItemStack partialStack = stack.copy();
             partialStack.setCount(remainder);
             splitStacks.add(partialStack);
diff --git a/src/main/java/gregtech/api/util/ItemStackHashStrategy.java b/src/main/java/gregtech/api/util/ItemStackHashStrategy.java
index c4be7f3be05..a36b54d49e5 100644
--- a/src/main/java/gregtech/api/util/ItemStackHashStrategy.java
+++ b/src/main/java/gregtech/api/util/ItemStackHashStrategy.java
@@ -1,10 +1,10 @@
 package gregtech.api.util;
 
-import it.unimi.dsi.fastutil.*;
-import net.minecraft.item.*;
+import it.unimi.dsi.fastutil.Hash;
+import net.minecraft.item.ItemStack;
 
-import javax.annotation.*;
-import java.util.*;
+import javax.annotation.Nullable;
+import java.util.Objects;
 
 /**
  * A configurable generator of hashing strategies, allowing for consideration of select properties of ItemStacks when
@@ -26,9 +26,9 @@ static ItemStackHashStrategyBuilder builder() {
      */
     static ItemStackHashStrategy comparingAllButCount() {
         return builder().compareItem(true)
-                        .compareDamage(true)
-                        .compareTag(true)
-                        .build();
+                .compareDamage(true)
+                .compareTag(true)
+                .build();
     }
 
     /**
@@ -89,22 +89,22 @@ public ItemStackHashStrategy build() {
                 @Override
                 public int hashCode(@Nullable ItemStack o) {
                     return o == null || o.isEmpty() ? 0 : Objects.hash(
-                        item ? o.getItem() : null,
-                        count ? o.getCount() : null,
-                        damage ? o.getItemDamage() : null,
-                        tag ? o.getTagCompound() : null
+                            item ? o.getItem() : null,
+                            count ? o.getCount() : null,
+                            damage ? o.getItemDamage() : null,
+                            tag ? o.getTagCompound() : null
                     );
                 }
 
                 @Override
                 public boolean equals(@Nullable ItemStack a, @Nullable ItemStack b) {
-                    if(a == null || a.isEmpty()) return b == null || b.isEmpty();
-                    if(b == null || b.isEmpty()) return false;
+                    if (a == null || a.isEmpty()) return b == null || b.isEmpty();
+                    if (b == null || b.isEmpty()) return false;
 
                     return (!item || a.getItem() == b.getItem()) &&
-                           (!count || a.getCount() == b.getCount()) &&
-                           (!damage || a.getItemDamage() == b.getItemDamage()) &&
-                           (!tag || Objects.equals(a.getTagCompound(), b.getTagCompound()));
+                            (!count || a.getCount() == b.getCount()) &&
+                            (!damage || a.getItemDamage() == b.getItemDamage()) &&
+                            (!tag || Objects.equals(a.getTagCompound(), b.getTagCompound()));
                 }
             };
         }
diff --git a/src/main/java/gregtech/api/util/ItemStackKey.java b/src/main/java/gregtech/api/util/ItemStackKey.java
index 59ff7dfd9a5..759c40dfc15 100644
--- a/src/main/java/gregtech/api/util/ItemStackKey.java
+++ b/src/main/java/gregtech/api/util/ItemStackKey.java
@@ -21,7 +21,7 @@ public ItemStackKey(ItemStack itemStack) {
 
     public boolean isItemStackEqual(ItemStack itemStack) {
         return ItemStack.areItemsEqual(this.itemStack, itemStack) &&
-            ItemStack.areItemStackTagsEqual(this.itemStack, itemStack);
+                ItemStack.areItemStackTagsEqual(this.itemStack, itemStack);
     }
 
     public ItemStack getItemStack() {
@@ -38,14 +38,14 @@ public boolean equals(Object o) {
         if (!(o instanceof ItemStackKey)) return false;
         ItemStackKey that = (ItemStackKey) o;
         return ItemStack.areItemsEqual(itemStack, that.itemStack) &&
-            ItemStack.areItemStackTagsEqual(itemStack, that.itemStack);
+                ItemStack.areItemStackTagsEqual(itemStack, that.itemStack);
     }
 
     @Override
     public int hashCode() {
         return Objects.hash(itemStack.getItem(),
-            GTUtility.getActualItemDamageFromStack(itemStack),
-            itemStack.getTagCompound());
+                GTUtility.getActualItemDamageFromStack(itemStack),
+                itemStack.getTagCompound());
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/util/ModCompatibility.java b/src/main/java/gregtech/api/util/ModCompatibility.java
index 1a3acbce658..c86a4d4ac6b 100644
--- a/src/main/java/gregtech/api/util/ModCompatibility.java
+++ b/src/main/java/gregtech/api/util/ModCompatibility.java
@@ -60,7 +60,7 @@ public RefinedStorage(Class itemPatternClass) throws ReflectiveOperationExcep
         public boolean canHandleItemStack(ItemStack itemStack) {
             ResourceLocation registryName = Objects.requireNonNull(itemStack.getItem().getRegistryName());
             return registryName.getNamespace().equals("refinedstorage") &&
-                registryName.getPath().equals("pattern");
+                    registryName.getPath().equals("pattern");
         }
 
         public ItemStack getRealItemStack(ItemStack itemStack) {
@@ -84,7 +84,7 @@ public AppliedEnergistics2(Class itemEncodedPatternClass) throws ReflectiveOp
         public boolean canHandleItemStack(ItemStack itemStack) {
             ResourceLocation registryName = Objects.requireNonNull(itemStack.getItem().getRegistryName());
             return registryName.getNamespace().equals("appliedenergistics2") &&
-                registryName.getPath().equals("encoded_pattern");
+                    registryName.getPath().equals("encoded_pattern");
         }
 
         public ItemStack getRealItemStack(ItemStack itemStack) {
diff --git a/src/main/java/gregtech/api/util/NBTUtil.java b/src/main/java/gregtech/api/util/NBTUtil.java
index a3516f75346..c89d0d50fc1 100644
--- a/src/main/java/gregtech/api/util/NBTUtil.java
+++ b/src/main/java/gregtech/api/util/NBTUtil.java
@@ -40,9 +40,9 @@ public static void registerSerializers() {
 
     public static Vec3d readVec3d(NBTTagCompound tag) {
         return new Vec3d(
-            tag.getFloat("X"),
-            tag.getFloat("Y"),
-            tag.getFloat("Z")
+                tag.getFloat("X"),
+                tag.getFloat("Y"),
+                tag.getFloat("Z")
         );
     }
 
diff --git a/src/main/java/gregtech/api/util/Position.java b/src/main/java/gregtech/api/util/Position.java
index e145cb8f701..8c911666bac 100644
--- a/src/main/java/gregtech/api/util/Position.java
+++ b/src/main/java/gregtech/api/util/Position.java
@@ -42,7 +42,7 @@ public boolean equals(Object o) {
         if (!(o instanceof Position)) return false;
         Position position = (Position) o;
         return x == position.x &&
-            y == position.y;
+                y == position.y;
     }
 
     @Override
@@ -53,8 +53,8 @@ public int hashCode() {
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
-            .add("x", x)
-            .add("y", y)
-            .toString();
+                .add("x", x)
+                .add("y", y)
+                .toString();
     }
 }
diff --git a/src/main/java/gregtech/api/util/PositionedRect.java b/src/main/java/gregtech/api/util/PositionedRect.java
index 56c1fa6261a..d76cec88be6 100644
--- a/src/main/java/gregtech/api/util/PositionedRect.java
+++ b/src/main/java/gregtech/api/util/PositionedRect.java
@@ -32,16 +32,16 @@ public Size getSize() {
 
     public boolean intersects(Position other) {
         return position.x <= other.x &&
-            position.y <= other.y &&
-            position.x + size.width >= other.x &&
-            position.y + size.height >= other.y;
+                position.y <= other.y &&
+                position.x + size.width >= other.x &&
+                position.y + size.height >= other.y;
     }
 
     public boolean intersects(PositionedRect other) {
         return intersects(other.position) ||
-            intersects(other.position.add(other.size)) ||
-            intersects(other.position.add(new Size(other.size.width, 0))) ||
-            intersects(other.position.add(new Size(0, other.size.height)));
+                intersects(other.position.add(other.size)) ||
+                intersects(other.position.add(new Size(other.size.width, 0))) ||
+                intersects(other.position.add(new Size(0, other.size.height)));
     }
 
     @Override
@@ -50,7 +50,7 @@ public boolean equals(Object o) {
         if (!(o instanceof PositionedRect)) return false;
         PositionedRect that = (PositionedRect) o;
         return position.equals(that.position) &&
-            size.equals(that.size);
+                size.equals(that.size);
     }
 
     @Override
@@ -61,8 +61,8 @@ public int hashCode() {
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
-            .add("position", position)
-            .add("size", size)
-            .toString();
+                .add("position", position)
+                .add("size", size)
+                .toString();
     }
 }
diff --git a/src/main/java/gregtech/api/util/Predicates.java b/src/main/java/gregtech/api/util/Predicates.java
index 0f941e8c36f..235bc7ad496 100644
--- a/src/main/java/gregtech/api/util/Predicates.java
+++ b/src/main/java/gregtech/api/util/Predicates.java
@@ -1,7 +1,7 @@
 package gregtech.api.util;
 
-import java.util.*;
-import java.util.function.*;
+import java.util.Arrays;
+import java.util.function.Predicate;
 
 /**
  * Various Quality-of-Life methods for working with Java 8 Predicates.
@@ -20,7 +20,7 @@ public static  Predicate not(Predicate predicate) {
     @SafeVarargs
     public static  Predicate or(Predicate... predicates) {
         return Arrays.stream(predicates)
-                     .reduce(x -> false, Predicate::or);
+                .reduce(x -> false, Predicate::or);
     }
 
     /**
@@ -29,6 +29,6 @@ public static  Predicate or(Predicate... predicates) {
     @SafeVarargs
     public static  Predicate and(Predicate... predicates) {
         return Arrays.stream(predicates)
-                     .reduce(x -> true, Predicate::and);
+                .reduce(x -> true, Predicate::and);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/util/RenderUtil.java b/src/main/java/gregtech/api/util/RenderUtil.java
index dbb2424524d..d3f98e3f67d 100644
--- a/src/main/java/gregtech/api/util/RenderUtil.java
+++ b/src/main/java/gregtech/api/util/RenderUtil.java
@@ -22,9 +22,9 @@ public static void useScissor(int x, int y, int width, int height, Runnable code
 
     private static int[] peekFirstScissorOrFullScreen() {
         int[] currentTopFrame = scissorFrameStack.isEmpty() ? null : scissorFrameStack.peek();
-        if(currentTopFrame == null) {
+        if (currentTopFrame == null) {
             Minecraft minecraft = Minecraft.getMinecraft();
-            return new int[] {0, 0, minecraft.displayWidth, minecraft.displayHeight};
+            return new int[]{0, 0, minecraft.displayWidth, minecraft.displayHeight};
         }
         return currentTopFrame;
     }
@@ -37,12 +37,12 @@ public static void pushScissorFrame(int x, int y, int width, int height) {
         int parentHeight = parentScissor[3];
 
         boolean pushedFrame = false;
-        if(x <= parentX + parentWidth && y <= parentY + parentHeight) {
+        if (x <= parentX + parentWidth && y <= parentY + parentHeight) {
             int newX = x >= parentX ? x : parentX;
             int newY = y >= parentY ? y : parentY;
             int newWidth = width - (newX - x);
             int newHeight = height - (newY - y);
-            if(newWidth > 0 && newHeight > 0) {
+            if (newWidth > 0 && newHeight > 0) {
                 int maxWidth = parentWidth - (x - parentX);
                 int maxHeight = parentHeight - (y - parentY);
                 newWidth = maxWidth > newWidth ? newWidth : maxWidth;
@@ -52,15 +52,15 @@ public static void pushScissorFrame(int x, int y, int width, int height) {
                 if (scissorFrameStack.isEmpty()) {
                     GL11.glEnable(GL11.GL_SCISSOR_TEST);
                 }
-                scissorFrameStack.push(new int[] {newX, newY, newWidth, newHeight});
+                scissorFrameStack.push(new int[]{newX, newY, newWidth, newHeight});
                 pushedFrame = true;
             }
         }
-        if(!pushedFrame) {
+        if (!pushedFrame) {
             if (scissorFrameStack.isEmpty()) {
                 GL11.glEnable(GL11.GL_SCISSOR_TEST);
             }
-            scissorFrameStack.push(new int[] {parentX, parentY, parentWidth, parentHeight});
+            scissorFrameStack.push(new int[]{parentX, parentY, parentWidth, parentHeight});
         }
     }
 
@@ -83,7 +83,7 @@ private static void applyScissor(int x, int y, int w, int h) {
         ScaledResolution r = ((GuiIngameForge) Minecraft.getMinecraft().ingameGUI).getResolution();
         int s = r.getScaleFactor();
         int translatedY = r.getScaledHeight() - y - h;
-        GL11.glScissor(x*s, translatedY*s, w*s, h*s);
+        GL11.glScissor(x * s, translatedY * s, w * s, h * s);
     }
 
 }
diff --git a/src/main/java/gregtech/api/util/ShapedOreEnergyTransferRecipe.java b/src/main/java/gregtech/api/util/ShapedOreEnergyTransferRecipe.java
index a295f52d70e..488b3a938fb 100644
--- a/src/main/java/gregtech/api/util/ShapedOreEnergyTransferRecipe.java
+++ b/src/main/java/gregtech/api/util/ShapedOreEnergyTransferRecipe.java
@@ -37,7 +37,7 @@ public ShapedOreEnergyTransferRecipe(ResourceLocation group, @Nonnull ItemStack
         super(group, result, primer);
         this.chargePredicate = chargePredicate;
         this.transferMaxCharge = transferMaxCharge;
-        if(overrideCharge) {
+        if (overrideCharge) {
             fixOutputItemMaxCharge();
         }
     }
@@ -45,11 +45,11 @@ public ShapedOreEnergyTransferRecipe(ResourceLocation group, @Nonnull ItemStack
     //transfer initial max charge for correct display in JEI
     private void fixOutputItemMaxCharge() {
         long totalMaxCharge = getIngredients().stream()
-            .mapToLong(it -> Arrays.stream(it.getMatchingStacks())
-                .map(stack -> stack.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null))
-                .filter(Objects::nonNull)
-                .mapToLong(IElectricItem::getMaxCharge)
-                .max().orElse(0L)).sum();
+                .mapToLong(it -> Arrays.stream(it.getMatchingStacks())
+                        .map(stack -> stack.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null))
+                        .filter(Objects::nonNull)
+                        .mapToLong(IElectricItem::getMaxCharge)
+                        .max().orElse(0L)).sum();
         IElectricItem electricItem = output.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null);
         if (totalMaxCharge > 0L && electricItem instanceof ElectricItem) {
             ((ElectricItem) electricItem).setMaxChargeOverride(totalMaxCharge);
@@ -70,7 +70,7 @@ public static void chargeStackFromComponents(ItemStack toolStack, IInventory ing
         if (electricItem != null && electricItem.getMaxCharge() > 0L) {
             for (int slotIndex = 0; slotIndex < ingredients.getSizeInventory(); slotIndex++) {
                 ItemStack stackInSlot = ingredients.getStackInSlot(slotIndex);
-                if(!chargePredicate.test(stackInSlot)) {
+                if (!chargePredicate.test(stackInSlot)) {
                     continue;
                 }
                 IElectricItem batteryItem = stackInSlot.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null);
@@ -85,7 +85,7 @@ public static void chargeStackFromComponents(ItemStack toolStack, IInventory ing
                 }
             }
         }
-        if(electricItem instanceof ElectricItem && transferMaxCharge) {
+        if (electricItem instanceof ElectricItem && transferMaxCharge) {
             ((ElectricItem) electricItem).setMaxChargeOverride(totalMaxCharge);
         }
     }
diff --git a/src/main/java/gregtech/api/util/Size.java b/src/main/java/gregtech/api/util/Size.java
index 5e40f141ca6..9752141ec49 100644
--- a/src/main/java/gregtech/api/util/Size.java
+++ b/src/main/java/gregtech/api/util/Size.java
@@ -30,7 +30,7 @@ public boolean equals(Object o) {
         if (!(o instanceof Size)) return false;
         Size size = (Size) o;
         return width == size.width &&
-            height == size.height;
+                height == size.height;
     }
 
     @Override
@@ -41,8 +41,8 @@ public int hashCode() {
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
-            .add("width", width)
-            .add("height", height)
-            .toString();
+                .add("width", width)
+                .add("height", height)
+                .toString();
     }
 }
diff --git a/src/main/java/gregtech/api/util/SlotUtil.java b/src/main/java/gregtech/api/util/SlotUtil.java
index f9895706ddc..77886e5e750 100644
--- a/src/main/java/gregtech/api/util/SlotUtil.java
+++ b/src/main/java/gregtech/api/util/SlotUtil.java
@@ -75,6 +75,6 @@ private static void fillPhantomSlot(Slot slot, ItemStack stackHeld, int mouseBut
 
     public static boolean areItemsEqual(ItemStack itemStack1, ItemStack itemStack2) {
         return !ItemStack.areItemsEqual(itemStack1, itemStack2) ||
-            !ItemStack.areItemStackTagsEqual(itemStack1, itemStack2);
+                !ItemStack.areItemStackTagsEqual(itemStack1, itemStack2);
     }
 }
diff --git a/src/main/java/gregtech/api/util/StreamUtils.java b/src/main/java/gregtech/api/util/StreamUtils.java
index 02962405fe3..db9842b8ad5 100644
--- a/src/main/java/gregtech/api/util/StreamUtils.java
+++ b/src/main/java/gregtech/api/util/StreamUtils.java
@@ -1,10 +1,14 @@
 package gregtech.api.util;
 
-import net.minecraft.item.*;
-import net.minecraftforge.items.*;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.IItemHandler;
 
-import java.util.*;
-import java.util.stream.*;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 /**
  * Various Quality-of-Life methods for working with Java 8 Streams.
@@ -20,7 +24,7 @@ public final class StreamUtils {
      */
     public static Stream streamFrom(IItemHandler inventory) {
         return StreamSupport.stream(iterableFrom(inventory).spliterator(),
-                                    false);
+                false);
     }
 
     /**
@@ -47,7 +51,7 @@ public boolean hasNext() {
 
                     @Override
                     public ItemStack next() {
-                        if(!hasNext())
+                        if (!hasNext())
                             throw new NoSuchElementException();
 
                         ItemStack next = inventory.getStackInSlot(cursor);
diff --git a/src/main/java/gregtech/api/util/TaskScheduler.java b/src/main/java/gregtech/api/util/TaskScheduler.java
index efb3f4c360f..43d800c0b3f 100644
--- a/src/main/java/gregtech/api/util/TaskScheduler.java
+++ b/src/main/java/gregtech/api/util/TaskScheduler.java
@@ -16,8 +16,8 @@ public class TaskScheduler {
     private static final Map> tasksPerWorld = new HashMap<>();
 
     public static void scheduleTask(World world, Task task) {
-        if(world.isRemote) {
-           throw new IllegalArgumentException("Attempt to schedule task on client world!");
+        if (world.isRemote) {
+            throw new IllegalArgumentException("Attempt to schedule task on client world!");
         }
         List taskList = tasksPerWorld.computeIfAbsent(world, k -> new ArrayList<>());
         taskList.add(task);
@@ -25,14 +25,14 @@ public static void scheduleTask(World world, Task task) {
 
     @SubscribeEvent
     public static void onWorldUnload(WorldEvent.Unload event) {
-        if(!event.getWorld().isRemote) {
+        if (!event.getWorld().isRemote) {
             tasksPerWorld.remove(event.getWorld());
         }
     }
 
     @SubscribeEvent
     public static void onWorldTick(TickEvent.WorldTickEvent event) {
-        if(!event.world.isRemote) {
+        if (!event.world.isRemote) {
             List taskList = tasksPerWorld.getOrDefault(event.world, Collections.emptyList());
             taskList.removeIf(task -> !task.run());
         }
diff --git a/src/main/java/gregtech/api/util/TextFormattingUtil.java b/src/main/java/gregtech/api/util/TextFormattingUtil.java
index 3e049336f80..1d7aefd2fa3 100644
--- a/src/main/java/gregtech/api/util/TextFormattingUtil.java
+++ b/src/main/java/gregtech/api/util/TextFormattingUtil.java
@@ -7,6 +7,7 @@
 public class TextFormattingUtil {
 
     private static final NavigableMap suffixes = new TreeMap<>();
+
     static {
         suffixes.put(1_000L, "k");
         suffixes.put(1_000_000L, "M");
diff --git a/src/main/java/gregtech/api/util/XSTR.java b/src/main/java/gregtech/api/util/XSTR.java
index ca285bded5b..9bce78e74ce 100644
--- a/src/main/java/gregtech/api/util/XSTR.java
+++ b/src/main/java/gregtech/api/util/XSTR.java
@@ -54,7 +54,7 @@ public XSTR() {
     }
 
     private static final AtomicLong seedUniquifier
-        = new AtomicLong(8682522807148012L);
+            = new AtomicLong(8682522807148012L);
 
     private static long seedUniquifier() {
         // L'Ecuyer, "Tables of Linear Congruential Generators of
diff --git a/src/main/java/gregtech/api/util/world/DummyWorld.java b/src/main/java/gregtech/api/util/world/DummyWorld.java
index 4d80014ac92..5c311288cf7 100644
--- a/src/main/java/gregtech/api/util/world/DummyWorld.java
+++ b/src/main/java/gregtech/api/util/world/DummyWorld.java
@@ -16,7 +16,7 @@
 public class DummyWorld extends World {
 
     private static final WorldSettings DEFAULT_SETTINGS = new WorldSettings(
-        1L, GameType.SURVIVAL, true, false, WorldType.DEFAULT);
+            1L, GameType.SURVIVAL, true, false, WorldType.DEFAULT);
 
     public static final DummyWorld INSTANCE = new DummyWorld();
 
diff --git a/src/main/java/gregtech/api/worldgen/config/OreConfigUtils.java b/src/main/java/gregtech/api/worldgen/config/OreConfigUtils.java
index cabcd8f7309..ff93332fb21 100644
--- a/src/main/java/gregtech/api/worldgen/config/OreConfigUtils.java
+++ b/src/main/java/gregtech/api/worldgen/config/OreConfigUtils.java
@@ -4,8 +4,8 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import gregtech.api.unification.OreDictUnifier;
-import gregtech.api.unification.material.MaterialRegistry;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.MaterialRegistry;
 import gregtech.api.unification.material.properties.PropertyKey;
 import gregtech.api.unification.ore.StoneType;
 import gregtech.common.blocks.BlockOre;
@@ -56,8 +56,8 @@ public static Map getOreStateMap(String stringDeclaratio
 
     public static Map getOreForMaterial(Material material) {
         List oreBlocks = MetaBlocks.ORES.stream()
-            .filter(ore -> ore.material == material)
-            .collect(Collectors.toList());
+                .filter(ore -> ore.material == material)
+                .collect(Collectors.toList());
         HashMap stoneTypeMap = new HashMap<>();
         for (BlockOre blockOre : oreBlocks) {
             for (StoneType stoneType : blockOre.STONE_TYPE.getAllowedValues()) {
diff --git a/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java b/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java
index d3bac4e9e8e..d9ef9e08b16 100644
--- a/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java
+++ b/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java
@@ -61,10 +61,10 @@ public OreDepositDefinition(String depositName) {
     public void initializeFromConfig(JsonObject configRoot) {
         this.weight = configRoot.get("weight").getAsInt();
         this.density = configRoot.get("density").getAsFloat();
-        if(configRoot.has("name")) {
+        if (configRoot.has("name")) {
             this.assignedName = configRoot.get("name").getAsString();
         }
-        if(configRoot.has("description")) {
+        if (configRoot.has("description")) {
             this.description = configRoot.get("description").getAsString();
         }
         if (configRoot.has("priority")) {
diff --git a/src/main/java/gregtech/api/worldgen/config/WorldGenRegistry.java b/src/main/java/gregtech/api/worldgen/config/WorldGenRegistry.java
index 4676d5c0dd9..246a415f665 100644
--- a/src/main/java/gregtech/api/worldgen/config/WorldGenRegistry.java
+++ b/src/main/java/gregtech/api/worldgen/config/WorldGenRegistry.java
@@ -60,17 +60,17 @@ private class WorldOreVeinCache {
 
         public WorldOreVeinCache(WorldProvider worldProvider) {
             this.worldVeins = registeredDefinitions.stream()
-                .filter(definition -> definition.getDimensionFilter().test(worldProvider))
-                .collect(Collectors.toList());
+                    .filter(definition -> definition.getDimensionFilter().test(worldProvider))
+                    .collect(Collectors.toList());
         }
 
         private List> getBiomeEntry(Biome biome) {
             if (biomeVeins.containsKey(biome))
                 return biomeVeins.get(biome);
             List> result = worldVeins.stream()
-                .map(vein -> new SimpleEntry<>(vein.getWeight() + vein.getBiomeWeightModifier().apply(biome), vein))
-                .filter(entry -> entry.getKey() > 0)
-                .collect(Collectors.toList());
+                    .map(vein -> new SimpleEntry<>(vein.getWeight() + vein.getBiomeWeightModifier().apply(biome), vein))
+                    .filter(entry -> entry.getKey() > 0)
+                    .collect(Collectors.toList());
             biomeVeins.put(biome, result);
             return result;
         }
@@ -119,7 +119,7 @@ public void reinitializeRegisteredVeins() throws IOException {
             Files.createDirectories(worldgenRootPath);
         }
 
-        if(!Files.exists(dimensionsFile)) {
+        if (!Files.exists(dimensionsFile)) {
             Files.createFile(dimensionsFile);
             extractJarVeinDefinitions(configPath, dimensionsFile);
         }
@@ -136,13 +136,13 @@ public void reinitializeRegisteredVeins() throws IOException {
         gatherNamedDimensions(dimensionsFile);
 
         List worldgenFiles = Files.walk(worldgenRootPath)
-            .filter(path -> path.toString().endsWith(".json"))
-            .filter(Files::isRegularFile)
-            .collect(Collectors.toList());
+                .filter(path -> path.toString().endsWith(".json"))
+                .filter(Files::isRegularFile)
+                .collect(Collectors.toList());
 
         for (Path worldgenDefinition : worldgenFiles) {
             JsonObject element = FileUtility.tryExtractFromFile(worldgenDefinition);
-            if(element == null){
+            if (element == null) {
                 break;
             }
 
@@ -175,23 +175,22 @@ private static void extractJarVeinDefinitions(Path configPath, Path targetPath)
                 throw new IllegalStateException("Unable to locate absolute path to worldgen root directory: " + sampleUri);
             }
 
-            if(targetPath.compareTo(worldgenRootPath) == 0) {
+            if (targetPath.compareTo(worldgenRootPath) == 0) {
                 GTLog.logger.info("Attempting extraction of standard worldgen definitions from {} to {}",
-                    worldgenJarRootPath, worldgenRootPath);
+                        worldgenJarRootPath, worldgenRootPath);
                 List jarFiles = Files.walk(worldgenJarRootPath)
-                    .filter(Files::isRegularFile)
-                    .filter(jarPath -> !(jarPath.compareTo(worldgenJarRootPath.resolve("dimensions.json")) == 0))
-                    .collect(Collectors.toList());
+                        .filter(Files::isRegularFile)
+                        .filter(jarPath -> !(jarPath.compareTo(worldgenJarRootPath.resolve("dimensions.json")) == 0))
+                        .collect(Collectors.toList());
                 for (Path jarFile : jarFiles) {
                     Path worldgenPath = worldgenRootPath.resolve(worldgenJarRootPath.relativize(jarFile).toString());
                     Files.createDirectories(worldgenPath.getParent());
                     Files.copy(jarFile, worldgenPath, StandardCopyOption.REPLACE_EXISTING);
                 }
                 GTLog.logger.info("Extracted {} builtin worldgen definitions into worldgen folder", jarFiles.size());
-            }
-            else if(targetPath.compareTo(dimensionsRootPath) == 0) {
+            } else if (targetPath.compareTo(dimensionsRootPath) == 0) {
                 GTLog.logger.info("Attempting extraction of standard dimension definitions from {} to {}",
-                    worldgenJarRootPath, dimensionsRootPath);
+                        worldgenJarRootPath, dimensionsRootPath);
 
                 Path dimensionFile = worldgenJarRootPath.resolve("dimensions.json");
 
@@ -214,16 +213,16 @@ else if(targetPath.compareTo(dimensionsRootPath) == 0) {
 
     private void gatherNamedDimensions(Path dimensionsFile) {
         JsonObject element = FileUtility.tryExtractFromFile(dimensionsFile);
-        if(element == null){
+        if (element == null) {
             return;
         }
 
         try {
             JsonArray dims = element.getAsJsonArray("dims");
-            for(JsonElement dim : dims) {
+            for (JsonElement dim : dims) {
                 namedDimensions.put(dim.getAsJsonObject().get("dimID").getAsInt(), dim.getAsJsonObject().get("dimName").getAsString());
             }
-        } catch (RuntimeException exception){
+        } catch (RuntimeException exception) {
             GTLog.logger.error("Failed to parse named dimensions", exception);
         }
     }
diff --git a/src/main/java/gregtech/api/worldgen/filler/BlacklistedBlockFiller.java b/src/main/java/gregtech/api/worldgen/filler/BlacklistedBlockFiller.java
index f4dc0ec029c..72aa3fcf6c9 100644
--- a/src/main/java/gregtech/api/worldgen/filler/BlacklistedBlockFiller.java
+++ b/src/main/java/gregtech/api/worldgen/filler/BlacklistedBlockFiller.java
@@ -40,8 +40,8 @@ public List getBlacklist() {
     @Method(modid = GTValues.MODID_CT)
     public List ctGetBlacklist() {
         return blacklist.stream()
-            .map(CraftTweakerMC::getBlockState)
-            .collect(Collectors.toList());
+                .map(CraftTweakerMC::getBlockState)
+                .collect(Collectors.toList());
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/worldgen/generator/CachedGridEntry.java b/src/main/java/gregtech/api/worldgen/generator/CachedGridEntry.java
index b6e250ec760..be2390b773a 100644
--- a/src/main/java/gregtech/api/worldgen/generator/CachedGridEntry.java
+++ b/src/main/java/gregtech/api/worldgen/generator/CachedGridEntry.java
@@ -52,18 +52,18 @@ public static CachedGridEntry getOrCreateEntry(World world, int gridX, int gridZ
 
     private static Cache createGridCache() {
         return CacheBuilder.newBuilder()
-            .maximumSize(300)
-            .expireAfterAccess(5L, TimeUnit.MINUTES)
-            .build();
+                .maximumSize(300)
+                .expireAfterAccess(5L, TimeUnit.MINUTES)
+                .build();
     }
 
     private final TLongObjectMap dataByChunkPos = new TLongObjectHashMap<>();
     private static final Comparator COMPARATOR = Comparator.comparing(OreDepositDefinition::getPriority).reversed();
     private static final BlockPos[] CHUNK_CORNER_SPOTS = new BlockPos[]{
-        new BlockPos(0, 0, 0),
-        new BlockPos(15, 0, 0),
-        new BlockPos(0, 0, 15),
-        new BlockPos(15, 0, 15)
+            new BlockPos(0, 0, 0),
+            new BlockPos(15, 0, 0),
+            new BlockPos(0, 0, 15),
+            new BlockPos(15, 0, 15)
     };
 
     private final Random gridRandom;
diff --git a/src/main/java/gregtech/api/worldgen/generator/WorldGeneratorImpl.java b/src/main/java/gregtech/api/worldgen/generator/WorldGeneratorImpl.java
index 97179f66d4e..785508103c0 100644
--- a/src/main/java/gregtech/api/worldgen/generator/WorldGeneratorImpl.java
+++ b/src/main/java/gregtech/api/worldgen/generator/WorldGeneratorImpl.java
@@ -20,7 +20,7 @@
 public class WorldGeneratorImpl implements IWorldGenerator {
 
     private static final List ORE_EVENT_TYPES = Arrays.asList(
-        COAL, DIAMOND, GOLD, IRON, LAPIS, REDSTONE, QUARTZ, EMERALD);
+            COAL, DIAMOND, GOLD, IRON, LAPIS, REDSTONE, QUARTZ, EMERALD);
     public static final int GRID_SIZE_X = 3;
     public static final int GRID_SIZE_Z = 3;
 
@@ -28,7 +28,7 @@ public class WorldGeneratorImpl implements IWorldGenerator {
     public void onOreGenerate(OreGenEvent.GenerateMinable event) {
         EventType eventType = event.getType();
         if (ConfigHolder.disableVanillaOres &&
-            ORE_EVENT_TYPES.contains(eventType)) {
+                ORE_EVENT_TYPES.contains(eventType)) {
             event.setResult(Result.DENY);
         }
     }
diff --git a/src/main/java/gregtech/api/worldgen/populator/FluidSpringPopulator.java b/src/main/java/gregtech/api/worldgen/populator/FluidSpringPopulator.java
index 31bbb66c571..1f51db73b2b 100644
--- a/src/main/java/gregtech/api/worldgen/populator/FluidSpringPopulator.java
+++ b/src/main/java/gregtech/api/worldgen/populator/FluidSpringPopulator.java
@@ -33,8 +33,8 @@ public void loadFromConfig(JsonObject object) {
     @Override
     public void initializeForVein(OreDepositDefinition definition) {
         List possibleStates = definition.getBlockFiller().getAllPossibleStates().stream()
-            .flatMap(it -> it.getPossibleResults().stream())
-            .collect(Collectors.toList());
+                .flatMap(it -> it.getPossibleResults().stream())
+                .collect(Collectors.toList());
         this.fluidState = possibleStates.stream().filter(it -> it.getPropertyKeys().contains(BlockFluidBase.LEVEL)).findFirst().orElse(null);
         if (fluidState == null) {
             String message = "Can't find fluid block for spring in vein %s. Blocks in vein: %s";
diff --git a/src/main/java/gregtech/api/worldgen/populator/SurfaceBlockPopulator.java b/src/main/java/gregtech/api/worldgen/populator/SurfaceBlockPopulator.java
index d44fb306690..e112288ee27 100644
--- a/src/main/java/gregtech/api/worldgen/populator/SurfaceBlockPopulator.java
+++ b/src/main/java/gregtech/api/worldgen/populator/SurfaceBlockPopulator.java
@@ -44,11 +44,12 @@ public void initializeForVein(OreDepositDefinition definition) {
     /**
      * Generates the Surface Block for an underground vein. Spawns the Surface Block on top of the applicable topmost block in
      * the chunk, at a random position in the chunk. Does not run on a Flat world type
-     * @param world - The Minecraft world. Used for finding the top most block and its state
-     * @param chunkX - The X chunk coordinate
-     * @param chunkZ - The Z chunk coordinate
-     * @param random - A Random parameter. Used for determining the number of spawned Surface Blocks and their position
-     * @param definition - The Ore Vein definition
+     *
+     * @param world         - The Minecraft world. Used for finding the top most block and its state
+     * @param chunkX        - The X chunk coordinate
+     * @param chunkZ        - The Z chunk coordinate
+     * @param random        - A Random parameter. Used for determining the number of spawned Surface Blocks and their position
+     * @param definition    - The Ore Vein definition
      * @param gridEntryInfo - Information about the ore generation grid for the current generation section
      */
     @Override
@@ -70,27 +71,27 @@ public void populateChunk(World world, int chunkX, int chunkZ, Random random, Or
                 }
 
                 //Check to see if the selected block has special rendering parameters (like glass) or a special model
-                if(!blockState.isOpaqueCube() || !blockState.isFullBlock()) {
+                if (!blockState.isOpaqueCube() || !blockState.isFullBlock()) {
                     continue;
                 }
 
                 //Checks if the block is a replaceable feature like grass or snow layers. Liquids are replaceable, so
                 // exclude one deep liquid blocks, for looks
-                if(!blockAtPos.isReplaceable(world, topBlockPos.up()) || blockState.getMaterial().isLiquid()) {
+                if (!blockAtPos.isReplaceable(world, topBlockPos.up()) || blockState.getMaterial().isLiquid()) {
                     continue;
                 }
 
                 BlockPos surfaceRockPos = topBlockPos.up();
                 boolean successful = world.setBlockState(surfaceRockPos, this.blockState, 16);
 
-                if(!successful) {
+                if (!successful) {
                     failedGenerationCounter++;
                 }
             }
         }
 
         //Log if all Surface Block generation attempts were failed
-        if(failedGenerationCounter == stonesCount && maxIndicatorAmount > 0 && world.getWorldType() != WorldType.FLAT) {
+        if (failedGenerationCounter == stonesCount && maxIndicatorAmount > 0 && world.getWorldType() != WorldType.FLAT) {
             GTLog.logger.debug("Failed all Surface Block generation attempts for vein {} at chunk with position: x: {}, z: {}", definition.getDepositName(), chunkX, chunkZ);
         }
     }
diff --git a/src/main/java/gregtech/api/worldgen/populator/SurfaceRockPopulator.java b/src/main/java/gregtech/api/worldgen/populator/SurfaceRockPopulator.java
index 8443877410b..d4f9b4a36d1 100644
--- a/src/main/java/gregtech/api/worldgen/populator/SurfaceRockPopulator.java
+++ b/src/main/java/gregtech/api/worldgen/populator/SurfaceRockPopulator.java
@@ -23,7 +23,10 @@
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.IFluidBlock;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Set;
 
 public class SurfaceRockPopulator implements VeinChunkPopulator {
 
@@ -71,8 +74,7 @@ private void setStoneBlock(World world, BlockPos blockPos, Collection
             TileEntitySurfaceRock tileEntity = (TileEntitySurfaceRock) world.getTileEntity(blockPos);
             if (tileEntity != null)
                 tileEntity.setData(this.material, undergroundMaterials);
-        }
-        else {
+        } else {
             failedGenerationCounter++;
         }
     }
@@ -80,11 +82,12 @@ private void setStoneBlock(World world, BlockPos blockPos, Collection
     /**
      * Generates the Surface Rock for an underground vein. Replaces the applicable topmost block in the chunk with a
      * Surface Rock, at a random position in the chunk. Does not run on a Flat world type
-     * @param world - The Minecraft world. Used for finding the top most block and its state
-     * @param chunkX - The X chunk coordinate
-     * @param chunkZ - The Z chunk coordinate
-     * @param random - A Random parameter. Used for determining the number of spawned Surface Blocks and their position
-     * @param definition - The Ore Vein definition
+     *
+     * @param world         - The Minecraft world. Used for finding the top most block and its state
+     * @param chunkX        - The X chunk coordinate
+     * @param chunkZ        - The Z chunk coordinate
+     * @param random        - A Random parameter. Used for determining the number of spawned Surface Blocks and their position
+     * @param definition    - The Ore Vein definition
      * @param gridEntryInfo - Information about the ore generation grid for the current generation section
      */
     @Override
@@ -102,13 +105,13 @@ public void populateChunk(World world, int chunkX, int chunkZ, Random random, Or
 
                 //Checks if the block is a replaceable feature like grass, snow layers, or Air. Liquids are replaceable, so
                 // exclude one deep liquid blocks, for looks
-                if(!blockAtPos.isReplaceable(world, topBlockPos) || world.getBlockState(topBlockPos).getMaterial().isLiquid()) {
+                if (!blockAtPos.isReplaceable(world, topBlockPos) || world.getBlockState(topBlockPos).getMaterial().isLiquid()) {
                     continue;
                 }
 
                 //Checks if the block below has a solid top. This method is also used to check what blocks redstone can
                 //be placed on.
-                if(!world.isSideSolid(topBlockPos.down(), EnumFacing.UP)) {
+                if (!world.isSideSolid(topBlockPos.down(), EnumFacing.UP)) {
                     continue;
                 }
 
@@ -117,7 +120,7 @@ public void populateChunk(World world, int chunkX, int chunkZ, Random random, Or
         }
 
         //Log if all Surface Rock generation attempts were failed
-        if(failedGenerationCounter == stonesCount && stonesCount > 0 && world.getWorldType() != WorldType.FLAT) {
+        if (failedGenerationCounter == stonesCount && stonesCount > 0 && world.getWorldType() != WorldType.FLAT) {
             GTLog.logger.debug("Failed to generate surface rocks for vein {} at chunk with position: x: {}, z: {}", definition.getDepositName(), chunkX, chunkZ);
         }
     }
diff --git a/src/main/java/gregtech/common/ClientProxy.java b/src/main/java/gregtech/common/ClientProxy.java
index 469db4ffd39..074e154abbd 100644
--- a/src/main/java/gregtech/common/ClientProxy.java
+++ b/src/main/java/gregtech/common/ClientProxy.java
@@ -72,7 +72,7 @@ public class ClientProxy extends CommonProxy {
     private static final ResourceLocation GREGTECH_CAPE_TEXTURE = new ResourceLocation(GTValues.MODID, "textures/gregtechcape.png");
 
     public static final IBlockColor COMPRESSED_BLOCK_COLOR = (IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) ->
-        state.getValue(((BlockCompressed) state.getBlock()).variantProperty).getMaterialRGB();
+            state.getValue(((BlockCompressed) state.getBlock()).variantProperty).getMaterialRGB();
 
     public static final IItemColor COMPRESSED_ITEM_COLOR = (stack, tintIndex) -> {
         BlockCompressed block = (BlockCompressed) ((ItemBlock) stack.getItem()).getBlock();
@@ -92,13 +92,13 @@ public class ClientProxy extends CommonProxy {
     };
 
     public static final IBlockColor ORE_BLOCK_COLOR = (IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) ->
-        tintIndex == 1 ? ((BlockOre) state.getBlock()).material.getMaterialRGB() : 0xFFFFFF;
+            tintIndex == 1 ? ((BlockOre) state.getBlock()).material.getMaterialRGB() : 0xFFFFFF;
 
     public static final IItemColor ORE_ITEM_COLOR = (stack, tintIndex) ->
-        tintIndex == 1 ? ((BlockOre) ((ItemBlock) stack.getItem()).getBlock()).material.getMaterialRGB() : 0xFFFFFF;
+            tintIndex == 1 ? ((BlockOre) ((ItemBlock) stack.getItem()).getBlock()).material.getMaterialRGB() : 0xFFFFFF;
 
     public static final IBlockColor FOAM_BLOCK_COLOR = (IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) ->
-        state.getValue(BlockColored.COLOR).colorValue;
+            state.getValue(BlockColored.COLOR).colorValue;
 
     public void onPreLoad() {
         super.onPreLoad();
@@ -151,7 +151,7 @@ public static void addMaterialFormulaHandler(ItemTooltipEvent event) {
         if (unificationEntry != null && unificationEntry.material != null) {
             chemicalFormula = unificationEntry.material.getChemicalFormula();
 
-        // Test for Fluids
+            // Test for Fluids
         } else if (ItemNBTUtils.hasTag(itemStack)) {
 
             // Vanilla bucket
@@ -165,14 +165,15 @@ public static void addMaterialFormulaHandler(ItemTooltipEvent event) {
                 }
             }
 
-        // Water buckets have a separate registry name from other buckets
-        } else if(itemStack.getItem().equals(Items.WATER_BUCKET)) {
+            // Water buckets have a separate registry name from other buckets
+        } else if (itemStack.getItem().equals(Items.WATER_BUCKET)) {
             chemicalFormula = FluidTooltipUtil.getWaterTooltip();
         }
         if (chemicalFormula != null && !chemicalFormula.isEmpty()) {
             event.getToolTip().add(1, ChatFormatting.YELLOW.toString() + chemicalFormula);
         }
     }
+
     private static final String[] clearRecipes = new String[]{
             "quantum_tank",
             "quantum_chest",
@@ -252,8 +253,8 @@ private static void loadCapesList() {
                 connection.disconnect();
             }
         } catch (UnknownHostException |
-            SocketTimeoutException |
-            MalformedURLException ignored) {
+                SocketTimeoutException |
+                MalformedURLException ignored) {
         } catch (IOException exception) {
             GTLog.logger.warn("Failed to fetch cape list", exception);
         }
diff --git a/src/main/java/gregtech/common/CommonProxy.java b/src/main/java/gregtech/common/CommonProxy.java
index 71fd0025a81..bbf7ae04ffc 100644
--- a/src/main/java/gregtech/common/CommonProxy.java
+++ b/src/main/java/gregtech/common/CommonProxy.java
@@ -112,11 +112,11 @@ public static void registerItems(RegistryEvent.Register event) {
         ToolRecipeHandler.initializeMetaItems();
 
         registry.register(createItemBlock(MACHINE, MachineItemBlock::new));
-      
+
         for (BlockCable cable : CABLES) registry.register(createItemBlock(cable, ItemBlockCable::new));
         for (BlockFluidPipe pipe : FLUID_PIPES) registry.register(createItemBlock(pipe, ItemBlockFluidPipe::new));
         for (BlockItemPipe pipe : ITEM_PIPES) registry.register(createItemBlock(pipe, ItemBlockItemPipe::new));
-      
+
         registry.register(createItemBlock(HERMETIC_CASING, VariantItemBlock::new));
         registry.register(createItemBlock(BOILER_CASING, VariantItemBlock::new));
         registry.register(createItemBlock(BOILER_FIREBOX_CASING, VariantItemBlock::new));
@@ -137,16 +137,16 @@ public static void registerItems(RegistryEvent.Register event) {
         registry.register(createMultiTexItemBlock(SAPLING, state -> state.getValue(BlockGregSapling.VARIANT).getName()));
 
         COMPRESSED.values()
-            .stream().distinct()
-            .map(block -> createItemBlock(block, CompressedItemBlock::new))
-            .forEach(registry::register);
+                .stream().distinct()
+                .map(block -> createItemBlock(block, CompressedItemBlock::new))
+                .forEach(registry::register);
         FRAMES.values()
-            .stream().distinct()
-            .map(block -> createItemBlock(block, FrameItemBlock::new))
-            .forEach(registry::register);
+                .stream().distinct()
+                .map(block -> createItemBlock(block, FrameItemBlock::new))
+                .forEach(registry::register);
         ORES.stream()
-            .map(block -> createItemBlock(block, OreItemBlock::new))
-            .forEach(registry::register);
+                .map(block -> createItemBlock(block, OreItemBlock::new))
+                .forEach(registry::register);
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
@@ -204,8 +204,8 @@ public static void registerRecipesLowest(RegistryEvent.Register event)
         DecompositionRecipeHandler.runRecipeGeneration();
         RecyclingRecipes.init();
         WoodMachineRecipes.init();
-        
-        if (GTValues.isModLoaded(GTValues.MODID_CT)){
+
+        if (GTValues.isModLoaded(GTValues.MODID_CT)) {
             MetaItemBracketHandler.rebuildComponentRegistry();
         }
     }
@@ -238,7 +238,7 @@ public static void modifyFuelBurnTime(FurnaceFuelBurnTimeEvent event) {
             Material material = itemBlock.getBlockState(stack).getValue(itemBlock.compressedBlock.variantProperty);
             DustProperty property = material.getProperty(PropertyKey.DUST);
             if (property != null &&
-                property.getBurnTime() > 0) {
+                    property.getBurnTime() > 0) {
                 //compute burn value for block prefix, taking amount of material in block into account
                 double materialUnitsInBlock = OrePrefix.block.getMaterialAmount(material) / (GTValues.M * 1.0);
                 event.setBurnTime((int) (materialUnitsInBlock * property.getBurnTime()));
diff --git a/src/main/java/gregtech/common/EventHandlers.java b/src/main/java/gregtech/common/EventHandlers.java
index 42ffaa8f8d6..cd55f3f1595 100644
--- a/src/main/java/gregtech/common/EventHandlers.java
+++ b/src/main/java/gregtech/common/EventHandlers.java
@@ -22,7 +22,7 @@ public class EventHandlers {
     @SubscribeEvent
     public static void onEndermanTeleportEvent(EnderTeleportEvent event) {
         if (event.getEntity() instanceof EntityEnderman && event.getEntityLiving()
-            .getActivePotionEffect(MobEffects.WEAKNESS) != null) {
+                .getActivePotionEffect(MobEffects.WEAKNESS) != null) {
             event.setCanceled(true);
         }
     }
@@ -32,8 +32,8 @@ public static void onPlayerInteraction(PlayerInteractEvent.RightClickBlock event
         ItemStack stack = event.getItemStack();
         if (!stack.isEmpty() && stack.getItem() == Items.FLINT_AND_STEEL) {
             if (!event.getWorld().isRemote
-                && !event.getEntityPlayer().capabilities.isCreativeMode
-                && event.getWorld().rand.nextInt(100) >= ConfigHolder.flintChanceToCreateFire) {
+                    && !event.getEntityPlayer().capabilities.isCreativeMode
+                    && event.getWorld().rand.nextInt(100) >= ConfigHolder.flintChanceToCreateFire) {
                 stack.damageItem(1, event.getEntityPlayer());
                 if (stack.getItemDamage() >= stack.getMaxDamage()) {
                     stack.shrink(1);
@@ -51,8 +51,7 @@ public void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event)
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
-    public void onBreakSpeed(PlayerEvent.BreakSpeed event)
-    {
+    public void onBreakSpeed(PlayerEvent.BreakSpeed event) {
         IBlockState state = event.getState();
 
     }
diff --git a/src/main/java/gregtech/common/MetaFluids.java b/src/main/java/gregtech/common/MetaFluids.java
index 3cb41be6401..3c1627b2aaa 100644
--- a/src/main/java/gregtech/common/MetaFluids.java
+++ b/src/main/java/gregtech/common/MetaFluids.java
@@ -243,7 +243,7 @@ public static void init() {
      * Changes the texture of specified material's fluid.
      * The material color is overlayed on top of the texture, set the materialRGB to 0xFFFFFF to remove the overlay.
      *
-     * @param material the material whose texture to change
+     * @param material  the material whose texture to change
      * @param fluidType the type of the fluid
      */
     public static void setMaterialFluidTexture(Material material, FluidType fluidType) {
@@ -258,8 +258,8 @@ public static void setMaterialFluidTexture(Material material, FluidType fluidTyp
      * Changes the texture of specified material's fluid.
      * The material color is overlayed on top of the texture, set the materialRGB to 0xFFFFFF to remove the overlay.
      *
-     * @param material the material whose texture to change
-     * @param fluidType the type of the fluid
+     * @param material        the material whose texture to change
+     * @param fluidType       the type of the fluid
      * @param textureLocation the location of the texture to use
      */
     public static void setMaterialFluidTexture(Material material, FluidType fluidType, ResourceLocation textureLocation) {
diff --git a/src/main/java/gregtech/common/asm/GTCELoadingPlugin.java b/src/main/java/gregtech/common/asm/GTCELoadingPlugin.java
index 38d13e6ec92..67ee4bb905d 100644
--- a/src/main/java/gregtech/common/asm/GTCELoadingPlugin.java
+++ b/src/main/java/gregtech/common/asm/GTCELoadingPlugin.java
@@ -4,8 +4,8 @@
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.Name;
-import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.SortingIndex;
+import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions;
 
 import javax.annotation.Nullable;
 import java.util.Map;
@@ -17,7 +17,7 @@
 public class GTCELoadingPlugin implements IFMLLoadingPlugin {
     @Override
     public String[] getASMTransformerClass() {
-        return new String[] {"gregtech.common.asm.GTCETransformer"};
+        return new String[]{"gregtech.common.asm.GTCETransformer"};
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/asm/JEIVisitor.java b/src/main/java/gregtech/common/asm/JEIVisitor.java
index 370a2ff0191..a00c2d8b376 100644
--- a/src/main/java/gregtech/common/asm/JEIVisitor.java
+++ b/src/main/java/gregtech/common/asm/JEIVisitor.java
@@ -33,7 +33,7 @@ public void visitCode() {
     // public  List addModNameToIngredientTooltip(List tooltip, E ingredient, IIngredientHelper ingredientHelper)
     private static String targetSignature() {
 
-        return  "(" +
+        return "(" +
                 "Ljava/util/List;" + // List
                 "Ljava/lang/Object;" + // E
                 "Lmezz/jei/api/ingredients/IIngredientHelper;" + // IIngredientHelper
@@ -43,7 +43,7 @@ private static String targetSignature() {
     // public void addFluidTooltip(List tooltip, Object ingredient)
     private static String tooltipSignature() {
 
-        return  "(" +
+        return "(" +
                 "Ljava/util/List;" + // List
                 "Ljava/lang/Object;" + // Object
                 ")V"; // return void
diff --git a/src/main/java/gregtech/common/asm/util/ObfMapping.java b/src/main/java/gregtech/common/asm/util/ObfMapping.java
index 100a78a613f..b84378b3081 100644
--- a/src/main/java/gregtech/common/asm/util/ObfMapping.java
+++ b/src/main/java/gregtech/common/asm/util/ObfMapping.java
@@ -1,81 +1,71 @@
 package gregtech.common.asm.util;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.annotation.Nonnull;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.commons.Remapper;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.FieldInsnNode;
-import org.objectweb.asm.tree.FieldNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-import org.objectweb.asm.tree.TypeInsnNode;
-
 import com.google.common.base.Charsets;
 import com.google.common.base.Objects;
 import com.google.common.io.LineProcessor;
 import com.google.common.io.Resources;
-
 import net.minecraft.launchwrapper.Launch;
 import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.commons.Remapper;
+import org.objectweb.asm.tree.*;
+
+import javax.annotation.Nonnull;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
 
 /**
- * 
  * @apiNote codechicken.asm.ObfMapping
- *
  */
 public class ObfMapping extends Remapper {
-    
-	//Use when unit testing is a thing.
+
+    //Use when unit testing is a thing.
     private static final boolean isUnitTest = Boolean.getBoolean("ccl.unit_testing");
     public static final ObfRemapper obfMapper = new ObfRemapper();
     public static Remapper mcpMapper = null;
     public static final boolean obfuscated;
-    
+
     public String s_owner;
     public String s_name;
     public String s_desc;
-    
+
     public static void loadMCPRemapper() {
-    	if (mcpMapper == null) {
-    		mcpMapper = new MCPRemapper();
-    	}
+        if (mcpMapper == null) {
+            mcpMapper = new MCPRemapper();
+        }
     }
-    
+
     public ObfMapping(String owner) {
-		this(owner, "", "");
-	}
-    
+        this(owner, "", "");
+    }
+
     public ObfMapping(String owner, String name) {
-    	this(owner, name, "");
+        this(owner, name, "");
     }
-    
+
     public ObfMapping(String owner, String name, String desc) {
-    	this.s_owner = owner;
-    	this.s_name = name;
-    	this.s_desc = desc;
-    	
-    	if (s_owner.contains(".")) {
-    		throw new IllegalArgumentException(s_owner);
-    	}
-    }
-    
+        this.s_owner = owner;
+        this.s_name = name;
+        this.s_desc = desc;
+
+        if (s_owner.contains(".")) {
+            throw new IllegalArgumentException(s_owner);
+        }
+    }
+
     public ObfMapping(ObfMapping descmap, String subclass) {
-    	this(subclass, descmap.s_name, descmap.s_desc);
+        this(subclass, descmap.s_name, descmap.s_desc);
     }
-    
+
     public static ObfMapping fromDesc(String s) {
-    	int lastDot = s.lastIndexOf('.');
+        int lastDot = s.lastIndexOf('.');
         if (lastDot < 0) {
             return new ObfMapping(s, "", "");
         }
@@ -95,19 +85,19 @@ public static ObfMapping fromDesc(String s) {
 
         return new ObfMapping(s.substring(0, lastDot), s.substring(lastDot + 1, sep), s.substring(sep_end));
     }
-    
+
     public ObfMapping subclass(String subclass) {
-    	return new ObfMapping(this, subclass);
+        return new ObfMapping(this, subclass);
     }
-    
+
     public boolean matches(MethodNode node) {
-    	return s_name.equals(node.name) && s_desc.equals(node.desc);
+        return s_name.equals(node.name) && s_desc.equals(node.desc);
     }
-    
+
     public boolean matches(MethodInsnNode node) {
-    	return s_owner.equals(node.owner) && s_name.equals(node.name) && s_desc.equals(node.desc);
+        return s_owner.equals(node.owner) && s_name.equals(node.name) && s_desc.equals(node.desc);
     }
-    
+
     public AbstractInsnNode toInsn(int opcode) {
         if (isClass()) {
             return new TypeInsnNode(opcode, s_owner);
@@ -157,7 +147,7 @@ public boolean matches(FieldInsnNode node) {
     public String javaClass() {
         return s_owner.replace('/', '.');
     }
-    
+
     public String methodDesc() {
         return s_owner + "." + s_name + s_desc;
     }
@@ -177,30 +167,30 @@ public boolean isMethod() {
     public boolean isField() {
         return !isClass() && !isMethod();
     }
-    
-	public ObfMapping map(Remapper mapper) {
-		if (mapper == null) {
-			return this;
-		}
-
-		if (isMethod()) {
-			s_name = mapper.mapMethodName(s_owner, s_name, s_desc);
-		} else if (isField()) {
-			s_name = mapper.mapFieldName(s_owner, s_name, s_desc);
-		}
-
-		s_owner = mapper.mapType(s_owner);
-
-		if (isMethod()) {
-			s_desc = mapper.mapMethodDesc(s_desc);
-		} else if (s_desc.length() > 0) {
-			s_desc = mapper.mapDesc(s_desc);
-		}
-
-		return this;
-	}
-    
-	public ObfMapping toRuntime() {
+
+    public ObfMapping map(Remapper mapper) {
+        if (mapper == null) {
+            return this;
+        }
+
+        if (isMethod()) {
+            s_name = mapper.mapMethodName(s_owner, s_name, s_desc);
+        } else if (isField()) {
+            s_name = mapper.mapFieldName(s_owner, s_name, s_desc);
+        }
+
+        s_owner = mapper.mapType(s_owner);
+
+        if (isMethod()) {
+            s_desc = mapper.mapMethodDesc(s_desc);
+        } else if (s_desc.length() > 0) {
+            s_desc = mapper.mapDesc(s_desc);
+        }
+
+        return this;
+    }
+
+    public ObfMapping toRuntime() {
         map(mcpMapper);
         return this;
     }
@@ -217,7 +207,7 @@ public ObfMapping toClassloading() {
     public ObfMapping copy() {
         return new ObfMapping(s_owner, s_name, s_desc);
     }
-	
+
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof ObfMapping)) {
@@ -243,19 +233,19 @@ public String toString() {
         }
         return "[" + (isMethod() ? methodDesc() : fieldDesc()) + "]";
     }
-    
+
     public static class ObfRemapper extends Remapper {
-    	
-    	private final HashMap fields = new HashMap<>();
+
+        private final HashMap fields = new HashMap<>();
         private final HashMap funcs = new HashMap<>();
-        
+
         @SuppressWarnings("unchecked")
-		public ObfRemapper() {
-        	if (isUnitTest) {
-        		return;
-        	}
-        	try {
-        		Field rawFieldMapsField = FMLDeobfuscatingRemapper.class.getDeclaredField("rawFieldMaps");
+        public ObfRemapper() {
+            if (isUnitTest) {
+                return;
+            }
+            try {
+                Field rawFieldMapsField = FMLDeobfuscatingRemapper.class.getDeclaredField("rawFieldMaps");
                 Field rawMethodMapsField = FMLDeobfuscatingRemapper.class.getDeclaredField("rawMethodMaps");
                 rawFieldMapsField.setAccessible(true);
                 rawMethodMapsField.setAccessible(true);
@@ -273,7 +263,7 @@ public ObfRemapper() {
                         }
                     }
                 }
-                
+
                 for (Map map : rawMethodMaps.values()) {
                     for (Entry entry : map.entrySet()) {
                         if (entry.getValue().startsWith("func")) {
@@ -281,12 +271,12 @@ public ObfRemapper() {
                         }
                     }
                 }
-                
-        	} catch (Exception e) {
-        		throw new RuntimeException(e);
-        	}
+
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
         }
-        
+
         @Override
         public String mapMethodName(String owner, String name, String desc) {
             String s = funcs.get(name);
@@ -312,78 +302,79 @@ public boolean isObf(String typeName) {
             return !map(typeName).equals(typeName) || !unmap(typeName).equals(typeName);
         }
     }
-    
+
     public static class MCPRemapper extends Remapper implements LineProcessor {
-    	
-    	private final HashMap fields = new HashMap<>();
+
+        private final HashMap fields = new HashMap<>();
         private final HashMap funcs = new HashMap<>();
-    	
+
         public MCPRemapper() {
-			File[] mappings = getConfFiles();
-			try {
-				Resources.readLines(mappings[1].toURI().toURL(), Charsets.UTF_8, this);
-				Resources.readLines(mappings[2].toURI().toURL(), Charsets.UTF_8, this);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-        
-    	public static File[] getConfFiles() {
-    		// check for GradleStart system vars
-    		File notchSrg = new File(System.getProperty("net.minecraftforge.gradle.GradleStart.srg.notch-srg"));
+            File[] mappings = getConfFiles();
+            try {
+                Resources.readLines(mappings[1].toURI().toURL(), Charsets.UTF_8, this);
+                Resources.readLines(mappings[2].toURI().toURL(), Charsets.UTF_8, this);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        public static File[] getConfFiles() {
+            // check for GradleStart system vars
+            File notchSrg = new File(System.getProperty("net.minecraftforge.gradle.GradleStart.srg.notch-srg"));
             File csvDir = new File(System.getProperty("net.minecraftforge.gradle.GradleStart.csvDir"));
-    		
+
             if (notchSrg.exists() && csvDir.exists()) {
                 File fieldCsv = new File(csvDir, "fields.csv");
                 File methodCsv = new File(csvDir, "methods.csv");
 
                 if (notchSrg.exists() && fieldCsv.exists() && methodCsv.exists()) {
-                    return new File[] { notchSrg, fieldCsv, methodCsv };
+                    return new File[]{notchSrg, fieldCsv, methodCsv};
                 }
             }
-    		
+
             throw new RuntimeException("Failed to grab mappings from GradleStart args.");
-    	}
-    	
-    	@Override
+        }
+
+        @Override
         public String mapMethodName(String owner, String name, String desc) {
             String s = funcs.get(name);
             return s == null ? name : s;
         }
-    	
-    	@Override
+
+        @Override
         public String mapFieldName(String owner, String name, String desc) {
             String s = fields.get(name);
             return s == null ? name : s;
         }
-    	
-		@Override
-		public boolean processLine(@Nonnull String line) {
-			int i = line.indexOf(',');
+
+        @Override
+        public boolean processLine(@Nonnull String line) {
+            int i = line.indexOf(',');
             String srg = line.substring(0, i);
             int i2 = i + 1;
             i = line.indexOf(',', i2);
             String mcp = line.substring(i2, i);
             (srg.startsWith("func") ? funcs : fields).put(srg, mcp);
             return true;
-		}
+        }
+
+        @Override
+        public Void getResult() {
+            return null;
+        }
 
-		@Override
-		public Void getResult() {
-			return null;
-		}
-    	
     }
-    
+
     static {
-    	boolean obf = true;
-    	try {
-    		obf = Launch.classLoader.getClassBytes("net.minecraft.world.World") == null;
-    	} catch (Exception ignored) {}
-    	obfuscated = obf;
-    	if (!obf) {
-    		loadMCPRemapper();
-    	}
-    }
-    
+        boolean obf = true;
+        try {
+            obf = Launch.classLoader.getClassBytes("net.minecraft.world.World") == null;
+        } catch (Exception ignored) {
+        }
+        obfuscated = obf;
+        if (!obf) {
+            loadMCPRemapper();
+        }
+    }
+
 }
diff --git a/src/main/java/gregtech/common/asm/util/TargetClassVisitor.java b/src/main/java/gregtech/common/asm/util/TargetClassVisitor.java
index a2299eaf37d..a4be89f7ab5 100644
--- a/src/main/java/gregtech/common/asm/util/TargetClassVisitor.java
+++ b/src/main/java/gregtech/common/asm/util/TargetClassVisitor.java
@@ -28,7 +28,7 @@ public void visit(int version, int access, String name, String signature, String
     }
 
     @SuppressWarnings("deprecation")
-	@Override
+    @Override
     public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
         MethodVisitor visitor = super.visitMethod(access, name, desc, signature, exceptions);
         String methodKey = name + desc;
@@ -41,11 +41,11 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
     }
 
     @SuppressWarnings("deprecation")
-	@Override
+    @Override
     public void visitEnd() {
         super.visitEnd();
         if (!foundMethod) {
-        	FMLLog.log("ArmorRenderTransformer", Level.FATAL, "Failed to find method %s in %s.", methodKey, className);
+            FMLLog.log("ArmorRenderTransformer", Level.FATAL, "Failed to find method %s in %s.", methodKey, className);
             throw new RuntimeException("Failed to patch method " + methodKey + ", loading cannot continue. Check your environment is correct.");
         }
     }
diff --git a/src/main/java/gregtech/common/blocks/BlockCompressed.java b/src/main/java/gregtech/common/blocks/BlockCompressed.java
index a40be432f0c..7bddfddfb3e 100644
--- a/src/main/java/gregtech/common/blocks/BlockCompressed.java
+++ b/src/main/java/gregtech/common/blocks/BlockCompressed.java
@@ -90,8 +90,8 @@ public ItemStack getItem(Material material) {
     @Override
     public void getSubBlocks(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) {
         blockState.getValidStates().stream()
-            .filter(blockState -> blockState.getValue(variantProperty) != Materials._NULL)
-            .forEach(blockState -> list.add(getItem(blockState)));
+                .filter(blockState -> blockState.getValue(variantProperty) != Materials._NULL)
+                .forEach(blockState -> list.add(getItem(blockState)));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/BlockConcrete.java b/src/main/java/gregtech/common/blocks/BlockConcrete.java
index 702d1e9d0e3..032cde3a394 100644
--- a/src/main/java/gregtech/common/blocks/BlockConcrete.java
+++ b/src/main/java/gregtech/common/blocks/BlockConcrete.java
@@ -16,8 +16,8 @@ public BlockConcrete() {
         setSoundType(SoundType.STONE);
         setHarvestLevel("pickaxe", 1);
         setDefaultState(withVariant(
-            ConcreteVariant.LIGHT_CONCRETE,
-            ChiselingVariant.NORMAL));
+                ConcreteVariant.LIGHT_CONCRETE,
+                ChiselingVariant.NORMAL));
     }
 
     public enum ConcreteVariant implements IStringSerializable {
diff --git a/src/main/java/gregtech/common/blocks/BlockFrame.java b/src/main/java/gregtech/common/blocks/BlockFrame.java
index b6d961e6bfa..5816ebc117c 100644
--- a/src/main/java/gregtech/common/blocks/BlockFrame.java
+++ b/src/main/java/gregtech/common/blocks/BlockFrame.java
@@ -34,8 +34,8 @@ public final class BlockFrame extends Block {
 
     public BlockFrame(Material material) {
         super(ModHandler.isMaterialWood(material) ?
-            net.minecraft.block.material.Material.WOOD :
-            net.minecraft.block.material.Material.IRON);
+                net.minecraft.block.material.Material.WOOD :
+                net.minecraft.block.material.Material.IRON);
         this.frameMaterial = material;
         setTranslationKey("frame");
         setHardness(3.0f);
diff --git a/src/main/java/gregtech/common/blocks/BlockGranite.java b/src/main/java/gregtech/common/blocks/BlockGranite.java
index f4db0b8b20a..e05e5a85556 100644
--- a/src/main/java/gregtech/common/blocks/BlockGranite.java
+++ b/src/main/java/gregtech/common/blocks/BlockGranite.java
@@ -16,8 +16,8 @@ public BlockGranite() {
         setSoundType(SoundType.STONE);
         setHarvestLevel("pickaxe", 3);
         setDefaultState(withVariant(
-            GraniteVariant.BLACK_GRANITE,
-            ChiselingVariant.NORMAL));
+                GraniteVariant.BLACK_GRANITE,
+                ChiselingVariant.NORMAL));
     }
 
     public enum GraniteVariant implements IStringSerializable {
diff --git a/src/main/java/gregtech/common/blocks/BlockMineral.java b/src/main/java/gregtech/common/blocks/BlockMineral.java
index 194fed5227c..674360549a9 100644
--- a/src/main/java/gregtech/common/blocks/BlockMineral.java
+++ b/src/main/java/gregtech/common/blocks/BlockMineral.java
@@ -16,8 +16,8 @@ public BlockMineral() {
         setSoundType(SoundType.STONE);
         setHarvestLevel("pickaxe", 1);
         setDefaultState(withVariant(
-            MineralVariant.MARBLE,
-            ChiselingVariant.NORMAL));
+                MineralVariant.MARBLE,
+                ChiselingVariant.NORMAL));
     }
 
     public enum MineralVariant implements IStringSerializable {
diff --git a/src/main/java/gregtech/common/blocks/BlockOre.java b/src/main/java/gregtech/common/blocks/BlockOre.java
index 014362cf847..936e4cac98d 100644
--- a/src/main/java/gregtech/common/blocks/BlockOre.java
+++ b/src/main/java/gregtech/common/blocks/BlockOre.java
@@ -130,12 +130,11 @@ public ItemStack getItem(IBlockState blockState) {
     }
 
 
-
     @Override
     public void getSubBlocks(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) {
-        if(tab == CreativeTabs.SEARCH) {
+        if (tab == CreativeTabs.SEARCH) {
             blockState.getValidStates().forEach(blockState -> list.add(getItem(blockState)));
-        } else if(tab == GregTechAPI.TAB_GREGTECH_ORES) {
+        } else if (tab == GregTechAPI.TAB_GREGTECH_ORES) {
             list.add(getItem(getDefaultState()));
         }
     }
diff --git a/src/main/java/gregtech/common/blocks/BlockWireCoil.java b/src/main/java/gregtech/common/blocks/BlockWireCoil.java
index 610d638cd2e..bb71d1a5a77 100644
--- a/src/main/java/gregtech/common/blocks/BlockWireCoil.java
+++ b/src/main/java/gregtech/common/blocks/BlockWireCoil.java
@@ -1,7 +1,7 @@
 package gregtech.common.blocks;
 
-import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.Materials;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
diff --git a/src/main/java/gregtech/common/blocks/MetaBlocks.java b/src/main/java/gregtech/common/blocks/MetaBlocks.java
index 12c711141d7..17385b1f89f 100644
--- a/src/main/java/gregtech/common/blocks/MetaBlocks.java
+++ b/src/main/java/gregtech/common/blocks/MetaBlocks.java
@@ -185,8 +185,8 @@ public static void init() {
         StoneType.init();
 
         createGeneratedBlock(
-            material -> material.hasProperty(PropertyKey.DUST) && !OrePrefix.block.isIgnored(material),
-            MetaBlocks::createCompressedBlock);
+                material -> material.hasProperty(PropertyKey.DUST) && !OrePrefix.block.isIgnored(material),
+                MetaBlocks::createCompressedBlock);
 
         for (Material material : MaterialRegistry.MATERIAL_REGISTRY) {
 
@@ -238,8 +238,8 @@ protected static void createGeneratedBlock(Predicate materialPredicate
 
         Map blocksToGenerate = new TreeMap<>();
 
-        for(Material material : MaterialRegistry.MATERIAL_REGISTRY)
-            if(materialPredicate.test(material)) {
+        for (Material material : MaterialRegistry.MATERIAL_REGISTRY)
+            if (materialPredicate.test(material)) {
                 int id = material.getId();
                 int metaBlockID = id / 16;
                 int subBlockID = id % 16;
@@ -309,9 +309,12 @@ public static void registerTileEntity() {
     @SideOnly(Side.CLIENT)
     public static void registerItemModels() {
         ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MACHINE), stack -> MetaTileEntityRenderer.MODEL_LOCATION);
-        for (BlockCable cable : CABLES) ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(cable), stack -> CableRenderer.MODEL_LOCATION);
-        for (BlockFluidPipe pipe : FLUID_PIPES) ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(pipe), stack -> FluidPipeRenderer.MODEL_LOCATION);
-        for (BlockItemPipe pipe : ITEM_PIPES) ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(pipe), stack -> ItemPipeRenderer.MODEL_LOCATION);
+        for (BlockCable cable : CABLES)
+            ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(cable), stack -> CableRenderer.MODEL_LOCATION);
+        for (BlockFluidPipe pipe : FLUID_PIPES)
+            ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(pipe), stack -> FluidPipeRenderer.MODEL_LOCATION);
+        for (BlockItemPipe pipe : ITEM_PIPES)
+            ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(pipe), stack -> ItemPipeRenderer.MODEL_LOCATION);
         registerItemModel(BOILER_CASING);
         registerItemModel(BOILER_FIREBOX_CASING);
         registerItemModel(METAL_CASING);
@@ -341,9 +344,9 @@ private static void registerItemModel(Block block) {
         for (IBlockState state : block.getBlockState().getValidStates()) {
             //noinspection ConstantConditions
             ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block),
-                block.getMetaFromState(state),
-                new ModelResourceLocation(block.getRegistryName(),
-                    statePropertiesToString(state.getProperties())));
+                    block.getMetaFromState(state),
+                    new ModelResourceLocation(block.getRegistryName(),
+                            statePropertiesToString(state.getProperties())));
         }
     }
 
@@ -356,9 +359,9 @@ private static void registerItemModelWithFilteredProperties(Block block, IProper
             }
             //noinspection ConstantConditions
             ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block),
-                block.getMetaFromState(state),
-                new ModelResourceLocation(block.getRegistryName(),
-                    statePropertiesToString(stringProperties)));
+                    block.getMetaFromState(state),
+                    new ModelResourceLocation(block.getRegistryName(),
+                            statePropertiesToString(stringProperties)));
         }
     }
 
@@ -370,9 +373,9 @@ private static void registerItemModelWithOverride(Block block, Map,
             stringProperties.putAll(stateOverrides);
             //noinspection ConstantConditions
             ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block),
-                block.getMetaFromState(state),
-                new ModelResourceLocation(block.getRegistryName(),
-                    statePropertiesToString(stringProperties)));
+                    block.getMetaFromState(state),
+                    new ModelResourceLocation(block.getRegistryName(),
+                            statePropertiesToString(stringProperties)));
         }
     }
 
@@ -438,7 +441,7 @@ protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
     @SideOnly(Side.CLIENT)
     public static void registerColors() {
         Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler(
-            FOAM_BLOCK_COLOR, FOAM, REINFORCED_FOAM, PETRIFIED_FOAM, REINFORCED_PETRIFIED_FOAM);
+                FOAM_BLOCK_COLOR, FOAM, REINFORCED_FOAM, PETRIFIED_FOAM, REINFORCED_PETRIFIED_FOAM);
 
         MetaBlocks.COMPRESSED.values().stream().distinct().forEach(block -> {
             Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler(COMPRESSED_BLOCK_COLOR, block);
@@ -481,7 +484,7 @@ public static void registerOreDict() {
             for (StoneType stoneType : blockOre.STONE_TYPE.getAllowedValues()) {
                 if (stoneType == null) continue;
                 ItemStack normalStack = blockOre.getItem(blockOre.getDefaultState()
-                    .withProperty(blockOre.STONE_TYPE, stoneType));
+                        .withProperty(blockOre.STONE_TYPE, stoneType));
                 OreDictUnifier.registerOre(normalStack, stoneType.processingPrefix, material);
             }
         }
@@ -509,8 +512,8 @@ private static String statePropertiesToString(Map, Comparable> p
         StringBuilder stringbuilder = new StringBuilder();
 
         List, Comparable>> entries = properties.entrySet().stream()
-            .sorted(Comparator.comparing(c -> c.getKey().getName()))
-            .collect(Collectors.toList());
+                .sorted(Comparator.comparing(c -> c.getKey().getName()))
+                .collect(Collectors.toList());
 
         for (Map.Entry, Comparable> entry : entries) {
             if (stringbuilder.length() != 0) {
diff --git a/src/main/java/gregtech/common/blocks/OreItemBlock.java b/src/main/java/gregtech/common/blocks/OreItemBlock.java
index 3a6c9103502..e2662db182f 100644
--- a/src/main/java/gregtech/common/blocks/OreItemBlock.java
+++ b/src/main/java/gregtech/common/blocks/OreItemBlock.java
@@ -29,7 +29,7 @@ public int getMetadata(int damage) {
     @Nonnull
     @Override
     public CreativeTabs[] getCreativeTabs() {
-        return new CreativeTabs[] {CreativeTabs.SEARCH, GregTechAPI.TAB_GREGTECH_ORES};
+        return new CreativeTabs[]{CreativeTabs.SEARCH, GregTechAPI.TAB_GREGTECH_ORES};
     }
 
     @SuppressWarnings("deprecation")
diff --git a/src/main/java/gregtech/common/blocks/StoneItemBlock.java b/src/main/java/gregtech/common/blocks/StoneItemBlock.java
index 24994a51993..de4c75e35a9 100644
--- a/src/main/java/gregtech/common/blocks/StoneItemBlock.java
+++ b/src/main/java/gregtech/common/blocks/StoneItemBlock.java
@@ -32,8 +32,8 @@ protected IBlockState getBlockState(ItemStack stack) {
     public String getTranslationKey(@Nonnull ItemStack stack) {
         IBlockState blockState = getBlockState(stack);
         return super.getTranslationKey(stack) + '.' +
-            genericBlock.getVariant(blockState).getName() + "." +
-            genericBlock.getChiselingVariant(blockState).getName();
+                genericBlock.getVariant(blockState).getName() + "." +
+                genericBlock.getChiselingVariant(blockState).getName();
     }
 
 }
diff --git a/src/main/java/gregtech/common/blocks/modelfactories/BakedModelHandler.java b/src/main/java/gregtech/common/blocks/modelfactories/BakedModelHandler.java
index 1384d40e3aa..dae9ac00395 100644
--- a/src/main/java/gregtech/common/blocks/modelfactories/BakedModelHandler.java
+++ b/src/main/java/gregtech/common/blocks/modelfactories/BakedModelHandler.java
@@ -44,7 +44,7 @@ protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
         }
     };
     private static final ItemMeshDefinition SIMPLE_MESH_DEFINITION = (stack) ->
-        getSimpleModelLocation(Block.getBlockFromItem(stack.getItem()));
+            getSimpleModelLocation(Block.getBlockFromItem(stack.getItem()));
 
     private static ModelResourceLocation getSimpleModelLocation(Block block) {
         return new ModelResourceLocation(Block.REGISTRY.getNameForObject(block), "");
diff --git a/src/main/java/gregtech/common/blocks/modelfactories/BlockCompressedFactory.java b/src/main/java/gregtech/common/blocks/modelfactories/BlockCompressedFactory.java
index baf0c9addff..8f1fe78214e 100644
--- a/src/main/java/gregtech/common/blocks/modelfactories/BlockCompressedFactory.java
+++ b/src/main/java/gregtech/common/blocks/modelfactories/BlockCompressedFactory.java
@@ -4,8 +4,8 @@
 import com.google.common.collect.ImmutableList;
 import gregtech.api.model.AbstractBlockModelFactory;
 import gregtech.api.model.ResourcePackHook;
-import gregtech.api.unification.material.info.MaterialIconType;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.info.MaterialIconType;
 import gregtech.common.blocks.BlockCompressed;
 import net.minecraft.block.Block;
 import net.minecraftforge.fml.relauncher.Side;
@@ -17,12 +17,12 @@
 public class BlockCompressedFactory extends AbstractBlockModelFactory {
 
     private static final String VARIANT_DEFINITION =
-        "\"$MATERIAL$\": {\n" +
-            "        \"textures\": {\n" +
-            "          \"all\": \"$TEXTURE$\",\n" +
-            "          \"particle\": \"$TEXTURE$\"\n" +
-            "        }\n" +
-            "      }";
+            "\"$MATERIAL$\": {\n" +
+                    "        \"textures\": {\n" +
+                    "          \"all\": \"$TEXTURE$\",\n" +
+                    "          \"particle\": \"$TEXTURE$\"\n" +
+                    "        }\n" +
+                    "      }";
 
     private static final Joiner COMMA_JOINER = Joiner.on(',');
 
@@ -41,8 +41,8 @@ protected String fillSample(Block block, String blockStateSample) {
         ArrayList variants = new ArrayList<>();
         for (Material material : allowedValues) {
             variants.add(VARIANT_DEFINITION
-                .replace("$MATERIAL$", material.toString())
-                .replace("$TEXTURE$", MaterialIconType.block.getBlockPath(material.getMaterialIconSet()).toString())
+                    .replace("$MATERIAL$", material.toString())
+                    .replace("$TEXTURE$", MaterialIconType.block.getBlockPath(material.getMaterialIconSet()).toString())
             );
         }
         return blockStateSample.replace("$VARIANTS$", COMMA_JOINER.join(variants));
diff --git a/src/main/java/gregtech/common/blocks/modelfactories/BlockFrameFactory.java b/src/main/java/gregtech/common/blocks/modelfactories/BlockFrameFactory.java
index f20516a661f..a1ce65c7314 100644
--- a/src/main/java/gregtech/common/blocks/modelfactories/BlockFrameFactory.java
+++ b/src/main/java/gregtech/common/blocks/modelfactories/BlockFrameFactory.java
@@ -2,8 +2,8 @@
 
 import gregtech.api.model.AbstractBlockModelFactory;
 import gregtech.api.model.ResourcePackHook;
-import gregtech.api.unification.material.info.MaterialIconType;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.info.MaterialIconType;
 import gregtech.common.blocks.BlockFrame;
 import net.minecraft.block.Block;
 import net.minecraftforge.fml.relauncher.Side;
@@ -25,7 +25,7 @@ private BlockFrameFactory() {
     protected String fillSample(Block block, String blockStateSample) {
         Material material = ((BlockFrame) block).frameMaterial;
         return blockStateSample.replace("$MATERIAL$", material.toString())
-            .replace("$TEXTURE$", MaterialIconType.frameGt.getBlockPath(material.getMaterialIconSet()).toString());
+                .replace("$TEXTURE$", MaterialIconType.frameGt.getBlockPath(material.getMaterialIconSet()).toString());
     }
 
 
diff --git a/src/main/java/gregtech/common/blocks/modelfactories/BlockOreFactory.java b/src/main/java/gregtech/common/blocks/modelfactories/BlockOreFactory.java
index 54fa74a5d64..631fba9f8b4 100644
--- a/src/main/java/gregtech/common/blocks/modelfactories/BlockOreFactory.java
+++ b/src/main/java/gregtech/common/blocks/modelfactories/BlockOreFactory.java
@@ -15,17 +15,17 @@
 public class BlockOreFactory extends AbstractBlockModelFactory {
 
     private static final String VARIANT_DEFINITION =
-        "      \"$STONE_TYPE$\": {\n" +
-            "        \"textures\": {\n" +
-            "          \"base_down\": \"$BASE_TEXTURE_TOP$\",\n" +
-            "          \"base_up\": \"$BASE_TEXTURE_TOP$\",\n" +
-            "          \"base_north\": \"$BASE_TEXTURE_SIDE$\",\n" +
-            "          \"base_south\": \"$BASE_TEXTURE_SIDE$\",\n" +
-            "          \"base_west\": \"$BASE_TEXTURE_SIDE$\",\n" +
-            "          \"base_east\": \"$BASE_TEXTURE_SIDE$\",\n" +
-            "          \"particle\": \"$BASE_TEXTURE_SIDE$\"\n" +
-            "        }\n" +
-            "      }";
+            "      \"$STONE_TYPE$\": {\n" +
+                    "        \"textures\": {\n" +
+                    "          \"base_down\": \"$BASE_TEXTURE_TOP$\",\n" +
+                    "          \"base_up\": \"$BASE_TEXTURE_TOP$\",\n" +
+                    "          \"base_north\": \"$BASE_TEXTURE_SIDE$\",\n" +
+                    "          \"base_south\": \"$BASE_TEXTURE_SIDE$\",\n" +
+                    "          \"base_west\": \"$BASE_TEXTURE_SIDE$\",\n" +
+                    "          \"base_east\": \"$BASE_TEXTURE_SIDE$\",\n" +
+                    "          \"particle\": \"$BASE_TEXTURE_SIDE$\"\n" +
+                    "        }\n" +
+                    "      }";
     private static final Joiner COMMA_JOINER = Joiner.on(",\n");
 
     public static void init() {
@@ -40,13 +40,13 @@ private BlockOreFactory() {
     @Override
     protected String fillSample(Block block, String blockStateSample) {
         return blockStateSample
-            .replace("$STONE_TYPES$", COMMA_JOINER.join(((BlockOre) block).STONE_TYPE.getAllowedValues().stream()
-                .map(stoneType -> VARIANT_DEFINITION
-                    .replace("$STONE_TYPE$", stoneType.name)
-                    .replace("$BASE_TEXTURE_TOP$", stoneType.backgroundTopTexture.toString())
-                    .replace("$BASE_TEXTURE_SIDE$", stoneType.backgroundSideTexture.toString()))
-                .collect(Collectors.toList())))
-            .replace("$MATERIAL_TEXTURE_NORMAL$", MaterialIconType.ore.getBlockPath(((BlockOre) block).material.getMaterialIconSet()).toString());
+                .replace("$STONE_TYPES$", COMMA_JOINER.join(((BlockOre) block).STONE_TYPE.getAllowedValues().stream()
+                        .map(stoneType -> VARIANT_DEFINITION
+                                .replace("$STONE_TYPE$", stoneType.name)
+                                .replace("$BASE_TEXTURE_TOP$", stoneType.backgroundTopTexture.toString())
+                                .replace("$BASE_TEXTURE_SIDE$", stoneType.backgroundSideTexture.toString()))
+                        .collect(Collectors.toList())))
+                .replace("$MATERIAL_TEXTURE_NORMAL$", MaterialIconType.ore.getBlockPath(((BlockOre) block).material.getMaterialIconSet()).toString());
     }
 
 }
diff --git a/src/main/java/gregtech/common/blocks/properties/PropertyMaterial.java b/src/main/java/gregtech/common/blocks/properties/PropertyMaterial.java
index 447b6512e71..edc710901fa 100644
--- a/src/main/java/gregtech/common/blocks/properties/PropertyMaterial.java
+++ b/src/main/java/gregtech/common/blocks/properties/PropertyMaterial.java
@@ -2,9 +2,9 @@
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
+import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.MaterialRegistry;
 import gregtech.api.unification.material.Materials;
-import gregtech.api.unification.material.Material;
 import net.minecraft.block.properties.PropertyHelper;
 
 import javax.annotation.Nonnull;
diff --git a/src/main/java/gregtech/common/blocks/surfacerock/BlockSurfaceRock.java b/src/main/java/gregtech/common/blocks/surfacerock/BlockSurfaceRock.java
index 738064df1c0..85804dba78b 100755
--- a/src/main/java/gregtech/common/blocks/surfacerock/BlockSurfaceRock.java
+++ b/src/main/java/gregtech/common/blocks/surfacerock/BlockSurfaceRock.java
@@ -2,8 +2,8 @@
 
 import gregtech.api.items.toolitem.IScannableBlock;
 import gregtech.api.unification.OreDictUnifier;
-import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.common.render.StoneRenderer;
 import net.minecraft.block.Block;
diff --git a/src/main/java/gregtech/common/blocks/surfacerock/TileEntitySurfaceRock.java b/src/main/java/gregtech/common/blocks/surfacerock/TileEntitySurfaceRock.java
index f0027c8312b..a779b62e0d3 100644
--- a/src/main/java/gregtech/common/blocks/surfacerock/TileEntitySurfaceRock.java
+++ b/src/main/java/gregtech/common/blocks/surfacerock/TileEntitySurfaceRock.java
@@ -1,8 +1,8 @@
 package gregtech.common.blocks.surfacerock;
 
+import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.MaterialRegistry;
 import gregtech.api.unification.material.Materials;
-import gregtech.api.unification.material.Material;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -79,7 +79,7 @@ public NBTTagCompound writeToNBT(@Nonnull NBTTagCompound compound) {
         compound.setString("Material", MaterialRegistry.MATERIAL_REGISTRY.getNameForObject(material));
         NBTTagList tagList = new NBTTagList();
         this.undergroundMaterials.forEach(it ->
-            tagList.appendTag(new NBTTagString(MaterialRegistry.MATERIAL_REGISTRY.getNameForObject(it))));
+                tagList.appendTag(new NBTTagString(MaterialRegistry.MATERIAL_REGISTRY.getNameForObject(it))));
         compound.setTag("UndergroundMaterials", tagList);
         return compound;
     }
diff --git a/src/main/java/gregtech/common/blocks/wood/BlockGregLeaves.java b/src/main/java/gregtech/common/blocks/wood/BlockGregLeaves.java
index 0fc615eeb71..5bc30640d37 100644
--- a/src/main/java/gregtech/common/blocks/wood/BlockGregLeaves.java
+++ b/src/main/java/gregtech/common/blocks/wood/BlockGregLeaves.java
@@ -27,9 +27,9 @@ public class BlockGregLeaves extends BlockLeaves {
 
     public BlockGregLeaves() {
         setDefaultState(this.blockState.getBaseState()
-            .withProperty(VARIANT, LogVariant.RUBBER_WOOD)
-            .withProperty(CHECK_DECAY, Boolean.TRUE)
-            .withProperty(DECAYABLE, Boolean.TRUE));
+                .withProperty(VARIANT, LogVariant.RUBBER_WOOD)
+                .withProperty(CHECK_DECAY, Boolean.TRUE)
+                .withProperty(DECAYABLE, Boolean.TRUE));
         setTranslationKey("gt.leaves");
         this.setCreativeTab(GregTechAPI.TAB_GREGTECH);
         this.leavesFancy = true;
@@ -51,16 +51,16 @@ protected BlockStateContainer createBlockState() {
     @Override
     public IBlockState getStateFromMeta(int meta) {
         return getDefaultState()
-            .withProperty(CHECK_DECAY, meta / 8 >= 1)
-            .withProperty(DECAYABLE, meta % 8 / 4 == 1)
-            .withProperty(VARIANT, LogVariant.values()[meta % 8 % 4 % LogVariant.values().length]);
+                .withProperty(CHECK_DECAY, meta / 8 >= 1)
+                .withProperty(DECAYABLE, meta % 8 / 4 == 1)
+                .withProperty(VARIANT, LogVariant.values()[meta % 8 % 4 % LogVariant.values().length]);
     }
 
     @Override
     public int getMetaFromState(IBlockState state) {
         return (state.getValue(CHECK_DECAY) ? 8 : 0) +
-            (state.getValue(DECAYABLE) ? 4 : 0) +
-            state.getValue(VARIANT).ordinal();
+                (state.getValue(DECAYABLE) ? 4 : 0) +
+                state.getValue(VARIANT).ordinal();
     }
 
     @Nonnull
diff --git a/src/main/java/gregtech/common/blocks/wood/BlockGregLog.java b/src/main/java/gregtech/common/blocks/wood/BlockGregLog.java
index 22056964f49..3157d53b796 100644
--- a/src/main/java/gregtech/common/blocks/wood/BlockGregLog.java
+++ b/src/main/java/gregtech/common/blocks/wood/BlockGregLog.java
@@ -28,9 +28,9 @@ public class BlockGregLog extends BlockLog {
 
     public BlockGregLog() {
         this.setDefaultState(this.blockState.getBaseState()
-            .withProperty(VARIANT, LogVariant.RUBBER_WOOD)
-            .withProperty(LOG_AXIS, BlockLog.EnumAxis.Y)
-            .withProperty(NATURAL, false));
+                .withProperty(VARIANT, LogVariant.RUBBER_WOOD)
+                .withProperty(LOG_AXIS, BlockLog.EnumAxis.Y)
+                .withProperty(NATURAL, false));
         setTranslationKey("gt.log");
         this.setCreativeTab(GregTechAPI.TAB_GREGTECH);
     }
@@ -60,30 +60,30 @@ public ItemStack getItem(LogVariant variant, int amount) {
     @Override
     public IBlockState getStateFromMeta(int meta) {
         return getDefaultState()
-            .withProperty(LOG_AXIS, EnumAxis.values()[meta / 4 % 4])
-            .withProperty(VARIANT, LogVariant.values()[meta % 4 / 2 % LogVariant.values().length])
-            .withProperty(NATURAL, meta % 4 % 2 == 1);
+                .withProperty(LOG_AXIS, EnumAxis.values()[meta / 4 % 4])
+                .withProperty(VARIANT, LogVariant.values()[meta % 4 / 2 % LogVariant.values().length])
+                .withProperty(NATURAL, meta % 4 % 2 == 1);
     }
 
     @Override
     public int getMetaFromState(IBlockState state) {
         return state.getValue(LOG_AXIS).ordinal() * 4 +
-            state.getValue(VARIANT).ordinal() * 2 +
-            (state.getValue(NATURAL) ? 1 : 0);
+                state.getValue(VARIANT).ordinal() * 2 +
+                (state.getValue(NATURAL) ? 1 : 0);
     }
 
     @Nonnull
     @Override
     protected ItemStack getSilkTouchDrop(IBlockState state) {
         return new ItemStack(Item.getItemFromBlock(this), 1,
-            state.getValue(VARIANT).ordinal());
+                state.getValue(VARIANT).ordinal());
     }
 
     @Nonnull
     @Override
     public ItemStack getPickBlock(IBlockState state, @Nonnull RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player) {
         return new ItemStack(Item.getItemFromBlock(this), 1,
-            state.getValue(VARIANT).ordinal());
+                state.getValue(VARIANT).ordinal());
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/wood/BlockGregSapling.java b/src/main/java/gregtech/common/blocks/wood/BlockGregSapling.java
index 19743958f85..f118ef589f0 100644
--- a/src/main/java/gregtech/common/blocks/wood/BlockGregSapling.java
+++ b/src/main/java/gregtech/common/blocks/wood/BlockGregSapling.java
@@ -35,8 +35,8 @@ public class BlockGregSapling extends BlockBush implements IGrowable, IPlantable
 
     public BlockGregSapling() {
         this.setDefaultState(this.blockState.getBaseState()
-            .withProperty(VARIANT, LogVariant.RUBBER_WOOD)
-            .withProperty(STAGE, 0));
+                .withProperty(VARIANT, LogVariant.RUBBER_WOOD)
+                .withProperty(STAGE, 0));
         setTranslationKey("gt.sapling");
         setCreativeTab(GregTechAPI.TAB_GREGTECH);
         setHardness(0.0F);
@@ -53,8 +53,8 @@ protected BlockStateContainer createBlockState() {
     @Override
     public IBlockState getStateFromMeta(int meta) {
         return getDefaultState()
-            .withProperty(VARIANT, LogVariant.values()[meta % 4 % LogVariant.values().length])
-            .withProperty(STAGE, meta / 4 % 2);
+                .withProperty(VARIANT, LogVariant.values()[meta % 4 % LogVariant.values().length])
+                .withProperty(STAGE, meta / 4 % 2);
     }
 
     @Override
@@ -121,10 +121,10 @@ public void generateTree(World worldIn, BlockPos pos, IBlockState state, Random
         if (!TerrainGen.saplingGrowTree(worldIn, rand, pos)) return;
         WorldGenerator worldgenerator;
         IBlockState logState = MetaBlocks.LOG.getDefaultState()
-            .withProperty(BlockGregLog.VARIANT, LogVariant.RUBBER_WOOD)
-            .withProperty(BlockGregLog.NATURAL, true);
+                .withProperty(BlockGregLog.VARIANT, LogVariant.RUBBER_WOOD)
+                .withProperty(BlockGregLog.NATURAL, true);
         IBlockState leavesState = MetaBlocks.LEAVES.getDefaultState()
-            .withProperty(BlockGregLeaves.VARIANT, LogVariant.RUBBER_WOOD);
+                .withProperty(BlockGregLeaves.VARIANT, LogVariant.RUBBER_WOOD);
         if (rand.nextInt(10) == 0) {
             worldgenerator = new WorldGenBigTreeCustom(true, logState, leavesState.withProperty(BlockGregLeaves.CHECK_DECAY, false), BlockGregLog.LOG_AXIS);
         } else {
diff --git a/src/main/java/gregtech/common/command/util/CommandHand.java b/src/main/java/gregtech/common/command/util/CommandHand.java
index 53eebe607df..db8274947c3 100755
--- a/src/main/java/gregtech/common/command/util/CommandHand.java
+++ b/src/main/java/gregtech/common/command/util/CommandHand.java
@@ -2,6 +2,7 @@
 
 import gregtech.api.capability.GregtechCapabilities;
 import gregtech.api.capability.IElectricItem;
+import gregtech.api.items.materialitem.MetaPrefixItem;
 import gregtech.api.items.metaitem.MetaItem;
 import gregtech.api.items.metaitem.MetaItem.MetaValueItem;
 import gregtech.api.items.toolitem.IToolStats;
@@ -11,7 +12,6 @@
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.stack.UnificationEntry;
 import gregtech.api.util.ClipboardUtil;
-import gregtech.api.items.materialitem.MetaPrefixItem;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
@@ -53,16 +53,16 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
             String registryName = stackInHand.getItem().getRegistryName().toString();
             ClickEvent itemNameEvent = new ClickEvent(Action.OPEN_URL, registryName);
             player.sendMessage(new TextComponentTranslation("gregtech.command.util.hand.item_id", registryName, stackInHand.getItemDamage())
-                .setStyle(new Style().setClickEvent(itemNameEvent)));
+                    .setStyle(new Style().setClickEvent(itemNameEvent)));
 
             IElectricItem electricItem = stackInHand.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null);
             IFluidHandlerItem fluidHandlerItem = stackInHand.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null);
             if (electricItem != null) {
                 player.sendMessage(new TextComponentTranslation("gregtech.command.util.hand.electric",
-                    electricItem.getCharge(),
-                    electricItem.getMaxCharge(),
-                    electricItem.getTier(),
-                    Boolean.toString(electricItem.canProvideChargeExternally())));
+                        electricItem.getCharge(),
+                        electricItem.getMaxCharge(),
+                        electricItem.getTier(),
+                        Boolean.toString(electricItem.canProvideChargeExternally())));
             }
 
             if (fluidHandlerItem != null) {
@@ -71,11 +71,11 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
                     String fluidName = contents == null ? "empty" : contents.getFluid().getName();
                     ClickEvent fluidClickEvent = new ClickEvent(Action.OPEN_URL, fluidName);
                     player.sendMessage(new TextComponentTranslation("gregtech.command.util.hand.fluid",
-                        fluidName,
-                        contents == null ? 0 : contents.amount,
-                        properties.getCapacity(),
-                        Boolean.toString(properties.canFill()), Boolean.toString(properties.canDrain()))
-                    .setStyle(new Style().setClickEvent(fluidClickEvent)));
+                            fluidName,
+                            contents == null ? 0 : contents.amount,
+                            properties.getCapacity(),
+                            Boolean.toString(properties.canFill()), Boolean.toString(properties.canDrain()))
+                            .setStyle(new Style().setClickEvent(fluidClickEvent)));
                 }
             }
 
@@ -88,7 +88,7 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
                         OrePrefix orePrefix = ((MetaPrefixItem) metaItem).getOrePrefix();
                         String oreDictName = new UnificationEntry(orePrefix, material).toString();
                         player.sendMessage(new TextComponentTranslation("gregtech.command.util.hand.material_meta_item", orePrefix, material)
-                            .setStyle(new Style().setClickEvent(new ClickEvent(Action.OPEN_URL, oreDictName))));
+                                .setStyle(new Style().setClickEvent(new ClickEvent(Action.OPEN_URL, oreDictName))));
                     }
                 } else {
                     if (metaValueItem instanceof ToolMetaItem.MetaToolValueItem) {
@@ -98,7 +98,7 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
                     ClipboardUtil.copyToClipboard(player, metaValueItem.unlocalizedName);
                     ClickEvent metaItemEvent = new ClickEvent(Action.OPEN_URL, metaValueItem.unlocalizedName);
                     player.sendMessage(new TextComponentTranslation("gregtech.command.util.hand.meta_item", metaValueItem.unlocalizedName, metaValueItem)
-                        .setStyle(new Style().setClickEvent(metaItemEvent)));
+                            .setStyle(new Style().setClickEvent(metaItemEvent)));
                 }
             }
         } else {
diff --git a/src/main/java/gregtech/common/command/worldgen/CommandWorldgenReload.java b/src/main/java/gregtech/common/command/worldgen/CommandWorldgenReload.java
index 0bf7ae4c71f..ae3b37983cb 100644
--- a/src/main/java/gregtech/common/command/worldgen/CommandWorldgenReload.java
+++ b/src/main/java/gregtech/common/command/worldgen/CommandWorldgenReload.java
@@ -31,11 +31,11 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
         try {
             WorldGenRegistry.INSTANCE.reinitializeRegisteredVeins();
             sender.sendMessage(new TextComponentTranslation("gregtech.command.worldgen.reload.success")
-                .setStyle(new Style().setColor(TextFormatting.GREEN)));
+                    .setStyle(new Style().setColor(TextFormatting.GREEN)));
         } catch (IOException | RuntimeException exception) {
             GTLog.logger.error("Failed to reload worldgen config", exception);
             sender.sendMessage(new TextComponentTranslation("gregtech.command.worldgen.reload.failed")
-                .setStyle(new Style().setColor(TextFormatting.RED)));
+                    .setStyle(new Style().setColor(TextFormatting.RED)));
         }
     }
 }
diff --git a/src/main/java/gregtech/common/covers/CoverConveyor.java b/src/main/java/gregtech/common/covers/CoverConveyor.java
index d8d4fcee224..65626b6fe32 100644
--- a/src/main/java/gregtech/common/covers/CoverConveyor.java
+++ b/src/main/java/gregtech/common/covers/CoverConveyor.java
@@ -186,22 +186,22 @@ protected boolean moveInventoryItemsExact(IItemHandler sourceInventory, IItemHan
         int totalExtractedCount = 0;
         int itemsLeftToExtract = itemInfo.totalCount;
 
-        for(int i = 0; i < itemInfo.slots.size(); i++) {
+        for (int i = 0; i < itemInfo.slots.size(); i++) {
             int slotIndex = itemInfo.slots.get(i);
             ItemStack extractedStack = sourceInventory.extractItem(slotIndex, itemsLeftToExtract, true);
-            if(!extractedStack.isEmpty() &&
-                ItemStack.areItemsEqual(resultStack, extractedStack) &&
-                ItemStack.areItemStackTagsEqual(resultStack, extractedStack)) {
+            if (!extractedStack.isEmpty() &&
+                    ItemStack.areItemsEqual(resultStack, extractedStack) &&
+                    ItemStack.areItemStackTagsEqual(resultStack, extractedStack)) {
                 totalExtractedCount += extractedStack.getCount();
                 itemsLeftToExtract -= extractedStack.getCount();
             }
-            if(itemsLeftToExtract == 0) {
+            if (itemsLeftToExtract == 0) {
                 break;
             }
         }
         //if amount of items extracted is not equal to the amount of items we
         //wanted to extract, abort item extraction
-        if(totalExtractedCount != itemInfo.totalCount) {
+        if (totalExtractedCount != itemInfo.totalCount) {
             return false;
         }
         //adjust size of the result stack accordingly
@@ -210,7 +210,7 @@ protected boolean moveInventoryItemsExact(IItemHandler sourceInventory, IItemHan
         //now, see how much we can insert into destination inventory
         //if we can't insert as much as itemInfo requires, and remainder is empty, abort, abort
         ItemStack remainder = ItemHandlerHelper.insertItemStacked(targetInventory, resultStack, true);
-        if(!remainder.isEmpty()) {
+        if (!remainder.isEmpty()) {
             return false;
         }
 
@@ -219,15 +219,15 @@ protected boolean moveInventoryItemsExact(IItemHandler sourceInventory, IItemHan
 
         //perform real extraction of the items from the source inventory now
         itemsLeftToExtract = itemInfo.totalCount;
-        for(int i = 0; i < itemInfo.slots.size(); i++) {
+        for (int i = 0; i < itemInfo.slots.size(); i++) {
             int slotIndex = itemInfo.slots.get(i);
             ItemStack extractedStack = sourceInventory.extractItem(slotIndex, itemsLeftToExtract, false);
-            if(!extractedStack.isEmpty() &&
-                ItemStack.areItemsEqual(resultStack, extractedStack) &&
-                ItemStack.areItemStackTagsEqual(resultStack, extractedStack)) {
+            if (!extractedStack.isEmpty() &&
+                    ItemStack.areItemsEqual(resultStack, extractedStack) &&
+                    ItemStack.areItemStackTagsEqual(resultStack, extractedStack)) {
                 itemsLeftToExtract -= extractedStack.getCount();
             }
-            if(itemsLeftToExtract == 0) {
+            if (itemsLeftToExtract == 0) {
                 break;
             }
         }
@@ -238,7 +238,7 @@ protected int moveInventoryItems(IItemHandler sourceInventory, IItemHandler targ
         int itemsLeftToTransfer = maxTransferAmount;
         for (int i = 0; i < sourceInventory.getSlots(); i++) {
             ItemStack itemStack = sourceInventory.getStackInSlot(i);
-            if(itemStack.isEmpty()) {
+            if (itemStack.isEmpty()) {
                 continue;
             }
             Object matchSlotIndex = itemFilterContainer.matchItemStack(itemStack);
@@ -256,7 +256,7 @@ protected int moveInventoryItems(IItemHandler sourceInventory, IItemHandler targ
             if (amountToInsert > 0) {
                 extractedStack = sourceInventory.extractItem(i, amountToInsert, false);
 
-                if(!extractedStack.isEmpty()) {
+                if (!extractedStack.isEmpty()) {
 
                     ItemHandlerHelper.insertItemStacked(targetInventory, extractedStack, false);
                     itemsLeftToTransfer -= extractedStack.getCount();
@@ -264,11 +264,11 @@ protected int moveInventoryItems(IItemHandler sourceInventory, IItemHandler targ
 
                     if (itemInfo.totalCount == 0) {
                         itemInfos.remove(matchSlotIndex);
-                        if(itemInfos.isEmpty()) {
+                        if (itemInfos.isEmpty()) {
                             break;
                         }
                     }
-                    if(itemsLeftToTransfer == 0) {
+                    if (itemsLeftToTransfer == 0) {
                         break;
                     }
                 }
@@ -343,7 +343,7 @@ protected Map countInventoryItemsByType(IItemHandler
                 continue;
             }
             ItemStackKey itemStackKey = new ItemStackKey(itemStack);
-            if(!result.containsKey(itemStackKey)) {
+            if (!result.containsKey(itemStackKey)) {
                 TypeItemInfo itemInfo = new TypeItemInfo(itemStack.copy(), transferSlotIndex, new TIntArrayList(), 0);
                 itemInfo.totalCount += itemStack.getCount();
                 itemInfo.slots.add(srcIndex);
@@ -369,7 +369,7 @@ protected Map countInventoryItemsByMatchSlot(IItemHandler
                 continue;
             }
             ItemStackKey itemStackKey = new ItemStackKey(itemStack);
-            if(!result.containsKey(transferSlotIndex)) {
+            if (!result.containsKey(transferSlotIndex)) {
                 GroupItemInfo itemInfo = new GroupItemInfo(transferSlotIndex, new HashSet<>(), 0);
                 itemInfo.itemStackTypes.add(itemStackKey);
                 itemInfo.totalCount += itemStack.getCount();
@@ -392,7 +392,7 @@ public boolean canAttach() {
     public boolean shouldCoverInteractWithOutputside() {
         return true;
     }
-    
+
     @Override
     public void onRemoved() {
         NonNullList drops = NonNullList.create();
@@ -424,7 +424,7 @@ public  T getCapability(Capability capability, T defaultValue) {
             }
             return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(itemHandlerWrapper);
         }
-        if(capability == GregtechTileCapabilities.CAPABILITY_CONTROLLABLE) {
+        if (capability == GregtechTileCapabilities.CAPABILITY_CONTROLLABLE) {
             return GregtechTileCapabilities.CAPABILITY_CONTROLLABLE.cast(this);
         }
         return defaultValue;
@@ -450,15 +450,15 @@ public ModularUI createUI(EntityPlayer player) {
         primaryGroup.addWidget(new SimpleTextWidget(88, 30, "cover.conveyor.transfer_rate", 0xFFFFFF, () -> Integer.toString(transferRate)));
 
         primaryGroup.addWidget(new CycleButtonWidget(10, 45, 75, 20,
-            ConveyorMode.class, this::getConveyorMode, this::setConveyorMode));
+                ConveyorMode.class, this::getConveyorMode, this::setConveyorMode));
         primaryGroup.addWidget(new CycleButtonWidget(7, 166, 116, 20,
-            ManualImportExportMode.class, this::getManualImportExportMode, this::setManualImportExportMode)
-            .setTooltipHoverString("cover.universal.manual_import_export.mode.description"));
+                ManualImportExportMode.class, this::getManualImportExportMode, this::setManualImportExportMode)
+                .setTooltipHoverString("cover.universal.manual_import_export.mode.description"));
         primaryGroup.addWidget(new ToggleButtonWidget(130, 166, 20, 20, GuiTextures.BLOCKS_INPUT, () -> blocksInput, val -> blocksInput = val).setTooltipText("cover.conveyor.blocks_input"));
 
         TileEntity coverTile = coverHolder.getWorld().getTileEntity(coverHolder.getPos());
         TileEntity otherTile = coverHolder.getWorld().getTileEntity(coverHolder.getPos().offset(attachedSide));
-        if(!(this instanceof CoverRoboticArm) && coverTile instanceof TileEntityItemPipe ^ otherTile instanceof TileEntityItemPipe) {
+        if (!(this instanceof CoverRoboticArm) && coverTile instanceof TileEntityItemPipe ^ otherTile instanceof TileEntityItemPipe) {
             primaryGroup.addWidget(new ToggleButtonWidget(149, 166, 20, 20, GuiTextures.DISTRIBUTION_MODE,
                     () -> distributionMode == ItemDistributionMode.INSERT_FIRST,
                     val -> distributionMode = val ? ItemDistributionMode.INSERT_FIRST : ItemDistributionMode.ROUND_ROBIN)
@@ -468,8 +468,8 @@ public ModularUI createUI(EntityPlayer player) {
         this.itemFilterContainer.initUI(70, primaryGroup::addWidget);
 
         ModularUI.Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176, 190 + 82)
-            .widget(primaryGroup)
-            .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 190);
+                .widget(primaryGroup)
+                .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 190);
         return buildUI(builder, player);
     }
 
@@ -505,19 +505,19 @@ public void readFromNBT(NBTTagCompound tagCompound) {
         //LEGACY SAVE FORMAT SUPPORT
         if (tagCompound.hasKey("AllowManualIO")) {
             this.manualImportExportMode = tagCompound.getBoolean("AllowManualIO")
-            ? ManualImportExportMode.FILTERED
-            : ManualImportExportMode.DISABLED;
+                    ? ManualImportExportMode.FILTERED
+                    : ManualImportExportMode.DISABLED;
         }
-        if(tagCompound.hasKey("FilterInventory")) {
+        if (tagCompound.hasKey("FilterInventory")) {
             this.itemFilterContainer.deserializeNBT(tagCompound);
         } else {
             NBTTagCompound filterComponent = tagCompound.getCompoundTag("Filter");
             this.itemFilterContainer.deserializeNBT(filterComponent);
         }
-        if(tagCompound.hasKey("WorkingAllowed")) {
+        if (tagCompound.hasKey("WorkingAllowed")) {
             this.isWorkingAllowed = tagCompound.getBoolean("WorkingAllowed");
         }
-        if(tagCompound.hasKey("ManualImportExportMode")) {
+        if (tagCompound.hasKey("ManualImportExportMode")) {
             this.manualImportExportMode = ManualImportExportMode.values()[tagCompound.getInteger("ManualImportExportMode")];
         }
     }
diff --git a/src/main/java/gregtech/common/covers/CoverFluidFilter.java b/src/main/java/gregtech/common/covers/CoverFluidFilter.java
index f8eff26a212..93608ca042a 100644
--- a/src/main/java/gregtech/common/covers/CoverFluidFilter.java
+++ b/src/main/java/gregtech/common/covers/CoverFluidFilter.java
@@ -74,13 +74,13 @@ public ModularUI createUI(EntityPlayer player) {
         WidgetGroup fluidFilterGroup = new WidgetGroup();
         fluidFilterGroup.addWidget(new LabelWidget(10, 5, "cover.fluid_filter.title"));
         fluidFilterGroup.addWidget(new CycleButtonWidget(10, 20, 110, 20,
-            GTUtility.mapToString(FluidFilterMode.values(), (it) -> it.localeName), () -> this.filterMode.ordinal(),
-            (newMode) -> this.setFilterMode(FluidFilterMode.values()[newMode])));
+                GTUtility.mapToString(FluidFilterMode.values(), (it) -> it.localeName), () -> this.filterMode.ordinal(),
+                (newMode) -> this.setFilterMode(FluidFilterMode.values()[newMode])));
         this.fluidFilter.initUI(45, fluidFilterGroup::addWidget);
         return ModularUI.builder(GuiTextures.BACKGROUND, 176, 105 + 82)
-            .widget(fluidFilterGroup)
-            .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 105)
-            .build(this, player);
+                .widget(fluidFilterGroup)
+                .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 105)
+                .build(this, player);
     }
 
     public void renderCover(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline, Cuboid6 plateBox, BlockRenderLayer layer) {
@@ -112,7 +112,7 @@ public void readFromNBT(NBTTagCompound tagCompound) {
         this.filterMode = FluidFilterMode.values()[tagCompound.getInteger("FilterMode")];
         this.fluidFilter.setBlacklistFilter(tagCompound.getBoolean("IsBlacklist"));
         //LEGACY SAVE FORMAT SUPPORT
-        if(tagCompound.hasKey("FluidFilter")) {
+        if (tagCompound.hasKey("FluidFilter")) {
             this.fluidFilter.getFluidFilter().readFromNBT(tagCompound);
         } else {
             NBTTagCompound filterComponent = tagCompound.getCompoundTag("Filter");
diff --git a/src/main/java/gregtech/common/covers/CoverFluidRegulator.java b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java
index 19bd777926c..52562af7372 100644
--- a/src/main/java/gregtech/common/covers/CoverFluidRegulator.java
+++ b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java
@@ -55,9 +55,12 @@ protected int doTransferFluidsInternal(IFluidHandler myFluidHandler, IFluidHandl
             return 0;
         }
         switch (transferMode) {
-            case TRANSFER_ANY: return GTFluidUtils.transferFluids(sourceHandler, destHandler, transferLimit, fluidFilter::testFluidStack);
-            case KEEP_EXACT: return doKeepExact(transferLimit, sourceHandler, destHandler, fluidFilter::testFluidStack, this.keepAmount);
-            case TRANSFER_EXACT: return doTransferExact(transferLimit, sourceHandler, destHandler, fluidFilter::testFluidStack, this.supplyAmount);
+            case TRANSFER_ANY:
+                return GTFluidUtils.transferFluids(sourceHandler, destHandler, transferLimit, fluidFilter::testFluidStack);
+            case KEEP_EXACT:
+                return doKeepExact(transferLimit, sourceHandler, destHandler, fluidFilter::testFluidStack, this.keepAmount);
+            case TRANSFER_EXACT:
+                return doTransferExact(transferLimit, sourceHandler, destHandler, fluidFilter::testFluidStack, this.supplyAmount);
         }
         return 0;
     }
@@ -89,12 +92,12 @@ protected int doKeepExact(int transferLimit, IFluidHandler sourceHandler, IFluid
             //no fluid in destination
             if (destFluid == null) {
                 amountToDrainAndFill = Math.min(keepAmount, fluidLeftToTransfer);
-            //if the amount of fluid in the destination is sufficient or the destinations fluid isnt equal to the sources
-            //how to check if destHandler is full?
+                //if the amount of fluid in the destination is sufficient or the destinations fluid isnt equal to the sources
+                //how to check if destHandler is full?
             } else if (destFluid.amount >= keepAmount || !destFluid.isFluidEqual(sourceFluid)) {
                 continue;
             } else {
-            //if keepAmount is larger than the transferLimit we will have to stock it over several ticks (seconds?)
+                //if keepAmount is larger than the transferLimit we will have to stock it over several ticks (seconds?)
                 amountToDrainAndFill = Math.min(keepAmount - destFluid.amount, fluidLeftToTransfer);
             }
             sourceFluid.amount = amountToDrainAndFill;
@@ -128,7 +131,8 @@ private String getTransferSizeString() {
             case TRANSFER_EXACT:
                 val = supplyAmount;
                 break;
-            default: val = -1;
+            default:
+                val = -1;
         }
         if (this.bucketMode == BucketMode.BUCKET) {
             val /= 1000;
@@ -154,7 +158,7 @@ protected void getHoverString(List textList) {
     }
 
     @Override
-    public void setBucketMode(BucketMode bucketMode){
+    public void setBucketMode(BucketMode bucketMode) {
         super.setBucketMode(bucketMode);
         if (this.bucketMode == BucketMode.BUCKET) {
             setKeepAmount(keepAmount / 1000 * 1000);
@@ -164,7 +168,7 @@ public void setBucketMode(BucketMode bucketMode){
 
     private void adjustTransferSize(int amount) {
         amount *= this.bucketMode == BucketMode.BUCKET ? 1000 : 1;
-        switch(this.transferMode) {
+        switch (this.transferMode) {
             case TRANSFER_EXACT:
                 setSupplyAmount(MathHelper.clamp(this.supplyAmount + amount, 0, this.transferRate));
             case KEEP_EXACT:
diff --git a/src/main/java/gregtech/common/covers/CoverItemFilter.java b/src/main/java/gregtech/common/covers/CoverItemFilter.java
index dea3fa278b1..431535f76fd 100644
--- a/src/main/java/gregtech/common/covers/CoverItemFilter.java
+++ b/src/main/java/gregtech/common/covers/CoverItemFilter.java
@@ -76,14 +76,14 @@ public ModularUI createUI(EntityPlayer player) {
         WidgetGroup filterGroup = new WidgetGroup();
         filterGroup.addWidget(new LabelWidget(10, 5, titleLocale));
         filterGroup.addWidget(new CycleButtonWidget(10, 20, 110, 20,
-            GTUtility.mapToString(ItemFilterMode.values(), it -> it.localeName),
-            () -> filterMode.ordinal(), (newMode) -> setFilterMode(ItemFilterMode.values()[newMode])));
+                GTUtility.mapToString(ItemFilterMode.values(), it -> it.localeName),
+                () -> filterMode.ordinal(), (newMode) -> setFilterMode(ItemFilterMode.values()[newMode])));
         this.itemFilter.initUI(45, filterGroup::addWidget);
 
         return ModularUI.builder(GuiTextures.BACKGROUND, 176, 105 + 82)
-            .widget(filterGroup)
-            .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 105)
-            .build(this, player);
+                .widget(filterGroup)
+                .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 105)
+                .build(this, player);
     }
 
     @Override
@@ -107,8 +107,8 @@ public void readFromNBT(NBTTagCompound tagCompound) {
         this.filterMode = ItemFilterMode.values()[tagCompound.getInteger("FilterMode")];
         this.itemFilter.setBlacklistFilter(tagCompound.getBoolean("IsBlacklist"));
         //LEGACY SAVE FORMAT SUPPORT
-        if(tagCompound.hasKey("FilterInventory") || tagCompound.hasKey("OreDictionaryFilter")) {
-            if(tagCompound.hasKey("FilterInventory")) {
+        if (tagCompound.hasKey("FilterInventory") || tagCompound.hasKey("OreDictionaryFilter")) {
+            if (tagCompound.hasKey("FilterInventory")) {
                 tagCompound.setTag("ItemFilter", tagCompound.getCompoundTag("FilterInventory"));
                 tagCompound.removeTag("FilterInventory");
             }
diff --git a/src/main/java/gregtech/common/covers/CoverMachineController.java b/src/main/java/gregtech/common/covers/CoverMachineController.java
index 4288111c166..480c1b7ad36 100644
--- a/src/main/java/gregtech/common/covers/CoverMachineController.java
+++ b/src/main/java/gregtech/common/covers/CoverMachineController.java
@@ -115,17 +115,17 @@ public EnumActionResult onScrewdriverClick(EntityPlayer playerIn, EnumHand hand,
     public ModularUI createUI(EntityPlayer player) {
         updateDisplayInventory();
         return ModularUI.defaultBuilder()
-            .label(10, 5, "cover.machine_controller.name")
-            .widget(new SliderWidget("cover.machine_controller.redstone", 10, 20, 156, 20, 1.0f, 15.0f,
-                minRedstoneStrength, it -> setMinRedstoneStrength((int) it)))
-            .widget(new ClickButtonWidget(10, 45, 126, 20, "", data -> cycleNextControllerMode()))
-            .widget(new SimpleTextWidget(68, 55, "", 0xFFFFFF, () -> getControllerMode().getName()))
-            .widget(new SlotWidget(displayInventory, 0, 141, 47, false, false)
-                .setBackgroundTexture(GuiTextures.SLOT))
-            .widget(new CycleButtonWidget(10, 70, 75, 20, this::isInverted, this::setInverted,
-                "cover.machine_controller.normal", "cover.machine_controller.inverted")
-                .setTooltipHoverString("cover.machine_controller.inverted.description"))
-            .build(this, player);
+                .label(10, 5, "cover.machine_controller.name")
+                .widget(new SliderWidget("cover.machine_controller.redstone", 10, 20, 156, 20, 1.0f, 15.0f,
+                        minRedstoneStrength, it -> setMinRedstoneStrength((int) it)))
+                .widget(new ClickButtonWidget(10, 45, 126, 20, "", data -> cycleNextControllerMode()))
+                .widget(new SimpleTextWidget(68, 55, "", 0xFFFFFF, () -> getControllerMode().getName()))
+                .widget(new SlotWidget(displayInventory, 0, 141, 47, false, false)
+                        .setBackgroundTexture(GuiTextures.SLOT))
+                .widget(new CycleButtonWidget(10, 70, 75, 20, this::isInverted, this::setInverted,
+                        "cover.machine_controller.normal", "cover.machine_controller.inverted")
+                        .setTooltipHoverString("cover.machine_controller.inverted.description"))
+                .build(this, player);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/covers/CoverPump.java b/src/main/java/gregtech/common/covers/CoverPump.java
index dee3a6df06a..79cc346c58a 100644
--- a/src/main/java/gregtech/common/covers/CoverPump.java
+++ b/src/main/java/gregtech/common/covers/CoverPump.java
@@ -162,15 +162,15 @@ public ModularUI createUI(EntityPlayer player) {
         primaryGroup.addWidget(new ImageWidget(10, 40, 120, 18, GuiTextures.DISPLAY));
         primaryGroup.addWidget(new SimpleTextWidget(70, 49, "cover.pump.transfer_rate", 0xFFFFFF, () -> bucketMode == BucketMode.BUCKET ? Integer.toString(transferRate / 1000) : Integer.toString(transferRate)));
         primaryGroup.addWidget(new CycleButtonWidget(132, 40, 30, 18,
-            BucketMode.class, this::getBucketMode, this::setBucketMode));
+                BucketMode.class, this::getBucketMode, this::setBucketMode));
 
         primaryGroup.addWidget(new CycleButtonWidget(10, 63, 75, 18,
-            PumpMode.class, this::getPumpMode, this::setPumpMode));
+                PumpMode.class, this::getPumpMode, this::setPumpMode));
 
         primaryGroup.addWidget(new CycleButtonWidget(7, 160, 116, 20,
-           ManualImportExportMode.class, this::getManualImportExportMode, this::setManualImportExportMode)
-            .setTooltipHoverString("cover.universal.manual_import_export.mode.description"));
-              
+                ManualImportExportMode.class, this::getManualImportExportMode, this::setManualImportExportMode)
+                .setTooltipHoverString("cover.universal.manual_import_export.mode.description"));
+
         this.fluidFilter.initUI(88, primaryGroup::addWidget);
 
         ModularUI.Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176, 184 + 82)
@@ -220,7 +220,7 @@ public  T getCapability(Capability capability, T defaultValue) {
             }
             return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(fluidHandlerWrapper);
         }
-        if(capability == GregtechTileCapabilities.CAPABILITY_CONTROLLABLE) {
+        if (capability == GregtechTileCapabilities.CAPABILITY_CONTROLLABLE) {
             return GregtechTileCapabilities.CAPABILITY_CONTROLLABLE.cast(this);
         }
         return defaultValue;
@@ -254,18 +254,18 @@ public void readFromNBT(NBTTagCompound tagCompound) {
         //LEGACY SAVE FORMAT SUPPORT
         if (tagCompound.hasKey("AllowManualIO")) {
             this.manualImportExportMode = tagCompound.getBoolean("AllowManualIO")
-            ? ManualImportExportMode.FILTERED
-            : ManualImportExportMode.DISABLED;
+                    ? ManualImportExportMode.FILTERED
+                    : ManualImportExportMode.DISABLED;
         }
         if (tagCompound.hasKey("FluidFilter")) {
             this.fluidFilter.deserializeNBT(tagCompound);
         } else {
             this.fluidFilter.deserializeNBT(tagCompound.getCompoundTag("Filter"));
         }
-        if(tagCompound.hasKey("WorkingAllowed")) {
+        if (tagCompound.hasKey("WorkingAllowed")) {
             this.isWorkingAllowed = tagCompound.getBoolean("WorkingAllowed");
         }
-        if(tagCompound.hasKey("ManualImportExportMode")) {
+        if (tagCompound.hasKey("ManualImportExportMode")) {
             this.manualImportExportMode = ManualImportExportMode.values()[tagCompound.getInteger("ManualImportExportMode")];
         }
 
@@ -286,7 +286,7 @@ public enum PumpMode implements IStringSerializable {
         PumpMode(String localeName) {
             this.localeName = localeName;
         }
-        
+
         @Nonnull
         @Override
         public String getName() {
diff --git a/src/main/java/gregtech/common/covers/CoverRoboticArm.java b/src/main/java/gregtech/common/covers/CoverRoboticArm.java
index 8775a84c49b..6c6498649bb 100644
--- a/src/main/java/gregtech/common/covers/CoverRoboticArm.java
+++ b/src/main/java/gregtech/common/covers/CoverRoboticArm.java
@@ -41,17 +41,21 @@ public void renderCover(CCRenderState renderState, Matrix4 translation, IVertexO
 
     @Override
     protected int doTransferItems(IItemHandler itemHandler, IItemHandler myItemHandler, int maxTransferAmount) {
-        if(conveyorMode == ConveyorMode.EXPORT && itemHandler instanceof ItemNetHandler) {
+        if (conveyorMode == ConveyorMode.EXPORT && itemHandler instanceof ItemNetHandler) {
             return 0;
         }
-        if(conveyorMode == ConveyorMode.IMPORT && myItemHandler instanceof ItemNetHandler) {
+        if (conveyorMode == ConveyorMode.IMPORT && myItemHandler instanceof ItemNetHandler) {
             return 0;
         }
         switch (transferMode) {
-            case TRANSFER_ANY: return doTransferItemsAny(itemHandler, myItemHandler, maxTransferAmount);
-            case TRANSFER_EXACT: return doTransferExact(itemHandler, myItemHandler, maxTransferAmount);
-            case KEEP_EXACT: return doKeepExact(itemHandler, myItemHandler, maxTransferAmount);
-            default: return 0;
+            case TRANSFER_ANY:
+                return doTransferItemsAny(itemHandler, myItemHandler, maxTransferAmount);
+            case TRANSFER_EXACT:
+                return doTransferExact(itemHandler, myItemHandler, maxTransferAmount);
+            case KEEP_EXACT:
+                return doKeepExact(itemHandler, myItemHandler, maxTransferAmount);
+            default:
+                return 0;
         }
     }
 
@@ -75,7 +79,7 @@ protected int doTransferExact(IItemHandler itemHandler, IItemHandler myItemHandl
         int maxTotalTransferAmount = maxTransferAmount + itemsTransferBuffered;
         boolean notEnoughTransferRate = false;
         for (TypeItemInfo itemInfo : sourceItemAmount.values()) {
-            if(maxTotalTransferAmount >= itemInfo.totalCount) {
+            if (maxTotalTransferAmount >= itemInfo.totalCount) {
                 boolean result = doTransferItemsExact(itemHandler, myItemHandler, itemInfo);
                 itemsTransferred += result ? itemInfo.totalCount : 0;
                 maxTotalTransferAmount -= result ? itemInfo.totalCount : 0;
@@ -146,8 +150,8 @@ protected String getUITitle() {
     protected ModularUI buildUI(Builder builder, EntityPlayer player) {
         WidgetGroup filterGroup = new WidgetGroup();
         filterGroup.addWidget(new CycleButtonWidget(91, 45, 75, 20,
-            TransferMode.class, this::getTransferMode, this::setTransferMode)
-            .setTooltipHoverString("cover.robotic_arm.transfer_mode.description"));
+                TransferMode.class, this::getTransferMode, this::setTransferMode)
+                .setTooltipHoverString("cover.robotic_arm.transfer_mode.description"));
 
         return super.buildUI(builder.widget(filterGroup), player);
     }
diff --git a/src/main/java/gregtech/common/covers/TransferMode.java b/src/main/java/gregtech/common/covers/TransferMode.java
index 9c49c8cca43..e88760b430b 100644
--- a/src/main/java/gregtech/common/covers/TransferMode.java
+++ b/src/main/java/gregtech/common/covers/TransferMode.java
@@ -5,23 +5,23 @@
 import javax.annotation.Nonnull;
 
 public enum TransferMode implements IStringSerializable {
-        TRANSFER_ANY("cover.robotic_arm.transfer_mode.transfer_any", Integer.MAX_VALUE),
-        TRANSFER_EXACT("cover.robotic_arm.transfer_mode.transfer_exact", 64),
-        KEEP_EXACT("cover.robotic_arm.transfer_mode.keep_exact", 1024);
+    TRANSFER_ANY("cover.robotic_arm.transfer_mode.transfer_any", Integer.MAX_VALUE),
+    TRANSFER_EXACT("cover.robotic_arm.transfer_mode.transfer_exact", 64),
+    KEEP_EXACT("cover.robotic_arm.transfer_mode.keep_exact", 1024);
 
-        public final String localeName;
-        public final int maxStackSize;
+    public final String localeName;
+    public final int maxStackSize;
 
-        TransferMode(String localeName, int maxStackSize) {
-            this.localeName = localeName;
-            this.maxStackSize = maxStackSize;
-        }
+    TransferMode(String localeName, int maxStackSize) {
+        this.localeName = localeName;
+        this.maxStackSize = maxStackSize;
+    }
 
 
-        @Nonnull
-        @Override
-        public String getName() {
-            return localeName;
-        }
+    @Nonnull
+    @Override
+    public String getName() {
+        return localeName;
+    }
 }
 
diff --git a/src/main/java/gregtech/common/covers/facade/FacadeBlockAccess.java b/src/main/java/gregtech/common/covers/facade/FacadeBlockAccess.java
index 179dce16e5d..0c846edc585 100644
--- a/src/main/java/gregtech/common/covers/facade/FacadeBlockAccess.java
+++ b/src/main/java/gregtech/common/covers/facade/FacadeBlockAccess.java
@@ -94,11 +94,11 @@ public TileEntity getTileEntity(@Nonnull BlockPos pos) {
     @SideOnly(Side.CLIENT)
     public int getCombinedLight(@Nonnull BlockPos pos, int t) {
         if (((side == DOWN && pos.getY() > this.pos.getY()) ||
-            (side == UP && pos.getY() < this.pos.getY()) ||
-            (side == NORTH && pos.getZ() > this.pos.getZ()) ||
-            (side == SOUTH && pos.getZ() < this.pos.getZ()) ||
-            (side == WEST && pos.getX() > this.pos.getX()) ||
-            (side == EAST && pos.getX() < this.pos.getX()))) {
+                (side == UP && pos.getY() < this.pos.getY()) ||
+                (side == NORTH && pos.getZ() > this.pos.getZ()) ||
+                (side == SOUTH && pos.getZ() < this.pos.getZ()) ||
+                (side == WEST && pos.getX() > this.pos.getX()) ||
+                (side == EAST && pos.getX() < this.pos.getX()))) {
             return world.getCombinedLight(this.pos, t);
         }
         return world.getCombinedLight(pos, t);
@@ -119,8 +119,8 @@ public WorldType getWorldType() {
     public boolean isAirBlock(@Nonnull BlockPos pos) {
         Result action = getAction(pos);
         return action == Result.AIR ||
-            (action == Result.ORIGINAL && world.isAirBlock(pos)) ||
-            (action == Result.COVER && getBlockState(pos).getBlock().isAir(getBlockState(pos), this, pos));
+                (action == Result.ORIGINAL && world.isAirBlock(pos)) ||
+                (action == Result.COVER && getBlockState(pos).getBlock().isAir(getBlockState(pos), this, pos));
     }
 
     @Nonnull
@@ -133,9 +133,9 @@ public Biome getBiome(@Nonnull BlockPos pos) {
     @Override
     public boolean isSideSolid(BlockPos pos, @Nonnull EnumFacing side, boolean _default) {
         if (pos.getX() < -30000000 ||
-            pos.getZ() < -30000000 ||
-            pos.getX() >= 30000000 ||
-            pos.getZ() >= 30000000) {
+                pos.getZ() < -30000000 ||
+                pos.getX() >= 30000000 ||
+                pos.getZ() >= 30000000) {
             return _default;
         } else {
             return getBlockState(pos).isSideSolid(this, pos, side);
diff --git a/src/main/java/gregtech/common/covers/facade/FacadeHelper.java b/src/main/java/gregtech/common/covers/facade/FacadeHelper.java
index 4228ce46141..5f050e3466c 100644
--- a/src/main/java/gregtech/common/covers/facade/FacadeHelper.java
+++ b/src/main/java/gregtech/common/covers/facade/FacadeHelper.java
@@ -21,10 +21,10 @@ public class FacadeHelper {
 
     private static ImmutableList retrieveValidItemsList() {
         return StreamSupport.stream(Item.REGISTRY.spliterator(), false)
-            .filter(item -> item instanceof ItemBlock)
-            .flatMap(item -> getSubItems(item).stream())
-            .filter(FacadeHelper::isValidFacade)
-            .collect(GTUtility.toImmutableList());
+                .filter(item -> item instanceof ItemBlock)
+                .flatMap(item -> getSubItems(item).stream())
+                .filter(FacadeHelper::isValidFacade)
+                .collect(GTUtility.toImmutableList());
     }
 
     public static ImmutableList getValidFacadeItems() {
@@ -43,10 +43,10 @@ private static List getSubItems(Item item) {
     public static boolean isValidFacade(ItemStack itemStack) {
         IBlockState rawBlockState = lookupBlockForItemUnsafe(itemStack);
         return rawBlockState != null &&
-            !rawBlockState.getBlock().hasTileEntity(rawBlockState) &&
-            !rawBlockState.getBlock().hasTileEntity() &&
-            rawBlockState.getRenderType() == EnumBlockRenderType.MODEL &&
-            rawBlockState.isFullCube();
+                !rawBlockState.getBlock().hasTileEntity(rawBlockState) &&
+                !rawBlockState.getBlock().hasTileEntity() &&
+                rawBlockState.getRenderType() == EnumBlockRenderType.MODEL &&
+                rawBlockState.isFullCube();
     }
 
     public static IBlockState lookupBlockForItem(ItemStack itemStack) {
diff --git a/src/main/java/gregtech/common/covers/facade/FacadeRenderer.java b/src/main/java/gregtech/common/covers/facade/FacadeRenderer.java
index b8adf23046a..acc0c61ed1c 100644
--- a/src/main/java/gregtech/common/covers/facade/FacadeRenderer.java
+++ b/src/main/java/gregtech/common/covers/facade/FacadeRenderer.java
@@ -38,8 +38,8 @@
  */
 public class FacadeRenderer {
 
-    final static int[] sideOffsets = { 1, 1, 2, 2, 0, 0 };
-    final static float[] sideSoftBounds = { 0, 1, 0, 1, 0, 1 };
+    final static int[] sideOffsets = {1, 1, 2, 2, 0, 0};
+    final static float[] sideSoftBounds = {0, 1, 0, 1, 0, 1};
 
     private final static float FACADE_RENDER_OFFSET = 2.0f / 512.0f;
     private final static float FACADE_RENDER_OFFSET2 = 1 - FACADE_RENDER_OFFSET;
@@ -109,8 +109,8 @@ public static void renderItemCover(CCRenderState ccrs, int side, ItemStack rende
 
         AdvCCRSConsumer consumer = new AdvCCRSConsumer(ccrs);
         consumer.setTranslation(new Matrix4()
-            .translate(Vector3.center.copy().subtract(bounds.center()))
-            .scale(1.05, 1.05, 1.05));
+                .translate(Vector3.center.copy().subtract(bounds.center()))
+                .scale(1.05, 1.05, 1.05));
         for (CCQuad quad : renderQuads) {
             quad.pipe(consumer);
         }
diff --git a/src/main/java/gregtech/common/covers/filter/FilterTypeRegistry.java b/src/main/java/gregtech/common/covers/filter/FilterTypeRegistry.java
index 606efc45ca5..4e7390d9b2e 100644
--- a/src/main/java/gregtech/common/covers/filter/FilterTypeRegistry.java
+++ b/src/main/java/gregtech/common/covers/filter/FilterTypeRegistry.java
@@ -25,7 +25,7 @@ public static void init() {
     }
 
     public static void registerFluidFilter(int id, Class fluidFilterClass, ItemStack itemStack) {
-        if(fluidFilterById.containsKey(id)) {
+        if (fluidFilterById.containsKey(id)) {
             throw new IllegalArgumentException("Id is already occupied: " + id);
         }
         fluidFilterIdByStack.put(new ItemAndMetadata(itemStack), id);
@@ -33,7 +33,7 @@ public static void registerFluidFilter(int id, Class flui
     }
 
     public static void registerItemFilter(int id, Class itemFilterClass, ItemStack itemStack) {
-        if(itemFilterById.containsKey(id)) {
+        if (itemFilterById.containsKey(id)) {
             throw new IllegalArgumentException("Id is already occupied: " + id);
         }
         itemFilterIdByStack.put(new ItemAndMetadata(itemStack), id);
@@ -42,7 +42,7 @@ public static void registerItemFilter(int id, Class itemFi
 
     public static int getIdForItemFilter(ItemFilter itemFilter) {
         Integer filterId = itemFilterById.inverse().get(itemFilter.getClass());
-        if(filterId == null) {
+        if (filterId == null) {
             throw new IllegalArgumentException("Unknown filter type " + itemFilter.getClass());
         }
         return filterId;
@@ -50,7 +50,7 @@ public static int getIdForItemFilter(ItemFilter itemFilter) {
 
     public static int getIdForFluidFilter(FluidFilter fluidFilter) {
         Integer filterId = fluidFilterById.inverse().get(fluidFilter.getClass());
-        if(filterId == null) {
+        if (filterId == null) {
             throw new IllegalArgumentException("Unknown filter type " + fluidFilter.getClass());
         }
         return filterId;
@@ -58,7 +58,7 @@ public static int getIdForFluidFilter(FluidFilter fluidFilter) {
 
     public static ItemFilter createItemFilterById(int filterId) {
         Class filterClass = itemFilterById.get(filterId);
-        if(filterClass == null) {
+        if (filterClass == null) {
             throw new IllegalArgumentException("Unknown filter id: " + filterId);
         }
         return createNewFilterInstance(filterClass);
@@ -66,7 +66,7 @@ public static ItemFilter createItemFilterById(int filterId) {
 
     public static FluidFilter createFluidFilterById(int filterId) {
         Class filterClass = fluidFilterById.get(filterId);
-        if(filterClass == null) {
+        if (filterClass == null) {
             throw new IllegalArgumentException("Unknown filter id: " + filterId);
         }
         return createNewFilterInstance(filterClass);
@@ -74,7 +74,7 @@ public static FluidFilter createFluidFilterById(int filterId) {
 
     public static ItemFilter getItemFilterForStack(ItemStack itemStack) {
         Integer filterId = itemFilterIdByStack.get(new ItemAndMetadata(itemStack));
-        if(filterId == null) {
+        if (filterId == null) {
             return null;
         }
         Class filterClass = itemFilterById.get(filterId);
@@ -83,7 +83,7 @@ public static ItemFilter getItemFilterForStack(ItemStack itemStack) {
 
     public static FluidFilter getFluidFilterForStack(ItemStack itemStack) {
         Integer filterId = fluidFilterIdByStack.get(new ItemAndMetadata(itemStack));
-        if(filterId == null) {
+        if (filterId == null) {
             return null;
         }
         Class filterClass = fluidFilterById.get(filterId);
diff --git a/src/main/java/gregtech/common/covers/filter/FluidFilter.java b/src/main/java/gregtech/common/covers/filter/FluidFilter.java
index 60f147452dc..275fd1d4f48 100644
--- a/src/main/java/gregtech/common/covers/filter/FluidFilter.java
+++ b/src/main/java/gregtech/common/covers/filter/FluidFilter.java
@@ -26,7 +26,7 @@ public final void setDirtyNotifiable(IDirtyNotifiable dirtyNotifiable) {
     }
 
     public final void markDirty() {
-        if(dirtyNotifiable != null) {
+        if (dirtyNotifiable != null) {
             dirtyNotifiable.markAsDirty();
         }
     }
diff --git a/src/main/java/gregtech/common/covers/filter/FluidFilterContainer.java b/src/main/java/gregtech/common/covers/filter/FluidFilterContainer.java
index 1dfd9ccca64..effd1ce0801 100644
--- a/src/main/java/gregtech/common/covers/filter/FluidFilterContainer.java
+++ b/src/main/java/gregtech/common/covers/filter/FluidFilterContainer.java
@@ -51,7 +51,7 @@ public ItemStackHandler getFilterInventory() {
     public void initUI(int y, Consumer widgetGroup) {
         widgetGroup.accept(new LabelWidget(10, y, "cover.pump.fluid_filter.title"));
         widgetGroup.accept(new SlotWidget(filterInventory, 0, 10, y + 15)
-            .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.FILTER_SLOT_OVERLAY));
+                .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.FILTER_SLOT_OVERLAY));
         this.filterWrapper.initUI(y + 15, widgetGroup);
     }
 
@@ -59,13 +59,13 @@ protected void onFilterSlotChange(boolean notify) {
         ItemStack filterStack = filterInventory.getStackInSlot(0);
         FluidFilter newFluidFilter = FilterTypeRegistry.getFluidFilterForStack(filterStack);
         FluidFilter currentFluidFilter = filterWrapper.getFluidFilter();
-        if(newFluidFilter == null) {
-            if(currentFluidFilter != null) {
+        if (newFluidFilter == null) {
+            if (currentFluidFilter != null) {
                 filterWrapper.setFluidFilter(null);
                 if (notify) filterWrapper.onFilterInstanceChange();
             }
         } else if (currentFluidFilter == null ||
-            newFluidFilter.getClass() != currentFluidFilter.getClass()) {
+                newFluidFilter.getClass() != currentFluidFilter.getClass()) {
             filterWrapper.setFluidFilter(newFluidFilter);
             if (notify) filterWrapper.onFilterInstanceChange();
         }
@@ -80,7 +80,7 @@ public NBTTagCompound serializeNBT() {
         NBTTagCompound tagCompound = new NBTTagCompound();
         tagCompound.setTag("FilterInventory", filterInventory.serializeNBT());
         tagCompound.setBoolean("IsBlacklist", filterWrapper.isBlacklistFilter());
-        if(filterWrapper.getFluidFilter() != null) {
+        if (filterWrapper.getFluidFilter() != null) {
             NBTTagCompound filterInventory = new NBTTagCompound();
             filterWrapper.getFluidFilter().writeToNBT(filterInventory);
             tagCompound.setTag("Filter", filterInventory);
@@ -91,15 +91,15 @@ public NBTTagCompound serializeNBT() {
     @Override
     public void deserializeNBT(NBTTagCompound tagCompound) {
         //LEGACY SAVE FORMAT SUPPORT
-        if(tagCompound.hasKey("FilterTypeInventory")) {
+        if (tagCompound.hasKey("FilterTypeInventory")) {
             this.filterInventory.deserializeNBT(tagCompound.getCompoundTag("FilterTypeInventory"));
         } else {
             this.filterInventory.deserializeNBT(tagCompound.getCompoundTag("FilterInventory"));
         }
         this.filterWrapper.setBlacklistFilter(tagCompound.getBoolean("IsBlacklist"));
-        if(filterWrapper.getFluidFilter() != null) {
+        if (filterWrapper.getFluidFilter() != null) {
             //LEGACY SAVE FORMAT SUPPORT
-            if(tagCompound.hasKey("FluidFilter")) {
+            if (tagCompound.hasKey("FluidFilter")) {
                 this.filterWrapper.getFluidFilter().readFromNBT(tagCompound);
             } else {
                 NBTTagCompound filterInventory = tagCompound.getCompoundTag("Filter");
diff --git a/src/main/java/gregtech/common/covers/filter/FluidFilterWrapper.java b/src/main/java/gregtech/common/covers/filter/FluidFilterWrapper.java
index 862881bc918..4ecdbaafc54 100644
--- a/src/main/java/gregtech/common/covers/filter/FluidFilterWrapper.java
+++ b/src/main/java/gregtech/common/covers/filter/FluidFilterWrapper.java
@@ -20,13 +20,13 @@ public FluidFilterWrapper(IDirtyNotifiable dirtyNotifiable) {
 
     public void initUI(int y, Consumer widgetGroup) {
         widgetGroup.accept(new ToggleButtonWidget(144, y, 18, 18, GuiTextures.BUTTON_BLACKLIST,
-            this::isBlacklistFilter, this::setBlacklistFilter).setTooltipText("cover.filter.blacklist"));
+                this::isBlacklistFilter, this::setBlacklistFilter).setTooltipText("cover.filter.blacklist"));
         widgetGroup.accept(new WidgetGroupFluidFilter(y, this::getFluidFilter));
     }
 
     public void setFluidFilter(FluidFilter fluidFilter) {
         this.currentFluidFilter = fluidFilter;
-        if(currentFluidFilter != null) {
+        if (currentFluidFilter != null) {
             currentFluidFilter.setDirtyNotifiable(dirtyNotifiable);
         }
     }
@@ -50,10 +50,10 @@ public boolean isBlacklistFilter() {
 
     public boolean testFluidStack(FluidStack fluidStack) {
         boolean result = true;
-        if(currentFluidFilter != null) {
+        if (currentFluidFilter != null) {
             result = currentFluidFilter.testFluid(fluidStack);
         }
-        if(isBlacklistFilter) {
+        if (isBlacklistFilter) {
             result = !result;
         }
         return result;
diff --git a/src/main/java/gregtech/common/covers/filter/ItemFilter.java b/src/main/java/gregtech/common/covers/filter/ItemFilter.java
index 6f53cac4086..521703830f1 100644
--- a/src/main/java/gregtech/common/covers/filter/ItemFilter.java
+++ b/src/main/java/gregtech/common/covers/filter/ItemFilter.java
@@ -45,7 +45,7 @@ final void setDirtyNotifiable(IDirtyNotifiable dirtyNotifiable) {
     }
 
     public final void markDirty() {
-        if(dirtyNotifiable != null) {
+        if (dirtyNotifiable != null) {
             dirtyNotifiable.markAsDirty();
         }
     }
diff --git a/src/main/java/gregtech/common/covers/filter/ItemFilterContainer.java b/src/main/java/gregtech/common/covers/filter/ItemFilterContainer.java
index 1572a257280..98517138e64 100644
--- a/src/main/java/gregtech/common/covers/filter/ItemFilterContainer.java
+++ b/src/main/java/gregtech/common/covers/filter/ItemFilterContainer.java
@@ -79,7 +79,7 @@ public void adjustTransferStackSize(int amount) {
     public void initUI(int y, Consumer widgetGroup) {
         widgetGroup.accept(new LabelWidget(10, y, "cover.conveyor.item_filter.title"));
         widgetGroup.accept(new SlotWidget(filterInventory, 0, 10, y + 15)
-            .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.FILTER_SLOT_OVERLAY));
+                .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.FILTER_SLOT_OVERLAY));
 
         ServerWidgetGroup stackSizeGroup = new ServerWidgetGroup(this::showGlobalTransferLimitSlider);
         stackSizeGroup.addWidget(new ClickButtonWidget(91, 70, 20, 20, "-1", data -> adjustTransferStackSize(data.isShiftClick ? -10 : -1)));
@@ -95,14 +95,14 @@ protected void onFilterSlotChange(boolean notify) {
         ItemStack filterStack = filterInventory.getStackInSlot(0);
         ItemFilter newItemFilter = FilterTypeRegistry.getItemFilterForStack(filterStack);
         ItemFilter currentItemFilter = filterWrapper.getItemFilter();
-        if(newItemFilter == null) {
-            if(currentItemFilter != null) {
+        if (newItemFilter == null) {
+            if (currentItemFilter != null) {
                 filterWrapper.setItemFilter(null);
                 filterWrapper.setBlacklistFilter(false);
                 if (notify) filterWrapper.onFilterInstanceChange();
             }
         } else if (currentItemFilter == null ||
-            newItemFilter.getClass() != currentItemFilter.getClass()) {
+                newItemFilter.getClass() != currentItemFilter.getClass()) {
             filterWrapper.setItemFilter(newItemFilter);
             if (notify) filterWrapper.onFilterInstanceChange();
         }
@@ -136,7 +136,7 @@ public NBTTagCompound serializeNBT() {
         tagCompound.setBoolean("IsBlacklist", filterWrapper.isBlacklistFilter());
         tagCompound.setInteger("MaxStackSize", maxStackSizeLimit);
         tagCompound.setInteger("TransferStackSize", transferStackSize);
-        if(filterWrapper.getItemFilter() != null) {
+        if (filterWrapper.getItemFilter() != null) {
             NBTTagCompound filterInventory = new NBTTagCompound();
             filterWrapper.getItemFilter().writeToNBT(filterInventory);
             tagCompound.setTag("Filter", filterInventory);
@@ -148,16 +148,16 @@ public NBTTagCompound serializeNBT() {
     public void deserializeNBT(NBTTagCompound tagCompound) {
         this.filterInventory.deserializeNBT(tagCompound.getCompoundTag("FilterInventory"));
         this.filterWrapper.setBlacklistFilter(tagCompound.getBoolean("IsBlacklist"));
-        if(tagCompound.hasKey("MaxStackSize")) {
+        if (tagCompound.hasKey("MaxStackSize")) {
             setMaxStackSize(tagCompound.getInteger("MaxStackSize"));
         }
         if (tagCompound.hasKey("TransferStackSize")) {
             setTransferStackSize(tagCompound.getInteger("TransferStackSize"));
         }
-        if(filterWrapper.getItemFilter() != null) {
+        if (filterWrapper.getItemFilter() != null) {
             //LEGACY SAVE FORMAT SUPPORT
-            if(tagCompound.hasKey("ItemFilter") ||
-                tagCompound.hasKey("OreDictionaryFilter")) {
+            if (tagCompound.hasKey("ItemFilter") ||
+                    tagCompound.hasKey("OreDictionaryFilter")) {
                 this.filterWrapper.getItemFilter().readFromNBT(tagCompound);
             } else {
                 NBTTagCompound filterInventory = tagCompound.getCompoundTag("Filter");
diff --git a/src/main/java/gregtech/common/covers/filter/ItemFilterWrapper.java b/src/main/java/gregtech/common/covers/filter/ItemFilterWrapper.java
index 6ce9423e21f..9224a8c2d54 100644
--- a/src/main/java/gregtech/common/covers/filter/ItemFilterWrapper.java
+++ b/src/main/java/gregtech/common/covers/filter/ItemFilterWrapper.java
@@ -27,14 +27,14 @@ public ItemFilterWrapper(IDirtyNotifiable dirtyNotifiable) {
     public void initUI(int y, Consumer widgetGroup) {
         ServerWidgetGroup blacklistButton = new ServerWidgetGroup(() -> getItemFilter() != null);
         blacklistButton.addWidget(new ToggleButtonWidget(144, y, 20, 20, GuiTextures.BUTTON_BLACKLIST,
-            this::isBlacklistFilter, this::setBlacklistFilter).setTooltipText("cover.filter.blacklist"));
+                this::isBlacklistFilter, this::setBlacklistFilter).setTooltipText("cover.filter.blacklist"));
         widgetGroup.accept(blacklistButton);
         widgetGroup.accept(new WidgetGroupItemFilter(y, this::getItemFilter));
     }
 
     public void setItemFilter(ItemFilter itemFilter) {
         this.currentItemFilter = itemFilter;
-        if(currentItemFilter != null) {
+        if (currentItemFilter != null) {
             currentItemFilter.setDirtyNotifiable(dirtyNotifiable);
         }
         if (onFilterInstanceChange != null) {
diff --git a/src/main/java/gregtech/common/covers/filter/OreDictionaryItemFilter.java b/src/main/java/gregtech/common/covers/filter/OreDictionaryItemFilter.java
index 095fd82f713..20d7ab005e4 100644
--- a/src/main/java/gregtech/common/covers/filter/OreDictionaryItemFilter.java
+++ b/src/main/java/gregtech/common/covers/filter/OreDictionaryItemFilter.java
@@ -32,9 +32,9 @@ public void initUI(Consumer widgetGroup) {
         widgetGroup.accept(new LabelWidget(10, 0, "cover.ore_dictionary_filter.title1"));
         widgetGroup.accept(new LabelWidget(10, 10, "cover.ore_dictionary_filter.title2"));
         widgetGroup.accept(new TextFieldWidget(10, 25, 100, 12, true,
-            () -> oreDictionaryFilter, this::setOreDictionaryFilter)
-            .setMaxStringLength(64)
-            .setValidator(str -> ORE_DICTIONARY_FILTER.matcher(str).matches()));
+                () -> oreDictionaryFilter, this::setOreDictionaryFilter)
+                .setMaxStringLength(64)
+                .setValidator(str -> ORE_DICTIONARY_FILTER.matcher(str).matches()));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/covers/filter/SimpleFluidFilter.java b/src/main/java/gregtech/common/covers/filter/SimpleFluidFilter.java
index b5e8c185634..4a46681a08a 100644
--- a/src/main/java/gregtech/common/covers/filter/SimpleFluidFilter.java
+++ b/src/main/java/gregtech/common/covers/filter/SimpleFluidFilter.java
@@ -45,9 +45,9 @@ public void initUI(Consumer widgetGroup) {
         for (int i = 0; i < 9; ++i) {
             int index = i;
             widgetGroup.accept((new PhantomFluidWidget(10 + 18 * (i % 3), 18 * (i / 3), 18, 18,
-                () -> getFluidInSlot(index),
-                (newFluid) -> setFluidInSlot(index, newFluid)))
-                .setBackgroundTexture(GuiTextures.SLOT));
+                    () -> getFluidInSlot(index),
+                    (newFluid) -> setFluidInSlot(index, newFluid)))
+                    .setBackgroundTexture(GuiTextures.SLOT));
         }
     }
 
diff --git a/src/main/java/gregtech/common/covers/filter/SimpleItemFilter.java b/src/main/java/gregtech/common/covers/filter/SimpleItemFilter.java
index 6c6ed464c55..19034372d7f 100644
--- a/src/main/java/gregtech/common/covers/filter/SimpleItemFilter.java
+++ b/src/main/java/gregtech/common/covers/filter/SimpleItemFilter.java
@@ -4,8 +4,8 @@
 import gregtech.api.gui.Widget;
 import gregtech.api.gui.widgets.PhantomSlotWidget;
 import gregtech.api.gui.widgets.ToggleButtonWidget;
-import gregtech.api.util.LargeStackSizeItemStackHandler;
 import gregtech.api.util.ItemStackKey;
+import gregtech.api.util.LargeStackSizeItemStackHandler;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.items.IItemHandler;
@@ -92,9 +92,9 @@ public void initUI(Consumer widgetGroup) {
             widgetGroup.accept(new PhantomSlotWidget(itemFilterSlots, i, 10 + 18 * (i % 3), 0 + 18 * (i / 3)).setBackgroundTexture(GuiTextures.SLOT));
         }
         widgetGroup.accept(new ToggleButtonWidget(74, 0, 20, 20, GuiTextures.BUTTON_FILTER_DAMAGE,
-            () -> ignoreDamage, this::setIgnoreDamage).setTooltipText("cover.item_filter.ignore_damage"));
+                () -> ignoreDamage, this::setIgnoreDamage).setTooltipText("cover.item_filter.ignore_damage"));
         widgetGroup.accept(new ToggleButtonWidget(99, 0, 20, 20, GuiTextures.BUTTON_FILTER_NBT,
-            () -> ignoreNBT, this::setIgnoreNBT).setTooltipText("cover.item_filter.ignore_nbt"));
+                () -> ignoreNBT, this::setIgnoreNBT).setTooltipText("cover.item_filter.ignore_nbt"));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/covers/filter/SmartItemFilter.java b/src/main/java/gregtech/common/covers/filter/SmartItemFilter.java
index 604de174706..e09b72007c6 100644
--- a/src/main/java/gregtech/common/covers/filter/SmartItemFilter.java
+++ b/src/main/java/gregtech/common/covers/filter/SmartItemFilter.java
@@ -75,11 +75,11 @@ public Object matchItemStack(ItemStack itemStack) {
     @Override
     public void initUI(Consumer widgetGroup) {
         widgetGroup.accept(new CycleButtonWidget(10, 0, 75, 20,
-            SmartFilteringMode.class, this::getFilteringMode, this::setFilteringMode)
-            .setTooltipHoverString("cover.smart_item_filter.filtering_mode.description"));
+                SmartFilteringMode.class, this::getFilteringMode, this::setFilteringMode)
+                .setTooltipHoverString("cover.smart_item_filter.filtering_mode.description"));
         widgetGroup.accept(new CycleButtonWidget(10, 20, 75, 20,
-            SmartMatchingMode.class, this::getMatchingMode, this::setMatchingMode)
-            .setTooltipHoverString("cover.smart_item_filter.matching_mode.description"));
+                SmartMatchingMode.class, this::getMatchingMode, this::setMatchingMode)
+                .setTooltipHoverString("cover.smart_item_filter.matching_mode.description"));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/covers/filter/WidgetGroupFluidFilter.java b/src/main/java/gregtech/common/covers/filter/WidgetGroupFluidFilter.java
index 987e741e5a1..79ab997af1c 100644
--- a/src/main/java/gregtech/common/covers/filter/WidgetGroupFluidFilter.java
+++ b/src/main/java/gregtech/common/covers/filter/WidgetGroupFluidFilter.java
@@ -20,14 +20,14 @@ public WidgetGroupFluidFilter(int yPosition, Supplier itemFilterSup
     public void detectAndSendChanges() {
         super.detectAndSendChanges();
         FluidFilter newItemFilter = itemFilterSupplier.get();
-        if(itemFilter != newItemFilter) {
+        if (itemFilter != newItemFilter) {
             clearAllWidgets();
             this.itemFilter = newItemFilter;
-            if(itemFilter != null) {
+            if (itemFilter != null) {
                 this.itemFilter.initUI(this::addWidget);
             }
             writeUpdateInfo(2, buffer -> {
-                if(itemFilter != null) {
+                if (itemFilter != null) {
                     buffer.writeBoolean(true);
                     int filterId = FilterTypeRegistry.getIdForFluidFilter(itemFilter);
                     buffer.writeVarInt(filterId);
@@ -41,9 +41,9 @@ public void detectAndSendChanges() {
     @Override
     public void readUpdateInfo(int id, PacketBuffer buffer) {
         super.readUpdateInfo(id, buffer);
-        if(id == 2) {
+        if (id == 2) {
             clearAllWidgets();
-            if(buffer.readBoolean()) {
+            if (buffer.readBoolean()) {
                 int filterId = buffer.readVarInt();
                 this.itemFilter = FilterTypeRegistry.createFluidFilterById(filterId);
                 this.itemFilter.initUI(this::addWidget);
diff --git a/src/main/java/gregtech/common/covers/filter/WidgetGroupItemFilter.java b/src/main/java/gregtech/common/covers/filter/WidgetGroupItemFilter.java
index 9ede7acddf0..5ad2a3dede3 100644
--- a/src/main/java/gregtech/common/covers/filter/WidgetGroupItemFilter.java
+++ b/src/main/java/gregtech/common/covers/filter/WidgetGroupItemFilter.java
@@ -47,15 +47,15 @@ public void detectAndSendChanges() {
     @Override
     public void readUpdateInfo(int id, PacketBuffer buffer) {
         super.readUpdateInfo(id, buffer);
-        if(id == 2) {
+        if (id == 2) {
             clearAllWidgets();
-            if(buffer.readBoolean()) {
+            if (buffer.readBoolean()) {
                 int filterId = buffer.readVarInt();
                 this.itemFilter = FilterTypeRegistry.createItemFilterById(filterId);
                 this.itemFilter.initUI(this::addWidget);
                 this.itemFilter.setMaxStackSize(maxStackSize);
             }
-        } else if(id == 3) {
+        } else if (id == 3) {
             this.maxStackSize = buffer.readVarInt();
             if (itemFilter != null) {
                 itemFilter.setMaxStackSize(maxStackSize);
diff --git a/src/main/java/gregtech/common/crafting/FacadeRecipe.java b/src/main/java/gregtech/common/crafting/FacadeRecipe.java
index 02e5bac3ee2..af2dabce700 100644
--- a/src/main/java/gregtech/common/crafting/FacadeRecipe.java
+++ b/src/main/java/gregtech/common/crafting/FacadeRecipe.java
@@ -30,11 +30,12 @@ public FacadeRecipe(ResourceLocation group, Ingredient plateIngredient, int faca
     @Override
     public boolean matches(@Nonnull InventoryCrafting inv, @Nonnull World worldIn) {
         boolean[] matched = new boolean[ingredients.size()];
-        mainLoop: for (int i = 0; i < inv.getSizeInventory(); i++) {
+        mainLoop:
+        for (int i = 0; i < inv.getSizeInventory(); i++) {
             ItemStack itemStack = inv.getStackInSlot(i);
             if (itemStack.isEmpty()) continue;
             for (int j = 0; j < matched.length; j++) {
-                if(!ingredients.get(j).apply(itemStack)) continue;
+                if (!ingredients.get(j).apply(itemStack)) continue;
                 if (matched[j]) return false; //already matched
                 matched[j] = true;
                 continue mainLoop;
diff --git a/src/main/java/gregtech/common/gui/widget/CraftingSlotWidget.java b/src/main/java/gregtech/common/gui/widget/CraftingSlotWidget.java
index dcb3dbbe8e4..efc351da0ac 100644
--- a/src/main/java/gregtech/common/gui/widget/CraftingSlotWidget.java
+++ b/src/main/java/gregtech/common/gui/widget/CraftingSlotWidget.java
@@ -1,8 +1,8 @@
 package gregtech.common.gui.widget;
 
 import com.google.common.base.Preconditions;
-import gregtech.api.gui.ingredient.IRecipeTransferHandlerWidget;
 import gregtech.api.gui.impl.ModularUIContainer;
+import gregtech.api.gui.ingredient.IRecipeTransferHandlerWidget;
 import gregtech.api.gui.widgets.SlotWidget;
 import gregtech.common.metatileentities.storage.CraftingRecipeResolver;
 import mezz.jei.api.gui.IGuiIngredient;
diff --git a/src/main/java/gregtech/common/gui/widget/ItemListGridWidget.java b/src/main/java/gregtech/common/gui/widget/ItemListGridWidget.java
index 1e0eab9b362..c475b40a27b 100644
--- a/src/main/java/gregtech/common/gui/widget/ItemListGridWidget.java
+++ b/src/main/java/gregtech/common/gui/widget/ItemListGridWidget.java
@@ -226,18 +226,18 @@ public void handleClientAction(int id, PacketBuffer buffer) {
     @Nullable
     private INativeWidget findHoveredSlot(int mouseX, int mouseY) {
         return gui.guiWidgets.values().stream()
-            .flatMap(it -> it.getNativeWidgets().stream())
-            .filter(it -> it.getHandle().isEnabled())
-            .filter(it -> it.getHandle().canTakeStack(gui.entityPlayer))
-            .filter(it -> ((Widget) it).isMouseOverElement(mouseX, mouseY))
-            .findFirst().orElse(null);
+                .flatMap(it -> it.getNativeWidgets().stream())
+                .filter(it -> it.getHandle().isEnabled())
+                .filter(it -> it.getHandle().canTakeStack(gui.entityPlayer))
+                .filter(it -> ((Widget) it).isMouseOverElement(mouseX, mouseY))
+                .findFirst().orElse(null);
     }
 
     @Nullable
     private INativeWidget findSlotByNumber(int slotNumber) {
         return gui.guiWidgets.values().stream()
-            .flatMap(it -> it.getNativeWidgets().stream())
-            .filter(it -> it.getHandle().slotNumber == slotNumber)
-            .findFirst().orElse(null);
+                .flatMap(it -> it.getNativeWidgets().stream())
+                .filter(it -> it.getHandle().slotNumber == slotNumber)
+                .findFirst().orElse(null);
     }
 }
diff --git a/src/main/java/gregtech/common/gui/widget/ItemListSlotWidget.java b/src/main/java/gregtech/common/gui/widget/ItemListSlotWidget.java
index 54e99540318..7e0c6ecfa2b 100644
--- a/src/main/java/gregtech/common/gui/widget/ItemListSlotWidget.java
+++ b/src/main/java/gregtech/common/gui/widget/ItemListSlotWidget.java
@@ -138,7 +138,7 @@ private void handleMouseClick(@Nullable IItemInfo itemInfo, int button, boolean
             }
         } else if (button == 0 || button == 1) {
             if (insertHeldItemStack(button, isClient) ||
-                !gui.entityPlayer.inventory.getItemStack().isEmpty()) {
+                    !gui.entityPlayer.inventory.getItemStack().isEmpty()) {
                 return;
             }
             if (itemInfo != null) {
@@ -150,23 +150,23 @@ private void handleMouseClick(@Nullable IItemInfo itemInfo, int button, boolean
     }
 
     private void handleSelfShiftClick(IItemInfo itemInfo) {
-         ItemStack itemStack = itemInfo.getItemStackKey().getItemStack();
-         itemStack.setCount(itemStack.getMaxStackSize());
-         int currentStackSize = itemStack.getCount();
-         uiAccess.attemptMergeStack(itemStack, true, true);
-         int amountToExtract = Math.min(currentStackSize - itemStack.getCount(), itemInfo.getTotalItemAmount());
-         if (amountToExtract > 0) {
-             int extracted = gridWidget.getItemList().extractItem(itemInfo.getItemStackKey(), amountToExtract, false);
-             ItemStack resultStack = itemInfo.getItemStackKey().getItemStack();
-             resultStack.setCount(extracted);
-             if (!resultStack.isEmpty()) {
-                 uiAccess.attemptMergeStack(resultStack, true, false);
-                 gui.entityPlayer.openContainer.detectAndSendChanges();
-                 if (!resultStack.isEmpty()) {
-                     gui.entityPlayer.dropItem(resultStack, false, false);
-                 }
-             }
-         }
+        ItemStack itemStack = itemInfo.getItemStackKey().getItemStack();
+        itemStack.setCount(itemStack.getMaxStackSize());
+        int currentStackSize = itemStack.getCount();
+        uiAccess.attemptMergeStack(itemStack, true, true);
+        int amountToExtract = Math.min(currentStackSize - itemStack.getCount(), itemInfo.getTotalItemAmount());
+        if (amountToExtract > 0) {
+            int extracted = gridWidget.getItemList().extractItem(itemInfo.getItemStackKey(), amountToExtract, false);
+            ItemStack resultStack = itemInfo.getItemStackKey().getItemStack();
+            resultStack.setCount(extracted);
+            if (!resultStack.isEmpty()) {
+                uiAccess.attemptMergeStack(resultStack, true, false);
+                gui.entityPlayer.openContainer.detectAndSendChanges();
+                if (!resultStack.isEmpty()) {
+                    gui.entityPlayer.dropItem(resultStack, false, false);
+                }
+            }
+        }
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/inventory/itemsource/ItemSourceList.java b/src/main/java/gregtech/common/inventory/itemsource/ItemSourceList.java
index 5903604c892..6e92981cb3f 100644
--- a/src/main/java/gregtech/common/inventory/itemsource/ItemSourceList.java
+++ b/src/main/java/gregtech/common/inventory/itemsource/ItemSourceList.java
@@ -111,7 +111,7 @@ public boolean addItemHandler(ItemSource handlerInfo) {
     }
 
     public void removeItemHandler(ItemSource handlerInfo) {
-        if(this.handlerInfoList.remove(handlerInfo)) {
+        if (this.handlerInfoList.remove(handlerInfo)) {
             handlerInfo.setStoredItemsChangeCallback(null);
             handlerInfo.setInvalidationCallback(null);
             for (ItemStackKey itemStackKey : itemInfoMap.keySet()) {
diff --git a/src/main/java/gregtech/common/inventory/itemsource/NetworkItemInfo.java b/src/main/java/gregtech/common/inventory/itemsource/NetworkItemInfo.java
index f554674e976..1cfd44c4536 100644
--- a/src/main/java/gregtech/common/inventory/itemsource/NetworkItemInfo.java
+++ b/src/main/java/gregtech/common/inventory/itemsource/NetworkItemInfo.java
@@ -58,7 +58,7 @@ boolean removeInventory(ItemSource inventory) {
     private boolean recomputeItemAmount() {
         int oldTotalItemAmount = totalItemAmount;
         this.totalItemAmount = inventories.values().stream()
-            .mapToInt(Integer::intValue).sum();
+                .mapToInt(Integer::intValue).sum();
         return totalItemAmount != oldTotalItemAmount;
     }
 }
diff --git a/src/main/java/gregtech/common/inventory/itemsource/sources/TileItemSource.java b/src/main/java/gregtech/common/inventory/itemsource/sources/TileItemSource.java
index 3226175c551..7ccbeabd655 100644
--- a/src/main/java/gregtech/common/inventory/itemsource/sources/TileItemSource.java
+++ b/src/main/java/gregtech/common/inventory/itemsource/sources/TileItemSource.java
@@ -69,7 +69,7 @@ public boolean equals(Object o) {
         if (!(o instanceof TileItemSource)) return false;
         TileItemSource that = (TileItemSource) o;
         return blockPos.equals(that.blockPos) &&
-            accessSide == that.accessSide;
+                accessSide == that.accessSide;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/items/EnchantmentTableTweaks.java b/src/main/java/gregtech/common/items/EnchantmentTableTweaks.java
index d77d5b3af26..ea2c7988853 100644
--- a/src/main/java/gregtech/common/items/EnchantmentTableTweaks.java
+++ b/src/main/java/gregtech/common/items/EnchantmentTableTweaks.java
@@ -2,8 +2,8 @@
 
 import gregtech.api.GTValues;
 import gregtech.api.unification.OreDictUnifier;
-import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.stack.UnificationEntry;
 import gregtech.api.util.GTLog;
@@ -76,8 +76,8 @@ private static boolean isValidForEnchantment(ItemStack itemStack) {
         }
         Material material = entry.material;
         return material == Materials.Lapis ||
-            material == Materials.Lazurite ||
-            material == Materials.Sodalite;
+                material == Materials.Lazurite ||
+                material == Materials.Sodalite;
     }
 
     private static class EnchantmentLapisSlot extends SlotDelegate {
diff --git a/src/main/java/gregtech/common/items/FieldProjectorEventHandler.java b/src/main/java/gregtech/common/items/FieldProjectorEventHandler.java
index 211e8142fe7..2fe9e1c7a11 100644
--- a/src/main/java/gregtech/common/items/FieldProjectorEventHandler.java
+++ b/src/main/java/gregtech/common/items/FieldProjectorEventHandler.java
@@ -36,24 +36,24 @@ public class FieldProjectorEventHandler {
     @SubscribeEvent
     public static void onProjectileImpact(ProjectileImpactEvent event) {
         Entity hitEntity = event.getRayTraceResult().entityHit;
-        if(hitEntity instanceof EntityLivingBase && canReflectProjectile((EntityLivingBase) hitEntity, true)) {
+        if (hitEntity instanceof EntityLivingBase && canReflectProjectile((EntityLivingBase) hitEntity, true)) {
             Pair projectileData = isHostileProjectile(event.getEntity(), hitEntity);
-            if(projectileData.getLeft()) {
+            if (projectileData.getLeft()) {
                 Entity shooterEntity = projectileData.getRight();
                 Vec3d resultHitPosition;
-                if(shooterEntity != null) {
+                if (shooterEntity != null) {
                     double posY = shooterEntity.posY + shooterEntity.height / 3.0;
                     resultHitPosition = new Vec3d(shooterEntity.posX, posY, shooterEntity.posZ);
                 } else {
                     Vec3d lookVector = hitEntity.getLookVec();
                     resultHitPosition = hitEntity.getPositionVector().add(lookVector.scale(5.0));
                 }
-                if(canReflectProjectile((EntityLivingBase) hitEntity, false)) {
+                if (canReflectProjectile((EntityLivingBase) hitEntity, false)) {
                     redirectProjectile(event.getEntity(), resultHitPosition);
-                    if(!hitEntity.world.isRemote) {
+                    if (!hitEntity.world.isRemote) {
                         Vec3d arrowPos = event.getEntity().getPositionVector();
                         ((WorldServer) hitEntity.world).spawnParticle(EnumParticleTypes.SPELL_WITCH, false,
-                            arrowPos.x, arrowPos.y, arrowPos.z, 4, 0.0, 0.0, 0.0, 0.1);
+                                arrowPos.x, arrowPos.y, arrowPos.z, 4, 0.0, 0.0, 0.0, 0.1);
                     }
                     event.setCanceled(true);
                 }
@@ -64,26 +64,26 @@ public static void onProjectileImpact(ProjectileImpactEvent event) {
     private static boolean canReflectProjectile(EntityLivingBase entity, boolean simulate) {
         if (entity instanceof EntityPlayer) {
             IInventory inventory = ((EntityPlayer) entity).inventory;
-            for(int i = 0; i < inventory.getSizeInventory(); i++) {
+            for (int i = 0; i < inventory.getSizeInventory(); i++) {
                 ItemStack itemStack = inventory.getStackInSlot(i);
-                if(tryDrainProjector(itemStack, simulate)) return true;
+                if (tryDrainProjector(itemStack, simulate)) return true;
             }
         } else {
-            for(EntityEquipmentSlot equipmentSlot : EntityEquipmentSlot.values()) {
+            for (EntityEquipmentSlot equipmentSlot : EntityEquipmentSlot.values()) {
                 ItemStack itemStack = entity.getItemStackFromSlot(equipmentSlot);
-                if(tryDrainProjector(itemStack, simulate)) return true;
+                if (tryDrainProjector(itemStack, simulate)) return true;
             }
         }
         return false;
     }
 
     private static boolean tryDrainProjector(ItemStack itemStack, boolean simulate) {
-        if(!MetaItems.ENERGY_FIELD_PROJECTOR.isItemEqual(itemStack)) {
+        if (!MetaItems.ENERGY_FIELD_PROJECTOR.isItemEqual(itemStack)) {
             return false;
         }
         IElectricItem electricItem = itemStack.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null);
         return electricItem != null && electricItem.discharge(EU_PER_PROJECTILE_DEFLECT,
-            electricItem.getTier(), true, false, simulate) >= EU_PER_PROJECTILE_DEFLECT;
+                electricItem.getTier(), true, false, simulate) >= EU_PER_PROJECTILE_DEFLECT;
     }
 
     private static Pair isHostileProjectile(Entity entity, Entity owner) {
diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java
index a3a5b9a8c41..972fa117247 100644
--- a/src/main/java/gregtech/common/items/MetaItem1.java
+++ b/src/main/java/gregtech/common/items/MetaItem1.java
@@ -44,12 +44,12 @@ public void registerSubItems() {
         CREDIT_NEUTRONIUM = addItem(7, "credit.neutronium");
 
         COIN_GOLD_ANCIENT = addItem(8, "coin.gold.ancient").
-            setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Gold, 907200L)));
+                setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Gold, 907200L)));
         COIN_DOGE = addItem(9, "coin.doge")
-            .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Brass, 907200L)));
+                .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Brass, 907200L)));
         COIN_CHOCOLATE = addItem(10, "coin.chocolate")
-            .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Gold, OrePrefix.foil.materialAmount)))
-            .addComponents(new FoodStats(1, 0.1F, false, true, OreDictUnifier.get(OrePrefix.foil, Materials.Gold), new RandomPotionEffect(MobEffects.SPEED, 200, 1, 10)));
+                .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Gold, OrePrefix.foil.materialAmount)))
+                .addComponents(new FoodStats(1, 0.1F, false, true, OreDictUnifier.get(OrePrefix.foil, Materials.Gold), new RandomPotionEffect(MobEffects.SPEED, 200, 1, 10)));
 
         // Solidifier Shapes: ID 11-30
         SHAPE_EMPTY = addItem(11, "shape.empty");
@@ -362,9 +362,9 @@ public void registerSubItems() {
         // Power Units: ID 446-459
         POWER_UNIT_LV = addItem(446, "power_unit.lv").addComponents(ElectricStats.createElectricItem(100000L, GTValues.LV)).setMaxStackSize(8);
         POWER_UNIT_MV = addItem(447, "power_unit.mv").addComponents(ElectricStats.createElectricItem(400000L, GTValues.MV)).setMaxStackSize(8);
-        POWER_UNIT_HV = addItem(448, "power_unit.hv") .addComponents(ElectricStats.createElectricItem(1600000L, GTValues.HV)).setMaxStackSize(8);
-        POWER_UNIT_EV = addItem(449, "power_unit.ev") .addComponents(ElectricStats.createElectricItem(6400000L, GTValues.EV)).setMaxStackSize(8);
-        POWER_UNIT_IV = addItem(450, "power_unit.iv") .addComponents(ElectricStats.createElectricItem(25600000L, GTValues.IV)).setMaxStackSize(8);
+        POWER_UNIT_HV = addItem(448, "power_unit.hv").addComponents(ElectricStats.createElectricItem(1600000L, GTValues.HV)).setMaxStackSize(8);
+        POWER_UNIT_EV = addItem(449, "power_unit.ev").addComponents(ElectricStats.createElectricItem(6400000L, GTValues.EV)).setMaxStackSize(8);
+        POWER_UNIT_IV = addItem(450, "power_unit.iv").addComponents(ElectricStats.createElectricItem(25600000L, GTValues.IV)).setMaxStackSize(8);
 
         // Usable Items: ID 460-490
         DYNAMITE = addItem(460, "dynamite").addComponents(new DynamiteBehaviour()).setMaxStackSize(16);
@@ -540,8 +540,8 @@ public void registerSubItems() {
         ENERGY_LAPOTRONIC_ORB2 = addItem(744, "energy.lapotronicorb2").addComponents(ElectricStats.createRechargeableBattery(1000000000, 6)).setUnificationData(OrePrefix.battery, MarkerMaterials.Tier.Ultimate).setModelAmount(8);
 
         if (ConfigHolder.U.GT5u.enableZPMandUVBats) {
-            ENERGY_LAPOTRONIC_MODULE = addItem(745, "energy.module").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(10000000000L, GTValues.ZPM) }).setModelAmount(8);
-            ENERGY_LAPOTRONIC_CLUSTER = addItem(746, "energy.cluster").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(100000000000L, GTValues.UV) }).setModelAmount(8);
+            ENERGY_LAPOTRONIC_MODULE = addItem(745, "energy.module").addComponents(new IItemComponent[]{ElectricStats.createRechargeableBattery(10000000000L, GTValues.ZPM)}).setModelAmount(8);
+            ENERGY_LAPOTRONIC_CLUSTER = addItem(746, "energy.cluster").addComponents(new IItemComponent[]{ElectricStats.createRechargeableBattery(100000000000L, GTValues.UV)}).setModelAmount(8);
         }
 
         ZERO_POINT_MODULE = addItem(747, "zpm").addComponents(ElectricStats.createBattery(2000000000000L, GTValues.ZPM, false)).setModelAmount(8);
diff --git a/src/main/java/gregtech/common/items/MetaTool.java b/src/main/java/gregtech/common/items/MetaTool.java
index b5815f0f18f..f32a8fbe5df 100644
--- a/src/main/java/gregtech/common/items/MetaTool.java
+++ b/src/main/java/gregtech/common/items/MetaTool.java
@@ -27,102 +27,102 @@ public MetaTool() {
     @Override
     public void registerSubItems() {
         SWORD = addItem(0, "tool.sword").setToolStats(new ToolSword())
-            .setFullRepairCost(2)
-            .addOreDict(ToolDictNames.craftingToolSword);
+                .setFullRepairCost(2)
+                .addOreDict(ToolDictNames.craftingToolSword);
 
         PICKAXE = addItem(1, "tool.pickaxe").setToolStats(new ToolPickaxe())
-            .setFullRepairCost(3)
-            .addOreDict(ToolDictNames.craftingToolPickaxe);
+                .setFullRepairCost(3)
+                .addOreDict(ToolDictNames.craftingToolPickaxe);
 
         SHOVEL = addItem(2, "tool.shovel").setToolStats(new ToolShovel())
-            .setFullRepairCost(1)
-            .addOreDict(ToolDictNames.craftingToolShovel);
+                .setFullRepairCost(1)
+                .addOreDict(ToolDictNames.craftingToolShovel);
 
         AXE = addItem(3, "tool.axe").setToolStats(new ToolAxe())
-            .setFullRepairCost(3)
-            .addOreDict(ToolDictNames.craftingToolAxe);
+                .setFullRepairCost(3)
+                .addOreDict(ToolDictNames.craftingToolAxe);
 
         HOE = addItem(4, "tool.hoe").setToolStats(new ToolHoe())
-            .setFullRepairCost(2)
-            .addOreDict(ToolDictNames.craftingToolHoe);
+                .setFullRepairCost(2)
+                .addOreDict(ToolDictNames.craftingToolHoe);
 
         SAW = addItem(5, "tool.saw").setToolStats(new ToolSaw())
-            .setFullRepairCost(2)
-            .addOreDict(ToolDictNames.craftingToolSaw);
+                .setFullRepairCost(2)
+                .addOreDict(ToolDictNames.craftingToolSaw);
 
         HARD_HAMMER = addItem(6, "tool.hard_hammer").setToolStats(new ToolHardHammer())
-            .setFullRepairCost(6)
-            .addOreDict(ToolDictNames.craftingToolHardHammer);
+                .setFullRepairCost(6)
+                .addOreDict(ToolDictNames.craftingToolHardHammer);
 
         SOFT_HAMMER = addItem(7, "tool.soft_hammer").setToolStats(new ToolSoftHammer())
-            .setFullRepairCost(6)
-            .addOreDict(ToolDictNames.craftingToolSoftHammer)
-            .addComponents(new SoftMalletItemStat());
+                .setFullRepairCost(6)
+                .addOreDict(ToolDictNames.craftingToolSoftHammer)
+                .addComponents(new SoftMalletItemStat());
 
         WRENCH = addItem(8, "tool.wrench").setToolStats(new ToolWrench())
-            .setFullRepairCost(6)
-            .addOreDict(ToolDictNames.craftingToolWrench)
-            .addComponents(new WrenchItemStat());
+                .setFullRepairCost(6)
+                .addOreDict(ToolDictNames.craftingToolWrench)
+                .addComponents(new WrenchItemStat());
 
         FILE = addItem(9, "tool.file").setToolStats(new ToolFile())
-            .setFullRepairCost(2)
-            .addOreDict(ToolDictNames.craftingToolFile);
+                .setFullRepairCost(2)
+                .addOreDict(ToolDictNames.craftingToolFile);
 
         CROWBAR = addItem(10, "tool.crowbar").setToolStats(new ToolCrowbar())
-            .setFullRepairCost(1.5)
-            .addOreDict(ToolDictNames.craftingToolCrowbar);
+                .setFullRepairCost(1.5)
+                .addOreDict(ToolDictNames.craftingToolCrowbar);
 
         SCREWDRIVER = addItem(11, "tool.screwdriver").setToolStats(new ToolScrewdriver())
-            .setFullRepairCost(1)
-            .addOreDict(ToolDictNames.craftingToolScrewdriver)
-            .addComponents(new ScrewdriverItemStat());
+                .setFullRepairCost(1)
+                .addOreDict(ToolDictNames.craftingToolScrewdriver)
+                .addComponents(new ScrewdriverItemStat());
 
         MORTAR = addItem(12, "tool.mortar").setToolStats(new ToolMortar())
-            .addOreDict(ToolDictNames.craftingToolMortar);
+                .addOreDict(ToolDictNames.craftingToolMortar);
 
         WIRE_CUTTER = addItem(13, "tool.wire_cutter").setToolStats(new ToolWireCutter())
-            .setFullRepairCost(4.125)
-            .addOreDict(ToolDictNames.craftingToolWireCutter)
-            .addComponents(new CutterItemStat());
+                .setFullRepairCost(4.125)
+                .addOreDict(ToolDictNames.craftingToolWireCutter)
+                .addComponents(new CutterItemStat());
 
         SCOOP = addItem(14, "tool.scoop").setToolStats(new ToolScoop())
-            .setFullRepairCost(3)
-            .addOreDict(ToolDictNames.craftingToolScoop);
+                .setFullRepairCost(3)
+                .addOreDict(ToolDictNames.craftingToolScoop);
 
         BRANCH_CUTTER = addItem(15, "tool.branch_cutter").setToolStats(new ToolBranchCutter())
-            .setFullRepairCost(5.125)
-            .addOreDict(ToolDictNames.craftingToolBranchCutter);
+                .setFullRepairCost(5.125)
+                .addOreDict(ToolDictNames.craftingToolBranchCutter);
 
         UNIVERSAL_SPADE = addItem(16, "tool.universal_spade").setToolStats(new ToolUniversalSpade())
-            .setFullRepairCost(5)
-            .addOreDict(ToolDictNames.craftingToolBlade, ToolDictNames.craftingToolShovel, ToolDictNames.craftingToolCrowbar, ToolDictNames.craftingToolSaw);
+                .setFullRepairCost(5)
+                .addOreDict(ToolDictNames.craftingToolBlade, ToolDictNames.craftingToolShovel, ToolDictNames.craftingToolCrowbar, ToolDictNames.craftingToolSaw);
 
         KNIFE = addItem(17, "tool.knife").setToolStats(new ToolKnife())
-            .setFullRepairCost(1.5)
-            .addOreDict(ToolDictNames.craftingToolBlade, ToolDictNames.craftingToolKnife);
+                .setFullRepairCost(1.5)
+                .addOreDict(ToolDictNames.craftingToolBlade, ToolDictNames.craftingToolKnife);
 
         BUTCHERY_KNIFE = addItem(18, "tool.butchery_knife").setToolStats(new ToolButcheryKnife())
-            .setFullRepairCost(4.5)
-            .addOreDict(ToolDictNames.craftingToolBlade);
+                .setFullRepairCost(4.5)
+                .addOreDict(ToolDictNames.craftingToolBlade);
 
         SENSE = addItem(19, "tool.sense").setToolStats(new ToolSense())
-            .setFullRepairCost(3)
-            .addOreDict(ToolDictNames.craftingToolBlade);
+                .setFullRepairCost(3)
+                .addOreDict(ToolDictNames.craftingToolBlade);
 
         DRILL_LV = addItem(23, "tool.drill.lv").setToolStats(new ToolDrills.ToolDrillLV())
-            .setFullRepairCost(4)
-            .addOreDict(ToolDictNames.craftingToolMiningDrill)
-            .addComponents(ElectricStats.createElectricItem(100000L, 1L));
+                .setFullRepairCost(4)
+                .addOreDict(ToolDictNames.craftingToolMiningDrill)
+                .addComponents(ElectricStats.createElectricItem(100000L, 1L));
 
         DRILL_MV = addItem(24, "tool.drill.mv").setToolStats(new ToolDrills.ToolDrillMV())
-            .setFullRepairCost(4)
-            .addOreDict(ToolDictNames.craftingToolMiningDrill)
-            .addComponents(ElectricStats.createElectricItem(400000L, 2L));
+                .setFullRepairCost(4)
+                .addOreDict(ToolDictNames.craftingToolMiningDrill)
+                .addComponents(ElectricStats.createElectricItem(400000L, 2L));
 
         DRILL_HV = addItem(25, "tool.drill.hv").setToolStats(new ToolDrills.ToolDrillHV())
-            .setFullRepairCost(4)
-            .addOreDict(ToolDictNames.craftingToolMiningDrill)
-            .addComponents(ElectricStats.createElectricItem(1600000L, 3L));
+                .setFullRepairCost(4)
+                .addOreDict(ToolDictNames.craftingToolMiningDrill)
+                .addComponents(ElectricStats.createElectricItem(1600000L, 3L));
 
         DRILL_EV = addItem(38, "tool.drill.ev").setToolStats(new ToolDrills.ToolDrillEV())
                 .setFullRepairCost(4)
@@ -138,87 +138,87 @@ public void registerSubItems() {
                 .setFullRepairCost(14);
 
         CHAINSAW_LV = addItem(26, "tool.chainsaw.lv").setToolStats(new ToolChainsawLV())
-            .setFullRepairCost(4)
-            .addOreDict(ToolDictNames.craftingToolSaw)
-            .addComponents(ElectricStats.createElectricItem(100000L, 1L));
+                .setFullRepairCost(4)
+                .addOreDict(ToolDictNames.craftingToolSaw)
+                .addComponents(ElectricStats.createElectricItem(100000L, 1L));
 
         CHAINSAW_MV = addItem(27, "tool.chainsaw.mv").setToolStats(new ToolChainsawMV())
-            .setFullRepairCost(4)
-            .addOreDict(ToolDictNames.craftingToolSaw)
-            .addComponents(ElectricStats.createElectricItem(400000L, 2L));
+                .setFullRepairCost(4)
+                .addOreDict(ToolDictNames.craftingToolSaw)
+                .addComponents(ElectricStats.createElectricItem(400000L, 2L));
 
         CHAINSAW_HV = addItem(28, "tool.chainsaw.hv").setToolStats(new ToolChainsawHV())
-            .setFullRepairCost(4)
-            .addOreDict(ToolDictNames.craftingToolSaw)
-            .addComponents(ElectricStats.createElectricItem(1600000L, 3L));
+                .setFullRepairCost(4)
+                .addOreDict(ToolDictNames.craftingToolSaw)
+                .addComponents(ElectricStats.createElectricItem(1600000L, 3L));
 
         WRENCH_LV = addItem(29, "tool.wrench.lv").setToolStats(new ToolWrenchLV())
-            .setFullRepairCost(4)
-            .addOreDict(ToolDictNames.craftingToolWrench)
-            .addComponents(new WrenchItemStat())
-            .addComponents(ElectricStats.createElectricItem(100000L, 1L));
+                .setFullRepairCost(4)
+                .addOreDict(ToolDictNames.craftingToolWrench)
+                .addComponents(new WrenchItemStat())
+                .addComponents(ElectricStats.createElectricItem(100000L, 1L));
 
         WRENCH_MV = addItem(30, "tool.wrench.mv").setToolStats(new ToolWrenchMV())
-            .setFullRepairCost(4)
-            .addOreDict(ToolDictNames.craftingToolWrench)
-            .addComponents(new WrenchItemStat())
-            .addComponents(ElectricStats.createElectricItem(400000L, 2L));
+                .setFullRepairCost(4)
+                .addOreDict(ToolDictNames.craftingToolWrench)
+                .addComponents(new WrenchItemStat())
+                .addComponents(ElectricStats.createElectricItem(400000L, 2L));
 
         WRENCH_HV = addItem(31, "tool.wrench.hv").setToolStats(new ToolWrenchHV())
-            .setFullRepairCost(4)
-            .addOreDict(ToolDictNames.craftingToolWrench)
-            .addComponents(new WrenchItemStat())
-            .addComponents(ElectricStats.createElectricItem(1600000L, 3L));
+                .setFullRepairCost(4)
+                .addOreDict(ToolDictNames.craftingToolWrench)
+                .addComponents(new WrenchItemStat())
+                .addComponents(ElectricStats.createElectricItem(1600000L, 3L));
 
         SCREWDRIVER_LV = addItem(34, "tool.screwdriver.lv").setToolStats(new ToolScrewdriverLV())
-            .setFullRepairCost(1)
-            .addOreDict(ToolDictNames.craftingToolScrewdriver)
-            .addComponents(new ScrewdriverItemStat())
-            .addComponents(ElectricStats.createElectricItem(100000L, 1L));
+                .setFullRepairCost(1)
+                .addOreDict(ToolDictNames.craftingToolScrewdriver)
+                .addComponents(new ScrewdriverItemStat())
+                .addComponents(ElectricStats.createElectricItem(100000L, 1L));
 
         BUZZSAW = addItem(33, "tool.buzzsaw").setToolStats(new ToolBuzzSaw())
-            .setFullRepairCost(4)
-            .addOreDict(ToolDictNames.craftingToolSaw)
-            .addComponents(ElectricStats.createElectricItem(100000L, 1L));
+                .setFullRepairCost(4)
+                .addOreDict(ToolDictNames.craftingToolSaw)
+                .addComponents(ElectricStats.createElectricItem(100000L, 1L));
 
         PLUNGER = addItem(37, "tool.plunger").setToolStats(new ToolPlunger())
-            .addOreDict(ToolDictNames.craftingToolPlunger);
+                .addOreDict(ToolDictNames.craftingToolPlunger);
     }
 
     public void registerRecipes() {
         Material[] mortarMaterials = new Material[]{Materials.Bronze, Materials.Iron,
-            Materials.Steel, Materials.DamascusSteel, Materials.WroughtIron, Materials.RedSteel,
-            Materials.BlackSteel, Materials.BlueSteel};
+                Materials.Steel, Materials.DamascusSteel, Materials.WroughtIron, Materials.RedSteel,
+                Materials.BlackSteel, Materials.BlueSteel};
 
         for (Material material : mortarMaterials) {
             ModHandler.addShapedRecipe("mortar_" + material.toString(),
-                MORTAR.getStackForm(material),
-                " I ", "SIS", "SSS",
-                'I', new UnificationEntry(OrePrefix.ingot, material),
-                'S', OrePrefix.stone);
+                    MORTAR.getStackForm(material),
+                    " I ", "SIS", "SSS",
+                    'I', new UnificationEntry(OrePrefix.ingot, material),
+                    'S', OrePrefix.stone);
         }
 
         Material[] softHammerMaterials = new Material[]{
-            Materials.Wood, Materials.Rubber, Materials.Polyethylene, Materials.Polytetrafluoroethylene, Materials.Polybenzimidazole
+                Materials.Wood, Materials.Rubber, Materials.Polyethylene, Materials.Polytetrafluoroethylene, Materials.Polybenzimidazole
         };
         for (int i = 0; i < softHammerMaterials.length; i++) {
             Material material = softHammerMaterials[i];
             ItemStack itemStack = MetaItems.SOFT_HAMMER.getStackForm();
             MetaItems.SOFT_HAMMER.setToolData(itemStack, material, 128 * (1 << i), 1, 4.0f, 1.0f);
             ModHandler.addShapedRecipe(String.format("soft_hammer_%s", material.toString()), itemStack,
-                "XX ", "XXS", "XX ",
-                'X', new UnificationEntry(OrePrefix.ingot, material),
-                'S', new UnificationEntry(OrePrefix.stick, Materials.Wood));
+                    "XX ", "XXS", "XX ",
+                    'X', new UnificationEntry(OrePrefix.ingot, material),
+                    'S', new UnificationEntry(OrePrefix.stick, Materials.Wood));
         }
 
         // for future use: in-game durability is 3 per use, maxDurability shown in game is multiplied by 8
         Function woodenToolDataApplier = item ->
-            item.setToolData(item.getStackForm(), Materials.Wood, 48, 1, 4.0f, 1.0f);
+                item.setToolData(item.getStackForm(), Materials.Wood, 48, 1, 4.0f, 1.0f);
 
         ModHandler.addShapedRecipe("soft_hammer_wooden", woodenToolDataApplier.apply(MetaItems.SOFT_HAMMER),
-            "XX ", "XXS", "XX ",
-            'X', new UnificationEntry(OrePrefix.plank, Materials.Wood),
-            'S', new UnificationEntry(OrePrefix.stick, Materials.Wood));
+                "XX ", "XXS", "XX ",
+                'X', new UnificationEntry(OrePrefix.plank, Materials.Wood),
+                'S', new UnificationEntry(OrePrefix.stick, Materials.Wood));
 
         registerFlintToolRecipes();
     }
@@ -232,39 +232,39 @@ private void registerFlintToolRecipes() {
             return itemStack;
         };
         ModHandler.addShapedRecipe("mortar_flint", toolDataApplier.apply(MORTAR),
-            " I ", "SIS", "SSS",
-            'I', new ItemStack(Items.FLINT, 1),
-            'S', OrePrefix.stone);
+                " I ", "SIS", "SSS",
+                'I', new ItemStack(Items.FLINT, 1),
+                'S', OrePrefix.stone);
 
         ModHandler.addShapedRecipe("sword_flint", toolDataApplier.apply(SWORD),
-            "F", "F", "S",
-            'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
-            'F', new ItemStack(Items.FLINT, 1));
+                "F", "F", "S",
+                'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
+                'F', new ItemStack(Items.FLINT, 1));
 
         ModHandler.addShapedRecipe("pickaxe_flint", toolDataApplier.apply(PICKAXE),
-            "FFF", " S ", " S ",
-            'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
-            'F', new ItemStack(Items.FLINT, 1));
+                "FFF", " S ", " S ",
+                'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
+                'F', new ItemStack(Items.FLINT, 1));
 
         ModHandler.addShapedRecipe("shovel_flint", toolDataApplier.apply(SHOVEL),
-            "F", "S", "S",
-            'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
-            'F', new ItemStack(Items.FLINT, 1));
+                "F", "S", "S",
+                'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
+                'F', new ItemStack(Items.FLINT, 1));
 
         ModHandler.addMirroredShapedRecipe("axe_flint", toolDataApplier.apply(AXE),
-            "FF", "FS", " S",
-            'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
-            'F', new ItemStack(Items.FLINT, 1));
+                "FF", "FS", " S",
+                'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
+                'F', new ItemStack(Items.FLINT, 1));
 
         ModHandler.addMirroredShapedRecipe("hoe_flint", toolDataApplier.apply(HOE),
-            "FF", " S", " S",
-            'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
-            'F', new ItemStack(Items.FLINT, 1));
+                "FF", " S", " S",
+                'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
+                'F', new ItemStack(Items.FLINT, 1));
 
         ModHandler.addShapedRecipe("knife_flint", toolDataApplier.apply(KNIFE),
-            "F", "S",
-            'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
-            'F', new ItemStack(Items.FLINT, 1));
+                "F", "S",
+                'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
+                'F', new ItemStack(Items.FLINT, 1));
     }
 
 }
diff --git a/src/main/java/gregtech/common/items/behaviors/AbstractMaterialPartBehavior.java b/src/main/java/gregtech/common/items/behaviors/AbstractMaterialPartBehavior.java
index ba6965db43b..6195604b786 100644
--- a/src/main/java/gregtech/common/items/behaviors/AbstractMaterialPartBehavior.java
+++ b/src/main/java/gregtech/common/items/behaviors/AbstractMaterialPartBehavior.java
@@ -4,9 +4,9 @@
 import gregtech.api.items.metaitem.stats.IItemColorProvider;
 import gregtech.api.items.metaitem.stats.IItemDurabilityManager;
 import gregtech.api.items.metaitem.stats.IItemNameProvider;
+import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.MaterialRegistry;
 import gregtech.api.unification.material.Materials;
-import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.properties.PropertyKey;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/gregtech/common/items/behaviors/ColorSprayBehaviour.java b/src/main/java/gregtech/common/items/behaviors/ColorSprayBehaviour.java
index 7ef6f3f31fc..5dcc4af19bf 100644
--- a/src/main/java/gregtech/common/items/behaviors/ColorSprayBehaviour.java
+++ b/src/main/java/gregtech/common/items/behaviors/ColorSprayBehaviour.java
@@ -50,13 +50,13 @@ private boolean tryPaintBlock(World world, BlockPos pos, EnumFacing side) {
     private boolean tryPaintSpecialBlock(World world, BlockPos pos, Block block) {
         if (block == Blocks.GLASS) {
             IBlockState newBlockState = Blocks.STAINED_GLASS.getDefaultState()
-                .withProperty(BlockStainedGlass.COLOR, this.color);
+                    .withProperty(BlockStainedGlass.COLOR, this.color);
             world.setBlockState(pos, newBlockState);
             return true;
         }
         if (block == Blocks.GLASS_PANE) {
             IBlockState newBlockState = Blocks.STAINED_GLASS_PANE.getDefaultState()
-                .withProperty(BlockStainedGlassPane.COLOR, this.color);
+                    .withProperty(BlockStainedGlassPane.COLOR, this.color);
             world.setBlockState(pos, newBlockState);
             return true;
         }
diff --git a/src/main/java/gregtech/common/items/behaviors/CrowbarBehaviour.java b/src/main/java/gregtech/common/items/behaviors/CrowbarBehaviour.java
index bf7f81a265f..654caf99944 100644
--- a/src/main/java/gregtech/common/items/behaviors/CrowbarBehaviour.java
+++ b/src/main/java/gregtech/common/items/behaviors/CrowbarBehaviour.java
@@ -84,7 +84,7 @@ private boolean tryRotateRailBlock(IBlockState blockState, World world, BlockPos
             rotation = 0;
         }
         return world.setBlockState(blockPos, blockState.withProperty(blockRailBase.getShapeProperty(),
-            BlockRailBase.EnumRailDirection.values()[rotation]));
+                BlockRailBase.EnumRailDirection.values()[rotation]));
     }
 
 
diff --git a/src/main/java/gregtech/common/items/behaviors/FoamSprayerBehavior.java b/src/main/java/gregtech/common/items/behaviors/FoamSprayerBehavior.java
index f493c3e3805..075bb11f535 100644
--- a/src/main/java/gregtech/common/items/behaviors/FoamSprayerBehavior.java
+++ b/src/main/java/gregtech/common/items/behaviors/FoamSprayerBehavior.java
@@ -143,7 +143,7 @@ private static List gatherReplacableBlocks(World worldIn, BlockPos cen
                 IBlockState blockStateHere = worldIn.getBlockState(currentPos);
                 //if there is node, and it can connect with previous node, add it to list, and set previous node as current
                 if (blockStateHere.getBlock().isReplaceable(worldIn, currentPos) &&
-                    currentPos.distanceSq(centerPos) <= maxRadiusSq && !observedSet.contains(currentPos)) {
+                        currentPos.distanceSq(centerPos) <= maxRadiusSq && !observedSet.contains(currentPos)) {
                     BlockPos immutablePos = currentPos.toImmutable();
                     observedSet.add(immutablePos);
                     resultAirBlocks.add(immutablePos);
@@ -174,8 +174,8 @@ private static List gatherFrameBlocks(World worldIn, BlockPos centerPo
                 IBlockState blockStateHere = worldIn.getBlockState(currentPos);
                 //if there is node, and it can connect with previous node, add it to list, and set previous node as current
                 if (blockStateHere.getBlock() instanceof BlockFrame &&
-                    currentPos.distanceSq(centerPos) <= maxRadiusSq &&
-                    (frameState == null || frameState == blockStateHere) && !observedSet.contains(currentPos)) {
+                        currentPos.distanceSq(centerPos) <= maxRadiusSq &&
+                        (frameState == null || frameState == blockStateHere) && !observedSet.contains(currentPos)) {
                     BlockPos immutablePos = currentPos.toImmutable();
                     observedSet.add(immutablePos);
                     resultFrameBlocks.add(immutablePos);
diff --git a/src/main/java/gregtech/common/items/behaviors/HoeBehaviour.java b/src/main/java/gregtech/common/items/behaviors/HoeBehaviour.java
index e6044b6a162..d575b1d0405 100644
--- a/src/main/java/gregtech/common/items/behaviors/HoeBehaviour.java
+++ b/src/main/java/gregtech/common/items/behaviors/HoeBehaviour.java
@@ -39,12 +39,12 @@ public ActionResult onItemUse(EntityPlayer player, World world, Block
                         }
                         world.playSound(null, blockPos, SoundEvents.ITEM_HOE_TILL, SoundCategory.PLAYERS, 1.0F, 1.0F);
                         world.setBlockState(blockPos, Blocks.DIRT.getDefaultState()
-                            .withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.COARSE_DIRT));
+                                .withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.COARSE_DIRT));
                         return ActionResult.newResult(EnumActionResult.SUCCESS, stack);
                     }
                 } else if (blockState.getBlock() == Blocks.GRASS
-                    || blockState.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT
-                    || blockState.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.COARSE_DIRT) {
+                        || blockState.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT
+                        || blockState.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.COARSE_DIRT) {
                     if (GTUtility.doDamageItem(stack, this.cost, false)) {
                         world.playSound(null, blockPos, SoundEvents.ITEM_HOE_TILL, SoundCategory.PLAYERS, 1.0F, 1.0F);
                         world.setBlockState(blockPos, Blocks.FARMLAND.getDefaultState());
diff --git a/src/main/java/gregtech/common/items/behaviors/IntCircuitBehaviour.java b/src/main/java/gregtech/common/items/behaviors/IntCircuitBehaviour.java
index cbf9e01820c..d84cb645388 100644
--- a/src/main/java/gregtech/common/items/behaviors/IntCircuitBehaviour.java
+++ b/src/main/java/gregtech/common/items/behaviors/IntCircuitBehaviour.java
@@ -43,13 +43,13 @@ public ActionResult onItemRightClick(World world, EntityPlayer player
     @Override
     public ModularUI createUI(PlayerInventoryHolder holder, EntityPlayer entityPlayer) {
         return ModularUI.builder(GuiTextures.BACKGROUND, 176, 60)
-            .label(9, 8, "metaitem.circuit.integrated.gui")
-            .widget(new DynamicLabelWidget(82, 30, () -> Integer.toString(IntCircuitIngredient.getCircuitConfiguration(holder.getCurrentItem())), 0x4D4040))
-            .widget(new ClickButtonWidget(15, 24, 20, 20, "-5", data -> adjustConfiguration(holder, -5)))
-            .widget(new ClickButtonWidget(50, 24, 20, 20, "-1", data -> adjustConfiguration(holder, -1)))
-            .widget(new ClickButtonWidget(104, 24, 20, 20, "+1", data -> adjustConfiguration(holder, +1)))
-            .widget(new ClickButtonWidget(141, 24, 20, 20, "+5", data -> adjustConfiguration(holder, +5)))
-            .build(holder, entityPlayer);
+                .label(9, 8, "metaitem.circuit.integrated.gui")
+                .widget(new DynamicLabelWidget(82, 30, () -> Integer.toString(IntCircuitIngredient.getCircuitConfiguration(holder.getCurrentItem())), 0x4D4040))
+                .widget(new ClickButtonWidget(15, 24, 20, 20, "-5", data -> adjustConfiguration(holder, -5)))
+                .widget(new ClickButtonWidget(50, 24, 20, 20, "-1", data -> adjustConfiguration(holder, -1)))
+                .widget(new ClickButtonWidget(104, 24, 20, 20, "+1", data -> adjustConfiguration(holder, +1)))
+                .widget(new ClickButtonWidget(141, 24, 20, 20, "+5", data -> adjustConfiguration(holder, +5)))
+                .build(holder, entityPlayer);
     }
 
     private static void adjustConfiguration(PlayerInventoryHolder holder, int amount) {
diff --git a/src/main/java/gregtech/common/items/behaviors/ModeSwitchBehavior.java b/src/main/java/gregtech/common/items/behaviors/ModeSwitchBehavior.java
index fdf439f2a9e..36bf134f5e0 100644
--- a/src/main/java/gregtech/common/items/behaviors/ModeSwitchBehavior.java
+++ b/src/main/java/gregtech/common/items/behaviors/ModeSwitchBehavior.java
@@ -27,7 +27,7 @@ public ModeSwitchBehavior(Class enumClass) {
     }
 
     public T getModeFromItemStack(ItemStack itemStack) {
-        if(!itemStack.hasTagCompound()) {
+        if (!itemStack.hasTagCompound()) {
             return enumConstants[0];
         }
         NBTTagCompound tagCompound = itemStack.getTagCompound();
@@ -45,7 +45,7 @@ public void setModeForItemStack(ItemStack itemStack, T newMode) {
     @Override
     public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
         ItemStack itemStack = player.getHeldItem(hand);
-        if(player.isSneaking()) {
+        if (player.isSneaking()) {
             T currentMode = getModeFromItemStack(itemStack);
             int currentModeIndex = ArrayUtils.indexOf(enumConstants, currentMode);
             T nextMode = enumConstants[(currentModeIndex + 1) % enumConstants.length];
diff --git a/src/main/java/gregtech/common/items/behaviors/NanoSaberBehavior.java b/src/main/java/gregtech/common/items/behaviors/NanoSaberBehavior.java
index cae471f3267..3a63f5022ab 100644
--- a/src/main/java/gregtech/common/items/behaviors/NanoSaberBehavior.java
+++ b/src/main/java/gregtech/common/items/behaviors/NanoSaberBehavior.java
@@ -42,7 +42,7 @@ public void onAddedToItem(MetaValueItem metaValueItem) {
     @Override
     public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) {
         HashMultimap modifiers = HashMultimap.create();
-        if(slot == EntityEquipmentSlot.MAINHAND) {
+        if (slot == EntityEquipmentSlot.MAINHAND) {
             double attackDamage = baseAttackDamage + (isItemActive(stack) ? additionalAttackDamage : 0.0D);
             modifiers.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.0, 0));
             modifiers.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon Modifier", attackDamage, 0));
@@ -63,7 +63,7 @@ public int getItemEnchantability(ItemStack stack) {
     @Override
     public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {
         return enchantment != Enchantments.UNBREAKING &&
-            enchantment != Enchantments.MENDING &&
-            enchantment.type.canEnchantItem(Items.IRON_SWORD);
+                enchantment != Enchantments.MENDING &&
+                enchantment.type.canEnchantItem(Items.IRON_SWORD);
     }
 }
diff --git a/src/main/java/gregtech/common/items/behaviors/PlungerBehaviour.java b/src/main/java/gregtech/common/items/behaviors/PlungerBehaviour.java
index ae360a63906..2d97ab9a2ba 100755
--- a/src/main/java/gregtech/common/items/behaviors/PlungerBehaviour.java
+++ b/src/main/java/gregtech/common/items/behaviors/PlungerBehaviour.java
@@ -45,8 +45,8 @@ public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPo
         ItemStack toolStack = player.getHeldItem(hand);
         boolean isShiftClick = player.isSneaking();
         IFluidHandler handlerToRemoveFrom = isShiftClick ?
-            (fluidHandler instanceof FluidHandlerProxy ? ((FluidHandlerProxy) fluidHandler).input : null) :
-            (fluidHandler instanceof FluidHandlerProxy ? ((FluidHandlerProxy) fluidHandler).output : fluidHandler);
+                (fluidHandler instanceof FluidHandlerProxy ? ((FluidHandlerProxy) fluidHandler).input : null) :
+                (fluidHandler instanceof FluidHandlerProxy ? ((FluidHandlerProxy) fluidHandler).output : fluidHandler);
 
         if (handlerToRemoveFrom != null && GTUtility.doDamageItem(toolStack, cost, false)) {
             if (!world.isRemote) {
diff --git a/src/main/java/gregtech/common/items/behaviors/ScoopBehaviour.java b/src/main/java/gregtech/common/items/behaviors/ScoopBehaviour.java
index 095806613da..43aaf1a3cb7 100644
--- a/src/main/java/gregtech/common/items/behaviors/ScoopBehaviour.java
+++ b/src/main/java/gregtech/common/items/behaviors/ScoopBehaviour.java
@@ -39,7 +39,7 @@ private boolean processButterflyCatch(ItemStack itemStack, EntityPlayer player,
                 IAlleleButterflySpecies species = butterfly.getButterfly().getGenome().getPrimary();
                 species.getRoot().getBreedingTracker(entity.world, player.getGameProfile()).registerCatch(butterfly.getButterfly());
                 player.world.spawnEntity(new EntityItem(player.world, entity.posX, entity.posY, entity.posZ,
-                    species.getRoot().getMemberStack(butterfly.getButterfly().copy(), EnumFlutterType.BUTTERFLY)));
+                        species.getRoot().getMemberStack(butterfly.getButterfly().copy(), EnumFlutterType.BUTTERFLY)));
                 entity.setDead();
             }
             return true;
diff --git a/src/main/java/gregtech/common/items/behaviors/ToggleEnergyConsumerBehavior.java b/src/main/java/gregtech/common/items/behaviors/ToggleEnergyConsumerBehavior.java
index 692d1a437de..6f5b53f496a 100644
--- a/src/main/java/gregtech/common/items/behaviors/ToggleEnergyConsumerBehavior.java
+++ b/src/main/java/gregtech/common/items/behaviors/ToggleEnergyConsumerBehavior.java
@@ -26,12 +26,12 @@ public ToggleEnergyConsumerBehavior(int energyUsagePerTick) {
     @Override
     public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
         ItemStack itemStack = player.getHeldItem(hand);
-        if(player.isSneaking()) {
+        if (player.isSneaking()) {
             IElectricItem electricItem = itemStack.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null);
             boolean isItemActive = isItemActive(itemStack);
-            if(isItemActive) {
+            if (isItemActive) {
                 setItemActive(itemStack, false);
-            } else if(electricItem != null && drainActivationEnergy(electricItem, true)) {
+            } else if (electricItem != null && drainActivationEnergy(electricItem, true)) {
                 setItemActive(itemStack, true);
             }
         }
@@ -45,9 +45,9 @@ private boolean drainActivationEnergy(IElectricItem electricItem, boolean simula
     @Override
     public void onUpdate(ItemStack itemStack, Entity entity) {
         IElectricItem electricItem = itemStack.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null);
-        if(isItemActive(itemStack) && electricItem != null) {
+        if (isItemActive(itemStack) && electricItem != null) {
             boolean shouldRemainActive = drainActivationEnergy(electricItem, false);
-            if(!shouldRemainActive) {
+            if (!shouldRemainActive) {
                 setItemActive(itemStack, false);
             }
         }
@@ -65,7 +65,7 @@ public boolean isItemActive(ItemStack itemStack) {
 
     public static void setItemActive(ItemStack itemStack, boolean isActive) {
         NBTTagCompound tagCompound = itemStack.getTagCompound();
-        if(tagCompound == null) {
+        if (tagCompound == null) {
             tagCompound = new NBTTagCompound();
             itemStack.setTagCompound(tagCompound);
         }
diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java
index f8e3724373f..9baaa725d7a 100644
--- a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java
+++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java
@@ -554,7 +554,7 @@ public static void init() {
         WOODEN_TANK = GregTechAPI.registerMetaTileEntity(1500, new MetaTileEntityTank(gregtechId("wooden_tank"), Materials.Wood, 4000, 1, 3));
         BRONZE_TANK = GregTechAPI.registerMetaTileEntity(1501, new MetaTileEntityTank(gregtechId("bronze_tank"), Materials.Bronze, 8000, 4, 3));
         STEEL_TANK = GregTechAPI.registerMetaTileEntity(1502, new MetaTileEntityTank(gregtechId("steel_tank"), Materials.Steel, 16000, 7, 5));
-        ALUMINIUM_TANK = GregTechAPI.registerMetaTileEntity(1503, new MetaTileEntityTank(gregtechId("aluminium_tank"), Materials.Aluminium , 32000, 8, 5));
+        ALUMINIUM_TANK = GregTechAPI.registerMetaTileEntity(1503, new MetaTileEntityTank(gregtechId("aluminium_tank"), Materials.Aluminium, 32000, 8, 5));
         STAINLESS_STEEL_TANK = GregTechAPI.registerMetaTileEntity(1504, new MetaTileEntityTank(gregtechId("stainless_steel_tank"), Materials.StainlessSteel, 64000, 9, 7));
         TITANIUM_TANK = GregTechAPI.registerMetaTileEntity(1505, new MetaTileEntityTank(gregtechId("titanium_tank"), Materials.Titanium, 128000, 12, 9));
         TUNGSTENSTEEL_TANK = GregTechAPI.registerMetaTileEntity(1506, new MetaTileEntityTank(gregtechId("tungstensteel_tank"), Materials.TungstenSteel, 512000, 16, 9));
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBatteryBuffer.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBatteryBuffer.java
index a737d73e31d..da2d82591c3 100644
--- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBatteryBuffer.java
+++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBatteryBuffer.java
@@ -128,14 +128,14 @@ protected void initializeInventory() {
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         int rowSize = (int) Math.sqrt(inventorySize);
         Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176,
-            18 + 18 * rowSize + 94)
-            .label(10, 5, getMetaFullName());
+                18 + 18 * rowSize + 94)
+                .label(10, 5, getMetaFullName());
 
         for (int y = 0; y < rowSize; y++) {
             for (int x = 0; x < rowSize; x++) {
                 int index = y * rowSize + x;
                 builder.widget(new SlotWidget(importItems, index, 89 - rowSize * 9 + x * 18, 18 + y * 18, true, true)
-                    .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.BATTERY_OVERLAY));
+                        .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.BATTERY_OVERLAY));
             }
         }
         builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 7, 18 + 18 * rowSize + 12);
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java
index 2b50a887f28..ce2804a0161 100644
--- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java
+++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java
@@ -66,20 +66,20 @@ public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation,
     @Override
     public void update() {
         super.update();
-        if(!getWorld().isRemote && getOffsetTimer() % 5 == 0) {
+        if (!getWorld().isRemote && getOffsetTimer() % 5 == 0) {
             pushItemsIntoNearbyHandlers(getOutputFacing());
         }
-        if(!getWorld().isRemote) {
-            if(breakProgressTicksLeft > 0) {
+        if (!getWorld().isRemote) {
+            if (breakProgressTicksLeft > 0) {
                 --this.breakProgressTicksLeft;
-                if(breakProgressTicksLeft == 0 && energyContainer.getEnergyStored() >= getEnergyPerBlockBreak()) {
+                if (breakProgressTicksLeft == 0 && energyContainer.getEnergyStored() >= getEnergyPerBlockBreak()) {
                     BlockPos blockPos = getPos().offset(getFrontFacing());
                     IBlockState blockState = getWorld().getBlockState(blockPos);
                     EntityPlayer entityPlayer = GregFakePlayer.get((WorldServer) getWorld());
                     float hardness = blockState.getBlockHardness(getWorld(), blockPos);
 
-                    if(hardness >= 0.0f && getWorld().isBlockModifiable(entityPlayer, blockPos) &&
-                        Math.abs(hardness - currentBlockHardness) < 0.5f) {
+                    if (hardness >= 0.0f && getWorld().isBlockModifiable(entityPlayer, blockPos) &&
+                            Math.abs(hardness - currentBlockHardness) < 0.5f) {
                         List drops = attemptBreakBlockAndObtainDrops(blockPos, blockState, entityPlayer);
                         addToInventoryOrDropItems(drops);
                     }
@@ -89,14 +89,14 @@ public void update() {
                 }
             }
 
-            if(breakProgressTicksLeft == 0 && isBlockRedstonePowered()) {
+            if (breakProgressTicksLeft == 0 && isBlockRedstonePowered()) {
                 BlockPos blockPos = getPos().offset(getFrontFacing());
                 IBlockState blockState = getWorld().getBlockState(blockPos);
                 EntityPlayer entityPlayer = GregFakePlayer.get((WorldServer) getWorld());
                 float hardness = blockState.getBlockHardness(getWorld(), blockPos);
                 boolean skipBlock = blockState.getMaterial() == Material.AIR ||
-                    blockState.getBlock().isAir(blockState, getWorld(), getPos());
-                if(hardness >= 0.0f && !skipBlock && getWorld().isBlockModifiable(entityPlayer, blockPos)) {
+                        blockState.getBlock().isAir(blockState, getWorld(), getPos());
+                if (hardness >= 0.0f && !skipBlock && getWorld().isBlockModifiable(entityPlayer, blockPos)) {
                     this.breakProgressTicksLeft = getTicksPerBlockBreak(hardness);
                     this.currentBlockHardness = hardness;
                 }
@@ -109,9 +109,9 @@ private void addToInventoryOrDropItems(List drops) {
         double itemSpawnX = getPos().getX() + 0.5 + outputFacing.getXOffset();
         double itemSpawnY = getPos().getX() + 0.5 + outputFacing.getYOffset();
         double itemSpawnZ = getPos().getX() + 0.5 + outputFacing.getZOffset();
-        for(ItemStack itemStack : drops) {
+        for (ItemStack itemStack : drops) {
             ItemStack remainStack = ItemHandlerHelper.insertItemStacked(exportItems, itemStack, false);
-            if(!remainStack.isEmpty()) {
+            if (!remainStack.isEmpty()) {
                 EntityItem entityitem = new EntityItem(getWorld(), itemSpawnX, itemSpawnY, itemSpawnZ, remainStack);
                 entityitem.setDefaultPickupDelay();
                 getWorld().spawnEntity(entityitem);
@@ -122,7 +122,7 @@ private void addToInventoryOrDropItems(List drops) {
     private List attemptBreakBlockAndObtainDrops(BlockPos blockPos, IBlockState blockState, EntityPlayer entityPlayer) {
         TileEntity tileEntity = getWorld().getTileEntity(blockPos);
         boolean result = blockState.getBlock().removedByPlayer(blockState, getWorld(), blockPos, entityPlayer, true);
-        if(result) {
+        if (result) {
             getWorld().playEvent(null, 2001, blockPos, Block.getStateId(blockState));
             blockState.getBlock().onPlayerDestroy(getWorld(), blockPos, blockState);
 
@@ -138,7 +138,7 @@ public boolean onWrenchClick(EntityPlayer playerIn, EnumHand hand, EnumFacing fa
         if (!playerIn.isSneaking()) {
             EnumFacing currentOutputSide = getOutputFacing();
             if (currentOutputSide == facing ||
-                getFrontFacing() == facing) return false;
+                    getFrontFacing() == facing) return false;
             setOutputFacing(facing);
             return true;
         }
@@ -241,13 +241,13 @@ protected IItemHandlerModifiable createExportItemHandler() {
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         int rowSize = (int) Math.sqrt(getInventorySize());
         Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176, 18 + 18 * rowSize + 94)
-            .label(10, 5, getMetaFullName());
+                .label(10, 5, getMetaFullName());
 
         for (int y = 0; y < rowSize; y++) {
             for (int x = 0; x < rowSize; x++) {
                 int index = y * rowSize + x;
                 builder.widget(new SlotWidget(exportItems, index, 89 - rowSize * 9 + x * 18, 18 + y * 18, true, false)
-                    .setBackgroundTexture(GuiTextures.SLOT));
+                        .setBackgroundTexture(GuiTextures.SLOT));
             }
         }
         builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 7, 18 + 18 * rowSize + 12);
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityCharger.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityCharger.java
index e8fa9c69970..9b4e1833ce4 100644
--- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityCharger.java
+++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityCharger.java
@@ -47,7 +47,7 @@ public void update() {
                 if (electricItem != null) {
                     long inputVoltage = Math.min(energyContainer.getInputVoltage(), energyContainer.getEnergyStored());
                     long energyUsed = electricItem.charge(inputVoltage, getTier(), false, false);
-                    if(energyUsed > 0L) {
+                    if (energyUsed > 0L) {
                         energyContainer.removeEnergy(energyUsed);
                         importItems.setStackInSlot(i, batteryStack);
                     }
@@ -63,7 +63,7 @@ protected IItemHandlerModifiable createImportItemHandler() {
             @Override
             public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) {
                 IElectricItem electricItem = stack.getCapability(GregtechCapabilities.CAPABILITY_ELECTRIC_ITEM, null);
-                if(electricItem != null && getTier() >= electricItem.getTier()) {
+                if (electricItem != null && getTier() >= electricItem.getTier()) {
                     return super.insertItem(slot, stack, simulate);
                 }
                 return stack;
@@ -91,14 +91,14 @@ protected void initializeInventory() {
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         int rowSize = (int) Math.sqrt(inventorySize);
         Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176,
-            18 + 18 * rowSize + 94)
-            .label(10, 5, getMetaFullName());
+                18 + 18 * rowSize + 94)
+                .label(10, 5, getMetaFullName());
 
         for (int y = 0; y < rowSize; y++) {
             for (int x = 0; x < rowSize; x++) {
                 int index = y * rowSize + x;
                 builder.widget(new SlotWidget(importItems, index, 89 - rowSize * 9 + x * 18, 18 + y * 18, true, true)
-                    .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.CHARGER_OVERLAY));
+                        .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.CHARGER_OVERLAY));
             }
         }
         builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 7, 18 + 18 * rowSize + 12);
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java
index ddf40058892..ecfbd78f41f 100644
--- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java
+++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java
@@ -36,12 +36,12 @@
 public class MetaTileEntityFisher extends TieredMetaTileEntity {
 
     private static final int WATER_CHECK_SIZE = 25;
-    
+
     private final int inventorySize;
     private final long fishingTicks;
     private final long energyAmountPerFish;
 
-    public MetaTileEntityFisher(ResourceLocation metaTileEntityId, int tier){
+    public MetaTileEntityFisher(ResourceLocation metaTileEntityId, int tier) {
         super(metaTileEntityId, tier);
         this.inventorySize = (tier + 1) * (tier + 1);
         this.fishingTicks = 1000 - tier * 200;
@@ -59,16 +59,16 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
         int rowSize = (int) Math.sqrt(inventorySize);
 
         ModularUI.Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176,
-            18 + 18 * rowSize + 94)
-            .label(10, 5, getMetaFullName())
-            .widget(new SlotWidget(importItems, 0, 18, 18, true, true)
-                .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.STRING_SLOT_OVERLAY));
+                18 + 18 * rowSize + 94)
+                .label(10, 5, getMetaFullName())
+                .widget(new SlotWidget(importItems, 0, 18, 18, true, true)
+                        .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.STRING_SLOT_OVERLAY));
 
         for (int y = 0; y < rowSize; y++) {
             for (int x = 0; x < rowSize; x++) {
                 int index = y * rowSize + x;
                 builder.widget(new SlotWidget(exportItems, index, 89 - rowSize * 9 + x * 18, 18 + y * 18, true, false)
-                    .setBackgroundTexture(GuiTextures.SLOT));
+                        .setBackgroundTexture(GuiTextures.SLOT));
             }
         }
 
@@ -84,11 +84,11 @@ public void update() {
             WorldServer world = (WorldServer) this.getWorld();
             int waterCount = 0;
             int edgeSize = (int) Math.sqrt(WATER_CHECK_SIZE);
-            for (int x = 0; x < edgeSize; x++){
-                for (int z = 0; z < edgeSize; z++){
+            for (int x = 0; x < edgeSize; x++) {
+                for (int z = 0; z < edgeSize; z++) {
                     BlockPos waterCheckPos = getPos().down().add(x - edgeSize / 2, 0, z - edgeSize / 2);
                     if (world.getBlockState(waterCheckPos).getBlock() instanceof BlockLiquid &&
-                        world.getBlockState(waterCheckPos).getMaterial() == Material.WATER) {
+                            world.getBlockState(waterCheckPos).getMaterial() == Material.WATER) {
                         waterCount++;
                     }
                 }
@@ -97,14 +97,14 @@ public void update() {
                 LootTable table = world.getLootTableManager().getLootTableFromLocation(LootTableList.GAMEPLAY_FISHING);
                 NonNullList itemStacks = NonNullList.create();
                 itemStacks.addAll(table.generateLootForPools(world.rand, new LootContext.Builder(world).build()));
-                if(addItemsToItemHandler(exportItems, true, itemStacks)) {
+                if (addItemsToItemHandler(exportItems, true, itemStacks)) {
                     addItemsToItemHandler(exportItems, false, itemStacks);
                     energyContainer.removeEnergy(energyAmountPerFish);
                     baitStack.shrink(1);
                 }
             }
         }
-        if(!getWorld().isRemote && getOffsetTimer() % 5 == 0) {
+        if (!getWorld().isRemote && getOffsetTimer() % 5 == 0) {
             pushItemsIntoNearbyHandlers(getFrontFacing());
         }
     }
@@ -115,7 +115,7 @@ protected IItemHandlerModifiable createImportItemHandler() {
             @Nonnull
             @Override
             public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) {
-                if(OreDictUnifier.getOreDictionaryNames(stack).contains("string")) {
+                if (OreDictUnifier.getOreDictionaryNames(stack).contains("string")) {
                     return super.insertItem(slot, stack, simulate);
                 }
                 return stack;
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityItemCollector.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityItemCollector.java
index feb3908f859..6261b337898 100644
--- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityItemCollector.java
+++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityItemCollector.java
@@ -108,7 +108,7 @@ protected boolean canMachineConnectRedstone(EnumFacing side) {
     public void update() {
         super.update();
 
-        if(getWorld().isRemote) {
+        if (getWorld().isRemote) {
             return;
         }
 
@@ -118,14 +118,14 @@ public void update() {
             energyContainer.removeEnergy(getEnergyConsumedPerTick());
             BlockPos selfPos = getPos();
             if (areaCenterPos == null || areaBoundingBox == null || areaCenterPos.getX() != selfPos.getX() ||
-                areaCenterPos.getZ() != selfPos.getZ() || areaCenterPos.getY() != selfPos.getY() + 1) {
+                    areaCenterPos.getZ() != selfPos.getZ() || areaCenterPos.getY() != selfPos.getY() + 1) {
                 this.areaCenterPos = selfPos.up();
                 this.areaBoundingBox = new AxisAlignedBB(areaCenterPos).grow(itemSuckingRange, 1.0, itemSuckingRange);
             }
             moveItemsInEffectRange();
         }
 
-        if(isWorkingNow != isWorking) {
+        if (isWorkingNow != isWorking) {
             this.isWorking = isWorkingNow;
             writeCustomData(100, buffer -> buffer.writeBoolean(isWorkingNow));
         }
@@ -134,15 +134,15 @@ public void update() {
     protected void moveItemsInEffectRange() {
         List itemsInRange = getWorld().getEntitiesWithinAABB(EntityItem.class, areaBoundingBox);
         for (EntityItem entityItem : itemsInRange) {
-            if(entityItem.isDead) continue;
+            if (entityItem.isDead) continue;
             double distanceX = (areaCenterPos.getX() + 0.5) - entityItem.posX;
             double distanceZ = (areaCenterPos.getZ() + 0.5) - entityItem.posZ;
             double distance = MathHelper.sqrt(distanceX * distanceX + distanceZ * distanceZ);
-            if(!itemFilter.testItemStack(entityItem.getItem())) {
+            if (!itemFilter.testItemStack(entityItem.getItem())) {
                 continue;
             }
             if (distance >= 0.7) {
-                if(!entityItem.cannotPickup()) {
+                if (!entityItem.cannotPickup()) {
                     double directionX = distanceX / distance;
                     double directionZ = distanceZ / distance;
                     entityItem.motionX = directionX * MOTION_MULTIPLIER * getTier();
@@ -219,8 +219,8 @@ protected void adjustSuckingRange(int amount) {
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         int rowSize = (int) Math.sqrt(exportItems.getSlots());
         Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176,
-            45 + rowSize * 18 + 105 + 82)
-            .label(10, 5, getMetaFullName());
+                45 + rowSize * 18 + 105 + 82)
+                .label(10, 5, getMetaFullName());
 
         builder.widget(new ClickButtonWidget(10, 20, 20, 20, "-1", data -> adjustSuckingRange(-1)));
         builder.widget(new ClickButtonWidget(146, 20, 20, 20, "+1", data -> adjustSuckingRange(+1)));
@@ -231,7 +231,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
             for (int x = 0; x < rowSize; x++) {
                 int index = y * rowSize + x;
                 builder.widget(new SlotWidget(exportItems, index, 89 - rowSize * 9 + x * 18, 45 + y * 18, true, false)
-                    .setBackgroundTexture(GuiTextures.SLOT));
+                        .setBackgroundTexture(GuiTextures.SLOT));
             }
         }
 
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMagicEnergyAbsorber.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMagicEnergyAbsorber.java
index 20160a3f70a..a7ea612dce8 100644
--- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMagicEnergyAbsorber.java
+++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMagicEnergyAbsorber.java
@@ -146,9 +146,9 @@ private void updateConnectedCrystals() {
         this.connectedCrystalsIds.clear();
         final double maxDistance = 64 * 64;
         List enderCrystals = Arrays.stream(BiomeEndDecorator.getSpikesForWorld(getWorld()))
-            .flatMap(endSpike -> getWorld().getEntitiesWithinAABB(EntityEnderCrystal.class, endSpike.getTopBoundingBox()).stream())
-            .filter(crystal -> crystal.getDistanceSq(getPos()) < maxDistance)
-            .collect(Collectors.toList());
+                .flatMap(endSpike -> getWorld().getEntitiesWithinAABB(EntityEnderCrystal.class, endSpike.getTopBoundingBox()).stream())
+                .filter(crystal -> crystal.getDistanceSq(getPos()) < maxDistance)
+                .collect(Collectors.toList());
 
         for (EntityEnderCrystal entityEnderCrystal : enderCrystals) {
             BlockPos beamTarget = entityEnderCrystal.getBeamTarget();
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java
index d447211c7c2..6fab365e548 100644
--- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java
+++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java
@@ -132,19 +132,19 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
         Builder builder = ModularUI.defaultBuilder();
         builder.image(7, 16, 81, 55, GuiTextures.DISPLAY);
         TankWidget tankWidget = new TankWidget(exportFluids.getTankAt(0), 69, 52, 18, 18)
-            .setHideTooltip(true).setAlwaysShowFull(true);
+                .setHideTooltip(true).setAlwaysShowFull(true);
         builder.widget(tankWidget);
         builder.label(11, 20, "gregtech.gui.fluid_amount", 0xFFFFFF);
         builder.dynamicLabel(11, 30, tankWidget::getFormattedFluidAmount, 0xFFFFFF);
         builder.dynamicLabel(11, 40, tankWidget::getFluidLocalizedName, 0xFFFFFF);
         return builder.label(6, 6, getMetaFullName())
-            .widget(new FluidContainerSlotWidget(importItems, 0, 90, 17, false)
-                .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.IN_SLOT_OVERLAY))
-            .widget(new ImageWidget(91, 36, 14, 15, GuiTextures.TANK_ICON))
-            .widget(new SlotWidget(exportItems, 0, 90, 54, true, false)
-                .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.OUT_SLOT_OVERLAY))
-            .bindPlayerInventory(entityPlayer.inventory)
-            .build(getHolder(), entityPlayer);
+                .widget(new FluidContainerSlotWidget(importItems, 0, 90, 17, false)
+                        .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.IN_SLOT_OVERLAY))
+                .widget(new ImageWidget(91, 36, 14, 15, GuiTextures.TANK_ICON))
+                .widget(new SlotWidget(exportItems, 0, 90, 54, true, false)
+                        .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.OUT_SLOT_OVERLAY))
+                .bindPlayerInventory(entityPlayer.inventory)
+                .build(getHolder(), entityPlayer);
     }
 
     private int getMaxPumpRange() {
@@ -154,15 +154,15 @@ private int getMaxPumpRange() {
     private boolean isStraightInPumpRange(BlockPos checkPos) {
         BlockPos pos = getPos();
         return checkPos.getX() == pos.getX() &&
-            checkPos.getZ() == pos.getZ() &&
-            pos.getY() < checkPos.getY() &&
-            pos.getY() + pumpHeadY >= checkPos.getY();
+                checkPos.getZ() == pos.getZ() &&
+                pos.getY() < checkPos.getY() &&
+                pos.getY() + pumpHeadY >= checkPos.getY();
     }
 
     private void updateQueueState(int blocksToCheckAmount) {
         BlockPos selfPos = getPos().down(pumpHeadY);
 
-        for(int i = 0; i < blocksToCheckAmount; i++) {
+        for (int i = 0; i < blocksToCheckAmount; i++) {
             BlockPos checkPos = null;
             int amountIterated = 0;
             do {
@@ -173,8 +173,8 @@ private void updateQueueState(int blocksToCheckAmount) {
                 checkPos = blocksToCheck.poll();
 
             } while (checkPos != null &&
-                !getWorld().isBlockLoaded(checkPos) &&
-                amountIterated < blocksToCheck.size());
+                    !getWorld().isBlockLoaded(checkPos) &&
+                    amountIterated < blocksToCheck.size());
             if (checkPos != null) {
                 checkFluidBlockAt(selfPos, checkPos);
             } else break;
@@ -186,8 +186,8 @@ private void updateQueueState(int blocksToCheckAmount) {
                 if (downPos != null && downPos.getY() >= 0) {
                     IBlockState downBlock = getWorld().getBlockState(downPos);
                     if (downBlock.getBlock() instanceof BlockLiquid ||
-                        downBlock.getBlock() instanceof IFluidBlock ||
-                        !downBlock.isTopSolid()) {
+                            downBlock.getBlock() instanceof IFluidBlock ||
+                            !downBlock.isTopSolid()) {
                         this.pumpHeadY++;
                     }
                 }
@@ -212,7 +212,7 @@ private void checkFluidBlockAt(BlockPos pumpHeadPos, BlockPos checkPos) {
         boolean shouldCheckNeighbours = isStraightInPumpRange(checkPos);
 
         if (blockHere.getBlock() instanceof BlockLiquid ||
-            blockHere.getBlock() instanceof IFluidBlock) {
+                blockHere.getBlock() instanceof IFluidBlock) {
             IFluidHandler fluidHandler = FluidUtil.getFluidHandler(getWorld(), checkPos, null);
             FluidStack drainStack = fluidHandler.drain(Integer.MAX_VALUE, false);
             if (drainStack != null && drainStack.amount > 0) {
@@ -228,7 +228,7 @@ private void checkFluidBlockAt(BlockPos pumpHeadPos, BlockPos checkPos) {
                 if (offsetPos.distanceSq(pumpHeadPos) > maxPumpRange * maxPumpRange)
                     continue; //do not add blocks outside bounds
                 if (!fluidSourceBlocks.contains(offsetPos) &&
-                    !blocksToCheck.contains(offsetPos)) {
+                        !blocksToCheck.contains(offsetPos)) {
                     this.blocksToCheck.add(offsetPos);
                 }
             }
@@ -240,7 +240,7 @@ private void tryPumpFirstBlock() {
         if (fluidBlockPos == null) return;
         IBlockState blockHere = getWorld().getBlockState(fluidBlockPos);
         if (blockHere.getBlock() instanceof BlockLiquid ||
-            blockHere.getBlock() instanceof IFluidBlock) {
+                blockHere.getBlock() instanceof IFluidBlock) {
             IFluidHandler fluidHandler = FluidUtil.getFluidHandler(getWorld(), fluidBlockPos, null);
             FluidStack drainStack = fluidHandler.drain(Integer.MAX_VALUE, false);
             if (drainStack != null && exportFluids.fill(drainStack, false) == drainStack.amount) {
@@ -266,7 +266,7 @@ public void update() {
         fillContainerFromInternalTank(importItems, exportItems, 0, 0);
         updateQueueState(getTier());
         if (getOffsetTimer() % getPumpingCycleLength() == 0 && !fluidSourceBlocks.isEmpty() &&
-            energyContainer.getEnergyStored() >= GTValues.V[getTier()]) {
+                energyContainer.getEnergyStored() >= GTValues.V[getTier()]) {
             tryPumpFirstBlock();
         }
     }
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityTransformer.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityTransformer.java
index 5c57bd9bdd9..6a33cac60f1 100644
--- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityTransformer.java
+++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityTransformer.java
@@ -101,7 +101,7 @@ protected void reinitializeEnergyContainer() {
             this.energyContainer = new EnergyContainerHandler(this, tierVoltage * 8L, tierVoltage, 4, tierVoltage * 4, 1);
             ((EnergyContainerHandler) this.energyContainer).setSideInputCondition(s -> s != getFrontFacing());
             ((EnergyContainerHandler) this.energyContainer).setSideOutputCondition(s -> s == getFrontFacing());
-        } else{
+        } else {
             //storage = 1 amp high; input = tier; amperage = 1; output = tier / 4; amperage = 4
             this.energyContainer = new EnergyContainerHandler(this, tierVoltage * 8L, tierVoltage * 4, 1, tierVoltage, 4);
             ((EnergyContainerHandler) this.energyContainer).setSideInputCondition(s -> s == getFrontFacing());
@@ -113,12 +113,12 @@ protected void reinitializeEnergyContainer() {
     public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline) {
         super.renderMetaTileEntity(renderState, translation, pipeline);
 
-            SimpleOverlayRenderer otherFaceTexture = isTransformUp ? Textures.ENERGY_IN : Textures.ENERGY_OUT;
-            SimpleOverlayRenderer frontFaceTexture = isTransformUp ? Textures.ENERGY_OUT_MULTI : Textures.ENERGY_IN_MULTI;
-            frontFaceTexture.renderSided(frontFacing,renderState,translation,PipelineUtil.color(pipeline, GTValues.VC[getTier() + 1]));
+        SimpleOverlayRenderer otherFaceTexture = isTransformUp ? Textures.ENERGY_IN : Textures.ENERGY_OUT;
+        SimpleOverlayRenderer frontFaceTexture = isTransformUp ? Textures.ENERGY_OUT_MULTI : Textures.ENERGY_IN_MULTI;
+        frontFaceTexture.renderSided(frontFacing, renderState, translation, PipelineUtil.color(pipeline, GTValues.VC[getTier() + 1]));
         Arrays.stream(EnumFacing.values()).filter(f -> f != frontFacing)
-                .forEach((f -> otherFaceTexture.renderSided(f,renderState,translation,PipelineUtil.color(pipeline, GTValues.VC[getTier()]))));
-        }
+                .forEach((f -> otherFaceTexture.renderSided(f, renderState, translation, PipelineUtil.color(pipeline, GTValues.VC[getTier()]))));
+    }
 
 
     @Override
@@ -129,25 +129,25 @@ public boolean isValidFrontFacing(EnumFacing facing) {
     @Override
     public boolean onRightClick(EntityPlayer playerIn, EnumHand hand, EnumFacing facing, CuboidRayTraceResult hitResult) {
         ItemStack itemStack = playerIn.getHeldItem(hand);
-        if(!itemStack.isEmpty() && itemStack.hasCapability(GregtechCapabilities.CAPABILITY_MALLET, null)) {
+        if (!itemStack.isEmpty() && itemStack.hasCapability(GregtechCapabilities.CAPABILITY_MALLET, null)) {
             ISoftHammerItem softHammerItem = itemStack.getCapability(GregtechCapabilities.CAPABILITY_MALLET, null);
 
             if (getWorld().isRemote) {
                 scheduleRenderUpdate();
                 return true;
             }
-            if(!softHammerItem.damageItem(DamageValues.DAMAGE_FOR_SOFT_HAMMER, false)) {
+            if (!softHammerItem.damageItem(DamageValues.DAMAGE_FOR_SOFT_HAMMER, false)) {
                 return false;
             }
 
             if (isTransformUp) {
                 setTransformUp(false);
                 playerIn.sendMessage(new TextComponentTranslation("gregtech.machine.transformer.message_transform_down",
-                    energyContainer.getInputVoltage(), energyContainer.getInputAmperage(), energyContainer.getOutputVoltage(), energyContainer.getOutputAmperage()));
+                        energyContainer.getInputVoltage(), energyContainer.getInputAmperage(), energyContainer.getOutputVoltage(), energyContainer.getOutputAmperage()));
             } else {
                 setTransformUp(true);
                 playerIn.sendMessage(new TextComponentTranslation("gregtech.machine.transformer.message_transform_up",
-                    energyContainer.getInputVoltage(), energyContainer.getInputAmperage(), energyContainer.getOutputVoltage(), energyContainer.getOutputAmperage()));
+                        energyContainer.getInputVoltage(), energyContainer.getInputAmperage(), energyContainer.getOutputVoltage(), energyContainer.getOutputAmperage()));
             }
             return true;
         }
diff --git a/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityItemBus.java b/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityItemBus.java
index 7c4b64bac19..1e243d96394 100644
--- a/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityItemBus.java
+++ b/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityItemBus.java
@@ -101,7 +101,7 @@ private ModularUI.Builder createUITemplate(EntityPlayer player, int rowSize, int
                 .label(10, 5, getMetaFullName());
 
         for (int y = 0; y < rowSize; y++) {
-            for (int x = 0; x < rowSize; x ++) {
+            for (int x = 0; x < rowSize; x++) {
                 int index = y * rowSize + x;
                 builder.widget(new SlotWidget(isExportHatch ? exportItems : importItems, index,
                         (88 - rowSize * 9 + x * 18) + xOffset, 18 + y * 18, true, !isExportHatch)
diff --git a/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityMultiblockPart.java b/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityMultiblockPart.java
index c37f277d61e..15476565484 100644
--- a/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityMultiblockPart.java
+++ b/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityMultiblockPart.java
@@ -41,7 +41,7 @@ public Pair getParticleTexture() {
     @Override
     public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline) {
         getBaseTexture().render(renderState, translation, ArrayUtils.add(pipeline,
-            new ColourMultiplier(GTUtility.convertRGBtoOpaqueRGBA_CL(getPaintingColorForRendering()))));
+                new ColourMultiplier(GTUtility.convertRGBtoOpaqueRGBA_CL(getPaintingColorForRendering()))));
     }
 
     @Override
@@ -74,7 +74,7 @@ public ICubeRenderer getBaseTexture() {
         if (controller != null) {
             this.hatchTexture = controller.getBaseTexture(this);
         }
-        if (controller == null && this.hatchTexture != null){
+        if (controller == null && this.hatchTexture != null) {
             return this.hatchTexture;
         }
         if (controller == null) {
diff --git a/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityRotorHolder.java b/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityRotorHolder.java
index 9aeff93db4f..b220f853891 100644
--- a/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityRotorHolder.java
+++ b/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityRotorHolder.java
@@ -261,16 +261,16 @@ public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation,
         super.renderMetaTileEntity(renderState, translation, pipeline);
         Textures.ROTOR_HOLDER_OVERLAY.renderSided(getFrontFacing(), renderState, translation, pipeline);
         Textures.LARGE_TURBINE_ROTOR_RENDERER.renderSided(renderState, translation, pipeline, getFrontFacing(),
-            getController() != null, isHasRotor(), isRotorLooping(), rotorColor);
+                getController() != null, isHasRotor(), isRotorLooping(), rotorColor);
     }
 
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         return ModularUI.defaultBuilder()
-            .label(6, 6, getMetaFullName())
-            .slot(rotorInventory, 0, 79, 36, GuiTextures.SLOT, GuiTextures.TURBINE_OVERLAY)
-            .bindPlayerInventory(entityPlayer.inventory)
-            .build(getHolder(), entityPlayer);
+                .label(6, 6, getMetaFullName())
+                .slot(rotorInventory, 0, 79, 36, GuiTextures.SLOT, GuiTextures.TURBINE_OVERLAY)
+                .bindPlayerInventory(entityPlayer.inventory)
+                .build(getHolder(), entityPlayer);
     }
 
     @Override
@@ -284,13 +284,13 @@ public void addInformation(ItemStack stack, @Nullable World player, List
     @Override
     public boolean onRightClick(EntityPlayer playerIn, EnumHand hand, EnumFacing facing, CuboidRayTraceResult hitResult) {
         return onRotorHolderInteract(playerIn) ||
-            super.onRightClick(playerIn, hand, facing, hitResult);
+                super.onRightClick(playerIn, hand, facing, hitResult);
     }
 
     @Override
     public boolean onWrenchClick(EntityPlayer playerIn, EnumHand hand, EnumFacing facing, CuboidRayTraceResult hitResult) {
         return onRotorHolderInteract(playerIn) ||
-            super.onWrenchClick(playerIn, hand, facing, hitResult);
+                super.onWrenchClick(playerIn, hand, facing, hitResult);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityCokeOven.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityCokeOven.java
index 2950fa6c091..b451814a15b 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityCokeOven.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityCokeOven.java
@@ -86,13 +86,13 @@ private void finishCurrentRecipe() {
     private CokeOvenRecipe getOrRefreshRecipe(ItemStack inputStack) {
         CokeOvenRecipe currentRecipe = null;
         if (previousRecipe != null &&
-            previousRecipe.getInput().getIngredient().apply(inputStack)) {
+                previousRecipe.getInput().getIngredient().apply(inputStack)) {
             currentRecipe = previousRecipe;
         } else if (!areItemStacksEqual(inputStack, lastInputStack)) {
             this.lastInputStack = inputStack.isEmpty() ? ItemStack.EMPTY : inputStack.copy();
             currentRecipe = RecipeMaps.COKE_OVEN_RECIPES.stream()
-                .filter(it -> it.getInput().getIngredient().test(inputStack))
-                .findFirst().orElse(null);
+                    .filter(it -> it.getInput().getIngredient().test(inputStack))
+                    .findFirst().orElse(null);
             if (currentRecipe != null) {
                 this.previousRecipe = currentRecipe;
             }
@@ -102,14 +102,14 @@ private CokeOvenRecipe getOrRefreshRecipe(ItemStack inputStack) {
 
     private static boolean areItemStacksEqual(ItemStack stackA, ItemStack stackB) {
         return (stackA.isEmpty() && stackB.isEmpty()) ||
-            (ItemStack.areItemsEqual(stackA, stackB) &&
-                ItemStack.areItemStackTagsEqual(stackA, stackB));
+                (ItemStack.areItemsEqual(stackA, stackB) &&
+                        ItemStack.areItemStackTagsEqual(stackA, stackB));
     }
 
     private boolean setupRecipe(ItemStack inputStack, CokeOvenRecipe recipe) {
         return inputStack.getCount() >= recipe.getInput().getCount() &&
-            ItemHandlerHelper.insertItemStacked(exportItems, recipe.getOutput(), true).isEmpty() &&
-            exportFluids.fill(recipe.getFluidOutput(), false) == recipe.getFluidOutput().amount;
+                ItemHandlerHelper.insertItemStacked(exportItems, recipe.getOutput(), true).isEmpty() &&
+                exportFluids.fill(recipe.getFluidOutput(), false) == recipe.getFluidOutput().amount;
     }
 
     private boolean tryPickNewRecipe() {
@@ -218,7 +218,7 @@ public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation,
     @Override
     public  T getCapability(Capability capability, EnumFacing side) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY ||
-            capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
+                capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
             return null;
         }
         return super.getCapability(capability, side);
@@ -243,14 +243,14 @@ protected FluidTankList createExportFluidHandler() {
     protected BlockPattern createStructurePattern() {
         Predicate hatchPredicate = tilePredicate((state, tile) -> tile instanceof MetaTileEntityCokeOvenHatch);
         return FactoryBlockPattern.start()
-            .aisle("XXX", "XZX", "XXX")
-            .aisle("XZX", "Z#Z", "XZX")
-            .aisle("XXX", "XYX", "XXX")
-            .where('Z', statePredicate(getCasingState()).or(hatchPredicate))
-            .where('X', statePredicate(getCasingState()))
-            .where('#', isAirPredicate())
-            .where('Y', selfPredicate())
-            .build();
+                .aisle("XXX", "XZX", "XXX")
+                .aisle("XZX", "Z#Z", "XZX")
+                .aisle("XXX", "XYX", "XXX")
+                .where('Z', statePredicate(getCasingState()).or(hatchPredicate))
+                .where('X', statePredicate(getCasingState()))
+                .where('#', isAirPredicate())
+                .where('Y', selfPredicate())
+                .build();
     }
 
     @Override
@@ -261,16 +261,16 @@ public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder holder) {
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         return ModularUI.builder(GuiTextures.BACKGROUND, 176, 166)
-            .widget(new SlotWidget(importItems, 0, 33, 30, true, true)
-                .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.FURNACE_OVERLAY))
-            .progressBar(this::getProgressScaled, 58, 30, 20, 15, GuiTextures.BRONZE_BLAST_FURNACE_PROGRESS_BAR, MoveType.HORIZONTAL)
-            .widget(new SlotWidget(exportItems, 0, 85, 30, true, false)
-                .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.FURNACE_OVERLAY))
-            .widget(new TankWidget(exportFluids.getTankAt(0), 133, 13, 20, 58)
-                .setBackgroundTexture(GuiTextures.FLUID_TANK_BACKGROUND)
-                .setOverlayTexture(GuiTextures.FLUID_TANK_OVERLAY)
-                .setContainerClicking(true, false))
-            .bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 0)
-            .build(getHolder(), entityPlayer);
+                .widget(new SlotWidget(importItems, 0, 33, 30, true, true)
+                        .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.FURNACE_OVERLAY))
+                .progressBar(this::getProgressScaled, 58, 30, 20, 15, GuiTextures.BRONZE_BLAST_FURNACE_PROGRESS_BAR, MoveType.HORIZONTAL)
+                .widget(new SlotWidget(exportItems, 0, 85, 30, true, false)
+                        .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.FURNACE_OVERLAY))
+                .widget(new TankWidget(exportFluids.getTankAt(0), 133, 13, 20, 58)
+                        .setBackgroundTexture(GuiTextures.FLUID_TANK_BACKGROUND)
+                        .setOverlayTexture(GuiTextures.FLUID_TANK_OVERLAY)
+                        .setContainerClicking(true, false))
+                .bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 0)
+                .build(getHolder(), entityPlayer);
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java
index e1ca826f01a..9ac3c0f583a 100755
--- a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java
@@ -65,32 +65,32 @@ public class MetaTileEntityLargeBoiler extends MultiblockWithDisplayBase impleme
 
     public enum BoilerType {
         BRONZE(900, 1.0f, 28, 500,
-            MetaBlocks.METAL_CASING.getState(MetalCasingType.BRONZE_BRICKS),
-            MetaBlocks.BOILER_FIREBOX_CASING.getState(FireboxCasingType.BRONZE_FIREBOX),
-            MetaBlocks.BOILER_CASING.getState(BoilerCasingType.BRONZE_PIPE),
-            Textures.BRONZE_PLATED_BRICKS,
-            Textures.BRONZE_FIREBOX, Textures.BRONZE_FIREBOX_ACTIVE, Textures.LARGE_BRONZE_BOILER),
+                MetaBlocks.METAL_CASING.getState(MetalCasingType.BRONZE_BRICKS),
+                MetaBlocks.BOILER_FIREBOX_CASING.getState(FireboxCasingType.BRONZE_FIREBOX),
+                MetaBlocks.BOILER_CASING.getState(BoilerCasingType.BRONZE_PIPE),
+                Textures.BRONZE_PLATED_BRICKS,
+                Textures.BRONZE_FIREBOX, Textures.BRONZE_FIREBOX_ACTIVE, Textures.LARGE_BRONZE_BOILER),
 
         STEEL(1600, 1.6f, 30, 800,
-            MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID),
-            MetaBlocks.BOILER_FIREBOX_CASING.getState(FireboxCasingType.STEEL_FIREBOX),
-            MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE),
-            Textures.SOLID_STEEL_CASING,
-            Textures.STEEL_FIREBOX, Textures.STEEL_FIREBOX_ACTIVE, Textures.LARGE_STEEL_BOILER),
+                MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID),
+                MetaBlocks.BOILER_FIREBOX_CASING.getState(FireboxCasingType.STEEL_FIREBOX),
+                MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE),
+                Textures.SOLID_STEEL_CASING,
+                Textures.STEEL_FIREBOX, Textures.STEEL_FIREBOX_ACTIVE, Textures.LARGE_STEEL_BOILER),
 
         TITANIUM(3700, 3.0f, 31, 2000,
-            MetaBlocks.METAL_CASING.getState(MetalCasingType.TITANIUM_STABLE),
-            MetaBlocks.BOILER_FIREBOX_CASING.getState(FireboxCasingType.TITANIUM_FIREBOX),
-            MetaBlocks.BOILER_CASING.getState(BoilerCasingType.TITANIUM_PIPE),
-            Textures.STABLE_TITANIUM_CASING,
-            Textures.TITANIUM_FIREBOX, Textures.TITANIUM_FIREBOX_ACTIVE, Textures.LARGE_TITANIUM_BOILER),
+                MetaBlocks.METAL_CASING.getState(MetalCasingType.TITANIUM_STABLE),
+                MetaBlocks.BOILER_FIREBOX_CASING.getState(FireboxCasingType.TITANIUM_FIREBOX),
+                MetaBlocks.BOILER_CASING.getState(BoilerCasingType.TITANIUM_PIPE),
+                Textures.STABLE_TITANIUM_CASING,
+                Textures.TITANIUM_FIREBOX, Textures.TITANIUM_FIREBOX_ACTIVE, Textures.LARGE_TITANIUM_BOILER),
 
         TUNGSTENSTEEL(7800, 5.4f, 32, 4000,
-            MetaBlocks.METAL_CASING.getState(MetalCasingType.TUNGSTENSTEEL_ROBUST),
-            MetaBlocks.BOILER_FIREBOX_CASING.getState(FireboxCasingType.TUNGSTENSTEEL_FIREBOX),
-            MetaBlocks.BOILER_CASING.getState(BoilerCasingType.TUNGSTENSTEEL_PIPE),
-            Textures.ROBUST_TUNGSTENSTEEL_CASING,
-            Textures.TUNGSTENSTEEL_FIREBOX, Textures.TUNGSTENSTEEL_FIREBOX_ACTIVE, Textures.LARGE_TUNGSTENSTEEL_BOILER);
+                MetaBlocks.METAL_CASING.getState(MetalCasingType.TUNGSTENSTEEL_ROBUST),
+                MetaBlocks.BOILER_FIREBOX_CASING.getState(FireboxCasingType.TUNGSTENSTEEL_FIREBOX),
+                MetaBlocks.BOILER_CASING.getState(BoilerCasingType.TUNGSTENSTEEL_PIPE),
+                Textures.ROBUST_TUNGSTENSTEEL_CASING,
+                Textures.TUNGSTENSTEEL_FIREBOX, Textures.TUNGSTENSTEEL_FIREBOX_ACTIVE, Textures.LARGE_TUNGSTENSTEEL_BOILER);
 
         public final int baseSteamOutput;
         public final float fuelConsumptionMultiplier;
@@ -186,7 +186,7 @@ protected void addDisplayText(List textList) {
             withHoverTextTranslate(heatEffText, "gregtech.multiblock.large_boiler.heat_efficiency.tooltip");
             textList.add(heatEffText);
 
-            ITextComponent throttleText = new TextComponentTranslation("gregtech.multiblock.large_boiler.throttle", throttlePercentage, (int)(getThrottleEfficiency() * 100));
+            ITextComponent throttleText = new TextComponentTranslation("gregtech.multiblock.large_boiler.throttle", throttlePercentage, (int) (getThrottleEfficiency() * 100));
             withHoverTextTranslate(throttleText, "gregtech.multiblock.large_boiler.throttle.tooltip");
             textList.add(throttleText);
 
@@ -235,10 +235,10 @@ protected void updateFormedValid() {
             }
             if (drainedWater != null && drainedWater.amount > 0) {
                 if (currentTemperature > BOILING_TEMPERATURE && hasNoWater) {
-                    float explosionPower = currentTemperature / (float)BOILING_TEMPERATURE * 2.0f;
+                    float explosionPower = currentTemperature / (float) BOILING_TEMPERATURE * 2.0f;
                     getWorld().setBlockToAir(getPos());
                     getWorld().createExplosion(null, getPos().getX() + 0.5, getPos().getY() + 0.5, getPos().getZ() + 0.5,
-                        explosionPower, true);
+                            explosionPower, true);
                 }
                 this.hasNoWater = false;
                 if (currentTemperature >= BOILING_TEMPERATURE) {
@@ -332,7 +332,7 @@ public void readFromNBT(NBTTagCompound data) {
         this.currentTemperature = data.getInteger("CurrentTemperature");
         this.fuelBurnTicksLeft = data.getInteger("FuelBurnTicksLeft");
         this.hasNoWater = data.getBoolean("HasNoWater");
-        if(data.hasKey("ThrottlePercentage")) {
+        if (data.hasKey("ThrottlePercentage")) {
             this.throttlePercentage = data.getInteger("ThrottlePercentage");
         }
         this.isActive = fuelBurnTicksLeft > 0;
@@ -354,7 +354,7 @@ private double getThrottleMultiplier() {
     }
 
     private double getThrottleEfficiency() {
-        return MathHelper.clamp(1.0 + 0.3*Math.log(getThrottleMultiplier()), 0.4, 1.0);
+        return MathHelper.clamp(1.0 + 0.3 * Math.log(getThrottleMultiplier()), 0.4, 1.0);
     }
 
     private void replaceFireboxAsActive(boolean isActive) {
@@ -399,18 +399,18 @@ public void receiveCustomData(int dataId, PacketBuffer buf) {
     @Override
     protected BlockPattern createStructurePattern() {
         return boilerType == null ? null : FactoryBlockPattern.start()
-            .aisle("XXX", "CCC", "CCC", "CCC")
-            .aisle("XXX", "CPC", "CPC", "CCC")
-            .aisle("XXX", "CSC", "CCC", "CCC")
-            .setAmountAtLeast('X', 4)
-            .setAmountAtLeast('C', 20)
-            .where('S', selfPredicate())
-            .where('P', statePredicate(boilerType.pipeState))
-            .where('X', state -> statePredicate(GTUtility.getAllPropertyValues(boilerType.fireboxState, BlockFireboxCasing.ACTIVE))
-                .or(abilityPartPredicate(MultiblockAbility.IMPORT_FLUIDS, MultiblockAbility.IMPORT_ITEMS)).test(state))
-            .where('C', statePredicate(boilerType.casingState).or(abilityPartPredicate(
-                MultiblockAbility.EXPORT_FLUIDS)))
-            .build();
+                .aisle("XXX", "CCC", "CCC", "CCC")
+                .aisle("XXX", "CPC", "CPC", "CCC")
+                .aisle("XXX", "CSC", "CCC", "CCC")
+                .setAmountAtLeast('X', 4)
+                .setAmountAtLeast('C', 20)
+                .where('S', selfPredicate())
+                .where('P', statePredicate(boilerType.pipeState))
+                .where('X', state -> statePredicate(GTUtility.getAllPropertyValues(boilerType.fireboxState, BlockFireboxCasing.ACTIVE))
+                        .or(abilityPartPredicate(MultiblockAbility.IMPORT_FLUIDS, MultiblockAbility.IMPORT_ITEMS)).test(state))
+                .where('C', statePredicate(boilerType.casingState).or(abilityPartPredicate(
+                        MultiblockAbility.EXPORT_FLUIDS)))
+                .build();
     }
 
     @Override
@@ -431,8 +431,8 @@ protected boolean checkStructureComponents(List parts, Map= 1 && (importFluidsSize >= 2 ||
-            abilities.containsKey(MultiblockAbility.IMPORT_ITEMS)) &&
-            abilities.containsKey(MultiblockAbility.EXPORT_FLUIDS);
+                abilities.containsKey(MultiblockAbility.IMPORT_ITEMS)) &&
+                abilities.containsKey(MultiblockAbility.EXPORT_FLUIDS);
     }
 
     private boolean isFireboxPart(IMultiblockPart sourcePart) {
@@ -455,13 +455,13 @@ public boolean shouldRenderOverlay(IMultiblockPart sourcePart) {
     @Override
     public boolean onRightClick(EntityPlayer playerIn, EnumHand hand, EnumFacing facing, CuboidRayTraceResult hitResult) {
         ItemStack itemStack = playerIn.getHeldItem(hand);
-        if(!itemStack.isEmpty() && itemStack.hasCapability(GregtechCapabilities.CAPABILITY_MALLET, null)) {
+        if (!itemStack.isEmpty() && itemStack.hasCapability(GregtechCapabilities.CAPABILITY_MALLET, null)) {
             ISoftHammerItem softHammerItem = itemStack.getCapability(GregtechCapabilities.CAPABILITY_MALLET, null);
 
             if (getWorld().isRemote) {
                 return true;
             }
-            if(!softHammerItem.damageItem(DamageValues.DAMAGE_FOR_SOFT_HAMMER, false)) {
+            if (!softHammerItem.damageItem(DamageValues.DAMAGE_FOR_SOFT_HAMMER, false)) {
                 return false;
             }
         }
@@ -492,7 +492,7 @@ public Collection getFuels() {
         for (IFluidTank fluidTank : fluidImportInventory.getFluidTanks()) {
             FluidStack fuelStack = fluidTank.drain(Integer.MAX_VALUE, false);
             if (fuelStack == null || ModHandler.isWater(fuelStack))
-                continue; 
+                continue;
             FuelRecipe dieselRecipe = RecipeMaps.COMBUSTION_GENERATOR_FUELS.findRecipe(GTValues.V[9], fuelStack);
             if (dieselRecipe != null) {
                 long recipeVoltage = FuelRecipeLogic.getTieredVoltage(dieselRecipe.getMinVoltage());
@@ -504,8 +504,7 @@ public Collection getFuels() {
                 if (fluidFuelInfo == null) {
                     fluidFuelInfo = new FluidFuelInfo(fuelStack, fuelStack.amount, fluidCapacity, fuelAmountToConsume, fuelBurnTime);
                     fuels.put(fuelStack.getUnlocalizedName(), fluidFuelInfo);
-                }
-                else {
+                } else {
                     fluidFuelInfo.addFuelRemaining(fuelStack.amount);
                     fluidFuelInfo.addFuelBurnTime(fuelBurnTime);
                 }
@@ -521,8 +520,7 @@ public Collection getFuels() {
                 if (fluidFuelInfo == null) {
                     fluidFuelInfo = new FluidFuelInfo(fuelStack, fuelStack.amount, fluidCapacity, fuelAmountToConsume, fuelBurnTime);
                     fuels.put(fuelStack.getUnlocalizedName(), fluidFuelInfo);
-                }
-                else {
+                } else {
                     fluidFuelInfo.addFuelRemaining(fuelStack.amount);
                     fluidFuelInfo.addFuelBurnTime(fuelBurnTime);
                 }
@@ -540,8 +538,7 @@ public Collection getFuels() {
                 if (itemFuelInfo == null) {
                     itemFuelInfo = new ItemFuelInfo(itemStack, itemStack.getCount(), itemCapacity, 1, itemStack.getCount() * burnTime);
                     fuels.put(itemStack.getTranslationKey(), itemFuelInfo);
-                }
-                else {
+                } else {
                     itemFuelInfo.addFuelRemaining(itemStack.getCount());
                     itemFuelInfo.addFuelBurnTime(itemStack.getCount() * burnTime);
                 }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveBlastFurnace.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveBlastFurnace.java
index 37099c0e5ce..9a3cf77a0b7 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveBlastFurnace.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveBlastFurnace.java
@@ -24,8 +24,8 @@
 import gregtech.api.render.ICubeRenderer;
 import gregtech.api.render.Textures;
 import gregtech.api.unification.OreDictUnifier;
-import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.stack.MaterialStack;
 import gregtech.api.unification.stack.UnificationEntry;
@@ -46,28 +46,28 @@
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.ItemStackHandler;
 
-import static gregtech.api.util.InventoryUtils.simulateItemStackMerge;
-
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static gregtech.api.util.InventoryUtils.simulateItemStackMerge;
+
 public class MetaTileEntityPrimitiveBlastFurnace extends MultiblockControllerBase {
 
     private static final List FUEL_DISPLAY_PREFIXES = ImmutableList.of(
-        OrePrefix.gem, OrePrefix.dust, OrePrefix.block);
+            OrePrefix.gem, OrePrefix.dust, OrePrefix.block);
 
     private static final Map ALTERNATIVE_MATERIAL_NAMES = ImmutableMap.of(
-        "fuelCoke", new MaterialStack(Materials.Coke, GTValues.M),
-        "blockFuelCoke", new MaterialStack(Materials.Coke, GTValues.M * 9L));
+            "fuelCoke", new MaterialStack(Materials.Coke, GTValues.M),
+            "blockFuelCoke", new MaterialStack(Materials.Coke, GTValues.M * 9L));
 
     private static final Map MATERIAL_FUEL_MAP = ImmutableMap.of(
-        Materials.Lignite, 0.7f,
-        Materials.Charcoal, 1.0f,
-        Materials.Coal, 1.0f,
-        Materials.Coke, 2.0f);
+            Materials.Lignite, 0.7f,
+            Materials.Charcoal, 1.0f,
+            Materials.Coal, 1.0f,
+            Materials.Coke, 2.0f);
 
     private int maxProgressDuration;
     private int currentProgress;
@@ -113,13 +113,13 @@ private void finishCurrentRecipe() {
     private PrimitiveBlastFurnaceRecipe getOrRefreshRecipe(ItemStack inputStack) {
         PrimitiveBlastFurnaceRecipe currentRecipe = null;
         if (previousRecipe != null &&
-            previousRecipe.getInput().getIngredient().apply(inputStack)) {
+                previousRecipe.getInput().getIngredient().apply(inputStack)) {
             currentRecipe = previousRecipe;
         } else if (!areItemStacksEqual(inputStack, lastInputStack)) {
             this.lastInputStack = inputStack.isEmpty() ? ItemStack.EMPTY : inputStack.copy();
             currentRecipe = RecipeMaps.PRIMITIVE_BLAST_FURNACE_RECIPES.stream()
-                .filter(it -> it.getInput().getIngredient().test(inputStack))
-                .findFirst().orElse(null);
+                    .filter(it -> it.getInput().getIngredient().test(inputStack))
+                    .findFirst().orElse(null);
             if (currentRecipe != null) {
                 this.previousRecipe = currentRecipe;
             }
@@ -129,8 +129,8 @@ private PrimitiveBlastFurnaceRecipe getOrRefreshRecipe(ItemStack inputStack) {
 
     private static boolean areItemStacksEqual(ItemStack stackA, ItemStack stackB) {
         return (stackA.isEmpty() && stackB.isEmpty()) ||
-            (ItemStack.areItemsEqual(stackA, stackB) &&
-                ItemStack.areItemStackTagsEqual(stackA, stackB));
+                (ItemStack.areItemsEqual(stackA, stackB) &&
+                        ItemStack.areItemStackTagsEqual(stackA, stackB));
     }
 
     private boolean setupRecipe(ItemStack inputStack, int fuelAmount, PrimitiveBlastFurnaceRecipe recipe) {
@@ -256,12 +256,12 @@ public static float getFuelUnits(ItemStack fuelType) {
             return 0;
         }
         MaterialStack materialStack = OreDictUnifier.getMaterial(fuelType);
-        if(materialStack == null) {
+        if (materialStack == null) {
             //try alternative material names if we can't find valid standard one
             materialStack = OreDictUnifier.getOreDictionaryNames(fuelType).stream()
-                .map(ALTERNATIVE_MATERIAL_NAMES::get)
-                .filter(Objects::nonNull)
-                .findFirst().orElse(null);
+                    .map(ALTERNATIVE_MATERIAL_NAMES::get)
+                    .filter(Objects::nonNull)
+                    .findFirst().orElse(null);
         }
 
         if (materialStack != null && materialStack.amount >= GTValues.M) {
@@ -306,12 +306,13 @@ public static List getDisplayFuelsForRecipe(int recipeFuelUnits) {
 
         //de-duplicate items in the result list
         int currentIndex = 0;
-        loop: while (currentIndex < resultStacks.size()) {
+        loop:
+        while (currentIndex < resultStacks.size()) {
             ItemStack itemStack = resultStacks.get(currentIndex);
 
             for (int i = 0; i < currentIndex; i++) {
                 ItemStack otherStack = resultStacks.get(i);
-                if(ItemStack.areItemsEqual(itemStack, otherStack)) {
+                if (ItemStack.areItemsEqual(itemStack, otherStack)) {
                     resultStacks.remove(currentIndex); //remove duplicate item
                     continue loop;
                 }
@@ -379,13 +380,13 @@ protected IItemHandlerModifiable createExportItemHandler() {
     @Override
     protected BlockPattern createStructurePattern() {
         return FactoryBlockPattern.start()
-            .aisle("XXX", "XXX", "XXX", "XXX")
-            .aisle("XXX", "X#X", "X#X", "X#X")
-            .aisle("XXX", "XYX", "XXX", "XXX")
-            .where('X', statePredicate(getCasingState()))
-            .where('#', isAirPredicate())
-            .where('Y', selfPredicate())
-            .build();
+                .aisle("XXX", "XXX", "XXX", "XXX")
+                .aisle("XXX", "X#X", "X#X", "X#X")
+                .aisle("XXX", "XYX", "XXX", "XXX")
+                .where('X', statePredicate(getCasingState()))
+                .where('#', isAirPredicate())
+                .where('Y', selfPredicate())
+                .build();
     }
 
     @Override
@@ -396,16 +397,16 @@ public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder holder) {
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         return ModularUI.builder(GuiTextures.BACKGROUND, 176, 166)
-            .widget(new SlotWidget(importItems, 0, 33, 15, true, true)
-                .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.INGOT_OVERLAY))
-            .widget(new SlotWidget(importItems, 1, 33, 33, true, true)
-                .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.FURNACE_OVERLAY))
-            .progressBar(this::getProgressScaled, 58, 24, 20, 15, GuiTextures.BRONZE_BLAST_FURNACE_PROGRESS_BAR, MoveType.HORIZONTAL)
-            .widget(new SlotWidget(exportItems, 0, 85, 24, true, false)
-                .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.INGOT_OVERLAY))
-            .widget(new SlotWidget(exportItems, 1, 103, 24, true, false)
-                .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.DUST_OVERLAY))
-            .bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 0)
-            .build(getHolder(), entityPlayer);
+                .widget(new SlotWidget(importItems, 0, 33, 15, true, true)
+                        .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.INGOT_OVERLAY))
+                .widget(new SlotWidget(importItems, 1, 33, 33, true, true)
+                        .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.FURNACE_OVERLAY))
+                .progressBar(this::getProgressScaled, 58, 24, 20, 15, GuiTextures.BRONZE_BLAST_FURNACE_PROGRESS_BAR, MoveType.HORIZONTAL)
+                .widget(new SlotWidget(exportItems, 0, 85, 24, true, false)
+                        .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.INGOT_OVERLAY))
+                .widget(new SlotWidget(exportItems, 1, 103, 24, true, false)
+                        .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.DUST_OVERLAY))
+                .bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 0)
+                .build(getHolder(), entityPlayer);
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityAssemblyLine.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityAssemblyLine.java
index cbae6eb8231..5b2252d30a5 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityAssemblyLine.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityAssemblyLine.java
@@ -10,7 +10,10 @@
 import gregtech.api.recipes.RecipeMaps;
 import gregtech.api.render.ICubeRenderer;
 import gregtech.api.render.Textures;
-import gregtech.common.blocks.*;
+import gregtech.common.blocks.BlockMetalCasing;
+import gregtech.common.blocks.BlockMultiblockCasing;
+import gregtech.common.blocks.BlockTransparentCasing;
+import gregtech.common.blocks.MetaBlocks;
 import gregtech.common.metatileentities.MetaTileEntities;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityCrackingUnit.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityCrackingUnit.java
index 2cf771adf14..04f6e3c16b5 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityCrackingUnit.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityCrackingUnit.java
@@ -22,8 +22,8 @@
 public class MetaTileEntityCrackingUnit extends RecipeMapMultiblockController {
 
     private static final MultiblockAbility[] ALLOWED_ABILITIES = {
-        MultiblockAbility.IMPORT_FLUIDS, MultiblockAbility.EXPORT_FLUIDS,
-        MultiblockAbility.INPUT_ENERGY
+            MultiblockAbility.IMPORT_FLUIDS, MultiblockAbility.EXPORT_FLUIDS,
+            MultiblockAbility.INPUT_ENERGY
     };
 
     public MetaTileEntityCrackingUnit(ResourceLocation metaTileEntityId) {
@@ -38,16 +38,16 @@ public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder holder) {
     @Override
     protected BlockPattern createStructurePattern() {
         return FactoryBlockPattern.start()
-            .aisle("HCHCH", "HCHCH", "HCHCH")
-            .aisle("HCHCH", "H###H", "HCHCH")
-            .aisle("HCHCH", "HCOCH", "HCHCH")
-            .setAmountAtLeast('L', 20)
-            .where('O', selfPredicate())
-            .where('L', statePredicate(getCasingState()))
-            .where('H', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
-            .where('#', isAirPredicate())
-            .where('C', statePredicate(getCoilState()))
-            .build();
+                .aisle("HCHCH", "HCHCH", "HCHCH")
+                .aisle("HCHCH", "H###H", "HCHCH")
+                .aisle("HCHCH", "HCOCH", "HCHCH")
+                .setAmountAtLeast('L', 20)
+                .where('O', selfPredicate())
+                .where('L', statePredicate(getCasingState()))
+                .where('H', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
+                .where('#', isAirPredicate())
+                .where('C', statePredicate(getCoilState()))
+                .build();
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityDistillationTower.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityDistillationTower.java
index 10cb469be67..14ea2070d0c 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityDistillationTower.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityDistillationTower.java
@@ -55,16 +55,16 @@ protected BlockPattern createStructurePattern() {
         Predicate fluidExportPredicate = countMatch("HatchesAmount", abilityPartPredicate(MultiblockAbility.EXPORT_FLUIDS));
         Predicate exactlyOneHatch = context -> context.getInt("HatchesAmount") == 1;
         return FactoryBlockPattern.start(RIGHT, FRONT, UP)
-            .aisle("YSY", "YYY", "YYY")
-            .aisle("XXX", "X#X", "XXX").setRepeatable(0, 11)
-            .aisle("XXX", "XXX", "XXX")
-            .where('S', selfPredicate())
-            .where('Y', statePredicate(getCasingState()).or(abilityPartPredicate(MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.INPUT_ENERGY, MultiblockAbility.IMPORT_FLUIDS)))
-            .where('X', fluidExportPredicate.or(statePredicate(getCasingState())))
-            .where('#', isAirPredicate())
-            .validateLayer(1, exactlyOneHatch)
-            .validateLayer(2, exactlyOneHatch)
-            .build();
+                .aisle("YSY", "YYY", "YYY")
+                .aisle("XXX", "X#X", "XXX").setRepeatable(0, 11)
+                .aisle("XXX", "XXX", "XXX")
+                .where('S', selfPredicate())
+                .where('Y', statePredicate(getCasingState()).or(abilityPartPredicate(MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.INPUT_ENERGY, MultiblockAbility.IMPORT_FLUIDS)))
+                .where('X', fluidExportPredicate.or(statePredicate(getCasingState())))
+                .where('#', isAirPredicate())
+                .validateLayer(1, exactlyOneHatch)
+                .validateLayer(2, exactlyOneHatch)
+                .build();
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityElectricBlastFurnace.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityElectricBlastFurnace.java
index d632a6f7d90..effd7477ca2 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityElectricBlastFurnace.java
@@ -41,9 +41,9 @@
 public class MetaTileEntityElectricBlastFurnace extends RecipeMapMultiblockController {
 
     private static final MultiblockAbility[] ALLOWED_ABILITIES = {
-        MultiblockAbility.IMPORT_ITEMS, MultiblockAbility.IMPORT_FLUIDS,
-        MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.EXPORT_FLUIDS,
-        MultiblockAbility.INPUT_ENERGY
+            MultiblockAbility.IMPORT_ITEMS, MultiblockAbility.IMPORT_FLUIDS,
+            MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.EXPORT_FLUIDS,
+            MultiblockAbility.INPUT_ENERGY
     };
 
     private int blastFurnaceTemperature;
@@ -63,7 +63,7 @@ public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder holder) {
     protected void addDisplayText(List textList) {
         if (isStructureFormed()) {
             textList.add(new TextComponentTranslation("gregtech.multiblock.blast_furnace.max_temperature", blastFurnaceTemperature)
-                .setStyle(new Style().setColor(TextFormatting.RED)));
+                    .setStyle(new Style().setColor(TextFormatting.RED)));
         }
         super.addDisplayText(textList);
     }
@@ -104,16 +104,16 @@ public static Predicate heatingCoilPredicate() {
     @Override
     protected BlockPattern createStructurePattern() {
         return FactoryBlockPattern.start()
-            .aisle("XXX", "CCC", "CCC", "XXX")
-            .aisle("XXX", "C#C", "C#C", "XXX")
-            .aisle("XSX", "CCC", "CCC", "XXX")
-            .setAmountAtLeast('L', 10)
-            .where('S', selfPredicate())
-            .where('L', statePredicate(getCasingState()))
-            .where('X', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
-            .where('C', heatingCoilPredicate())
-            .where('#', isAirPredicate())
-            .build();
+                .aisle("XXX", "CCC", "CCC", "XXX")
+                .aisle("XXX", "C#C", "C#C", "XXX")
+                .aisle("XSX", "CCC", "CCC", "XXX")
+                .setAmountAtLeast('L', 10)
+                .where('S', selfPredicate())
+                .where('L', statePredicate(getCasingState()))
+                .where('X', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
+                .where('C', heatingCoilPredicate())
+                .where('#', isAirPredicate())
+                .build();
     }
 
     protected IBlockState getCasingState() {
@@ -171,7 +171,7 @@ protected void setupRecipe(Recipe recipe) {
 
         protected int[] calculateOverclock(int EUt, long voltage, int duration, int recipeRequiredTemp) {
             if (!allowOverclocking) {
-                return new int[] {EUt, duration};
+                return new int[]{EUt, duration};
             }
             boolean negativeEU = EUt < 0;
 
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityImplosionCompressor.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityImplosionCompressor.java
index ec4d468a5bc..ed721c7211d 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityImplosionCompressor.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityImplosionCompressor.java
@@ -21,7 +21,7 @@
 public class MetaTileEntityImplosionCompressor extends RecipeMapMultiblockController {
 
     private static final MultiblockAbility[] ALLOWED_ABILITIES = {
-        MultiblockAbility.IMPORT_ITEMS, MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.INPUT_ENERGY
+            MultiblockAbility.IMPORT_ITEMS, MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.INPUT_ENERGY
     };
 
     public MetaTileEntityImplosionCompressor(ResourceLocation metaTileEntityId) {
@@ -36,16 +36,16 @@ public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder holder) {
     @Override
     protected BlockPattern createStructurePattern() {
         return FactoryBlockPattern.start()
-            .aisle("XXX", "XXX", "XXX")
-            .aisle("XXX", "X#X", "XXX")
-            .aisle("XXX", "XSX", "XXX")
-            .setAmountAtLeast('L', 14)
-            .where('S', selfPredicate())
-            .where('L', statePredicate(getCasingState()))
-            .where('X', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
-            .where('#', isAirPredicate())
-            .where('C', statePredicate(getCasingState()))
-            .build();
+                .aisle("XXX", "XXX", "XXX")
+                .aisle("XXX", "X#X", "XXX")
+                .aisle("XXX", "XSX", "XXX")
+                .setAmountAtLeast('L', 14)
+                .where('S', selfPredicate())
+                .where('L', statePredicate(getCasingState()))
+                .where('X', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
+                .where('#', isAirPredicate())
+                .where('C', statePredicate(getCasingState()))
+                .build();
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityMultiFurnace.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityMultiFurnace.java
index de81850fd4b..a6b167be7df 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityMultiFurnace.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityMultiFurnace.java
@@ -1,29 +1,43 @@
 package gregtech.common.metatileentities.multi.electric;
 
-import gregtech.api.capability.*;
-import gregtech.api.capability.impl.*;
-import gregtech.api.metatileentity.*;
-import gregtech.api.metatileentity.multiblock.*;
-import gregtech.api.multiblock.*;
-import gregtech.api.recipes.*;
-import gregtech.api.render.*;
-import gregtech.api.util.*;
-import gregtech.common.blocks.BlockMetalCasing.*;
-import gregtech.common.blocks.BlockWireCoil.*;
-import gregtech.common.blocks.*;
-import net.minecraft.block.state.*;
-import net.minecraft.item.*;
-import net.minecraft.util.*;
-import net.minecraft.util.text.*;
-import net.minecraftforge.items.*;
+import gregtech.api.capability.IMultipleTankHandler;
+import gregtech.api.capability.impl.MultiblockRecipeLogic;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.MetaTileEntityHolder;
+import gregtech.api.metatileentity.multiblock.IMultiblockPart;
+import gregtech.api.metatileentity.multiblock.MultiblockAbility;
+import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
+import gregtech.api.multiblock.BlockPattern;
+import gregtech.api.multiblock.FactoryBlockPattern;
+import gregtech.api.multiblock.PatternMatchContext;
+import gregtech.api.recipes.CountableIngredient;
+import gregtech.api.recipes.MatchingMode;
+import gregtech.api.recipes.Recipe;
+import gregtech.api.recipes.RecipeMaps;
+import gregtech.api.render.ICubeRenderer;
+import gregtech.api.render.OrientedOverlayRenderer;
+import gregtech.api.render.Textures;
+import gregtech.api.util.InventoryUtils;
+import gregtech.common.blocks.BlockMetalCasing.MetalCasingType;
+import gregtech.common.blocks.BlockWireCoil.CoilType;
+import gregtech.common.blocks.MetaBlocks;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentTranslation;
+import net.minecraftforge.items.IItemHandlerModifiable;
 
 import javax.annotation.Nonnull;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 public class MetaTileEntityMultiFurnace extends RecipeMapMultiblockController {
 
     private static final MultiblockAbility[] ALLOWED_ABILITIES = {
-        MultiblockAbility.IMPORT_ITEMS, MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.INPUT_ENERGY
+            MultiblockAbility.IMPORT_ITEMS, MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.INPUT_ENERGY
     };
 
     protected int heatingCoilLevel;
@@ -66,16 +80,16 @@ public void invalidateStructure() {
     @Override
     protected BlockPattern createStructurePattern() {
         return FactoryBlockPattern.start()
-            .aisle("XXX", "CCC", "XXX")
-            .aisle("XXX", "C#C", "XXX")
-            .aisle("XSX", "CCC", "XXX")
-            .setAmountAtLeast('L', 9)
-            .where('S', selfPredicate())
-            .where('L', statePredicate(getCasingState()))
-            .where('X', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
-            .where('C', MetaTileEntityElectricBlastFurnace.heatingCoilPredicate())
-            .where('#', isAirPredicate())
-            .build();
+                .aisle("XXX", "CCC", "XXX")
+                .aisle("XXX", "C#C", "XXX")
+                .aisle("XSX", "CCC", "XXX")
+                .setAmountAtLeast('L', 9)
+                .where('S', selfPredicate())
+                .where('L', statePredicate(getCasingState()))
+                .where('X', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
+                .where('C', MetaTileEntityElectricBlastFurnace.heatingCoilPredicate())
+                .where('#', isAirPredicate())
+                .build();
     }
 
     public IBlockState getCasingState() {
@@ -110,7 +124,7 @@ protected void trySearchNewRecipe() {
             //for MultiSmelter, we can reuse previous recipe if inputs didn't change
             //otherwise, we need to recompute it for new ingredients
             //but technically, it means we can cache multi smelter recipe, but changing inputs have more priority
-            if(dirty || forceRecipeRecheck) {
+            if (dirty || forceRecipeRecheck) {
                 this.forceRecipeRecheck = false;
                 //else, try searching new recipe for given inputs
                 currentRecipe = findRecipe(maxVoltage, importInventory, importFluids, MatchingMode.DEFAULT);
@@ -129,8 +143,7 @@ protected void trySearchNewRecipe() {
         @Override
         protected Recipe findRecipe(long maxVoltage,
                                     IItemHandlerModifiable inputs,
-                                    IMultipleTankHandler fluidInputs, MatchingMode mode)
-        {
+                                    IMultipleTankHandler fluidInputs, MatchingMode mode) {
             int currentItemsEngaged = 0;
             final int maxItemsLimit = 32 * heatingCoilLevel;
             final ArrayList recipeInputs = new ArrayList<>();
@@ -139,31 +152,31 @@ protected Recipe findRecipe(long maxVoltage,
             /* Iterate over the input items looking for more things to add until we run either out of input items
              * or we have exceeded the number of items permissible from the smelting bonus
              */
-            for(int index = 0; index < inputs.getSlots() && currentItemsEngaged < maxItemsLimit; index++) {
+            for (int index = 0; index < inputs.getSlots() && currentItemsEngaged < maxItemsLimit; index++) {
 
                 // Skip this slot if it is empty.
                 final ItemStack currentInputItem = inputs.getStackInSlot(index);
-                if(currentInputItem.isEmpty())
+                if (currentInputItem.isEmpty())
                     continue;
 
                 // Determine if there is a valid recipe for this item. If not, skip it.
                 Recipe matchingRecipe = recipeMap.findRecipe(maxVoltage,
-                                                             Collections.singletonList(currentInputItem),
-                                                             Collections.emptyList(), 0, MatchingMode.DEFAULT);
+                        Collections.singletonList(currentInputItem),
+                        Collections.emptyList(), 0, MatchingMode.DEFAULT);
                 CountableIngredient inputIngredient;
-                if(matchingRecipe != null)
+                if (matchingRecipe != null)
                     inputIngredient = matchingRecipe.getInputs().get(0);
                 else
                     continue;
 
                 // There's something not right with this recipe if the ingredient is null.
-                if(inputIngredient == null)
+                if (inputIngredient == null)
                     throw new IllegalStateException(
-                        String.format("Got recipe with null ingredient %s", matchingRecipe));
+                            String.format("Got recipe with null ingredient %s", matchingRecipe));
 
                 // If there are enough slots left to smelt this item stack
                 int itemsLeftUntilMax = (maxItemsLimit - currentItemsEngaged);
-                if(itemsLeftUntilMax >= inputIngredient.getCount()) {
+                if (itemsLeftUntilMax >= inputIngredient.getCount()) {
 
                     /* Choose the lesser of the number of possible crafts in this ingredient's stack, or the number of
                      * items remaining to reach the coil bonus's max smelted items.
@@ -182,7 +195,7 @@ protected Recipe findRecipe(long maxVoltage,
                     boolean canFitOutputs = InventoryUtils.simulateItemStackMerge(temp, this.getOutputInventory());
 
                     // if there isn't, we can't process this recipe.
-                    if(!canFitOutputs)
+                    if (!canFitOutputs)
                         break;
 
                     // otherwise, let's add the new output items and keep going
@@ -191,25 +204,25 @@ protected Recipe findRecipe(long maxVoltage,
 
                     // Add the ingredients to the list of things to smelt.
                     recipeInputs.add(new CountableIngredient(inputIngredient.getIngredient(),
-                                                             inputIngredient.getCount() * recipeMultiplier));
+                            inputIngredient.getCount() * recipeMultiplier));
 
                     currentItemsEngaged += inputIngredient.getCount() * recipeMultiplier;
                 }
             }
 
             // If there were no accepted ingredients, then there is no recipe to process.
-            if(recipeInputs.isEmpty()) {
+            if (recipeInputs.isEmpty()) {
                 //Set here to prevent recipe deadlock on world load with full output bus
                 forceRecipeRecheck = true;
                 return null;
             }
 
             return recipeMap.recipeBuilder()
-                .inputsIngredients(recipeInputs)
-                .outputs(recipeOutputs)
-                .EUt(Math.max(1, 16 / heatingCoilDiscount))
-                .duration((int) Math.max(1.0, 256 * (currentItemsEngaged / (maxItemsLimit * 1.0))))
-                .build().getResult();
+                    .inputsIngredients(recipeInputs)
+                    .outputs(recipeOutputs)
+                    .EUt(Math.max(1, 16 / heatingCoilDiscount))
+                    .duration((int) Math.max(1.0, 256 * (currentItemsEngaged / (maxItemsLimit * 1.0))))
+                    .build().getResult();
         }
 
         /**
@@ -223,9 +236,8 @@ protected Recipe findRecipe(long maxVoltage,
          */
         private void computeOutputItemStacks(Collection recipeOutputs,
                                              ItemStack outputStack,
-                                             int overclockAmount)
-        {
-            if(!outputStack.isEmpty()) {
+                                             int overclockAmount) {
+            if (!outputStack.isEmpty()) {
                 // number of output items we're generating
                 int finalAmount = outputStack.getCount() * overclockAmount;
 
@@ -239,14 +251,14 @@ private void computeOutputItemStacks(Collection recipeOutputs,
                 int remainder = finalAmount % maxCount;
 
                 // Add full stacks of the output item
-                for(int fullStacks = numStacks; fullStacks > 0; fullStacks--) {
+                for (int fullStacks = numStacks; fullStacks > 0; fullStacks--) {
                     ItemStack full = outputStack.copy();
                     full.setCount(maxCount);
                     recipeOutputs.add(full);
                 }
 
                 // if there is a partial stack, add it too
-                if(remainder > 0) {
+                if (remainder > 0) {
                     ItemStack partial = outputStack.copy();
                     partial.setCount(remainder);
                     recipeOutputs.add(partial);
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityPyrolyseOven.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityPyrolyseOven.java
index d8ebd637f59..f7cb6caf8ae 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityPyrolyseOven.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityPyrolyseOven.java
@@ -22,9 +22,9 @@
 public class MetaTileEntityPyrolyseOven extends RecipeMapMultiblockController {
 
     private static final MultiblockAbility[] ALLOWED_ABILITIES = {
-        MultiblockAbility.IMPORT_ITEMS, MultiblockAbility.IMPORT_FLUIDS,
-        MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.EXPORT_FLUIDS,
-        MultiblockAbility.INPUT_ENERGY
+            MultiblockAbility.IMPORT_ITEMS, MultiblockAbility.IMPORT_FLUIDS,
+            MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.EXPORT_FLUIDS,
+            MultiblockAbility.INPUT_ENERGY
     };
 
     public MetaTileEntityPyrolyseOven(ResourceLocation metaTileEntityId) {
@@ -39,15 +39,15 @@ public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder holder) {
     @Override
     protected BlockPattern createStructurePattern() {
         return FactoryBlockPattern.start()
-            .aisle("XXX", "XXX", "XXX")
-            .aisle("CCC", "C#C", "CCC")
-            .aisle("CCC", "C#C", "CCC")
-            .aisle("XXX", "XSX", "XXX")
-            .where('S', selfPredicate())
-            .where('X', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
-            .where('C', statePredicate(MetaBlocks.WIRE_COIL.getState(CoilType.CUPRONICKEL)))
-            .where('#', isAirPredicate())
-            .build();
+                .aisle("XXX", "XXX", "XXX")
+                .aisle("CCC", "C#C", "CCC")
+                .aisle("CCC", "C#C", "CCC")
+                .aisle("XXX", "XSX", "XXX")
+                .where('S', selfPredicate())
+                .where('X', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
+                .where('C', statePredicate(MetaBlocks.WIRE_COIL.getState(CoilType.CUPRONICKEL)))
+                .where('#', isAirPredicate())
+                .build();
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityVacuumFreezer.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityVacuumFreezer.java
index 9ce1d2b9dec..fe2b052eff0 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityVacuumFreezer.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityVacuumFreezer.java
@@ -21,9 +21,9 @@
 public class MetaTileEntityVacuumFreezer extends RecipeMapMultiblockController {
 
     private static final MultiblockAbility[] ALLOWED_ABILITIES = {
-        MultiblockAbility.IMPORT_ITEMS, MultiblockAbility.IMPORT_FLUIDS,
-        MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.EXPORT_FLUIDS,
-        MultiblockAbility.INPUT_ENERGY
+            MultiblockAbility.IMPORT_ITEMS, MultiblockAbility.IMPORT_FLUIDS,
+            MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.EXPORT_FLUIDS,
+            MultiblockAbility.INPUT_ENERGY
     };
 
     public MetaTileEntityVacuumFreezer(ResourceLocation metaTileEntityId) {
@@ -38,15 +38,15 @@ public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder holder) {
     @Override
     protected BlockPattern createStructurePattern() {
         return FactoryBlockPattern.start()
-            .aisle("XXX", "XXX", "XXX")
-            .aisle("XXX", "X#X", "XXX")
-            .aisle("XXX", "XSX", "XXX")
-            .setAmountAtLeast('L', 14)
-            .where('S', selfPredicate())
-            .where('L', statePredicate(getCasingState()))
-            .where('X', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
-            .where('#', isAirPredicate())
-            .build();
+                .aisle("XXX", "XXX", "XXX")
+                .aisle("XXX", "X#X", "XXX")
+                .aisle("XXX", "XSX", "XXX")
+                .setAmountAtLeast('L', 14)
+                .where('S', selfPredicate())
+                .where('L', statePredicate(getCasingState()))
+                .where('X', statePredicate(getCasingState()).or(abilityPartPredicate(ALLOWED_ABILITIES)))
+                .where('#', isAirPredicate())
+                .build();
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/FueledMultiblockController.java b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/FueledMultiblockController.java
index 13235a81fba..eacdb2e4a5c 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/FueledMultiblockController.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/FueledMultiblockController.java
@@ -36,8 +36,8 @@ public FueledMultiblockController(ResourceLocation metaTileEntityId, FuelRecipeM
 
     protected FuelRecipeLogic createWorkable(long maxVoltage) {
         return new FuelRecipeLogic(this, recipeMap,
-            () -> energyContainer,
-            () -> importFluidHandler, maxVoltage);
+                () -> energyContainer,
+                () -> importFluidHandler, maxVoltage);
     }
 
     @Override
@@ -91,13 +91,13 @@ protected boolean shouldUpdate(MTETrait trait) {
     protected boolean checkStructureComponents(List parts, Map, List> abilities) {
         //noinspection SuspiciousMethodCalls
         return abilities.containsKey(MultiblockAbility.IMPORT_FLUIDS) &&
-            abilities.containsKey(MultiblockAbility.OUTPUT_ENERGY);
+                abilities.containsKey(MultiblockAbility.OUTPUT_ENERGY);
     }
 
     @Override
     public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline) {
         super.renderMetaTileEntity(renderState, translation, pipeline);
         this.getFrontOverlay().render(renderState, translation, pipeline, getFrontFacing(),
-            isStructureFormed() && workableHandler.isActive());
+                isStructureFormed() && workableHandler.isActive());
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/LargeTurbineWorkableHandler.java b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/LargeTurbineWorkableHandler.java
index d9897e7163b..499e47df7ce 100755
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/LargeTurbineWorkableHandler.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/LargeTurbineWorkableHandler.java
@@ -21,7 +21,7 @@ public class LargeTurbineWorkableHandler extends FuelRecipeLogic {
 
     private static final int CYCLE_LENGTH = 230;
     private static final int BASE_ROTOR_DAMAGE = 11;
-    private static final int BASE_EU_OUTPUT = 2048;  
+    private static final int BASE_EU_OUTPUT = 2048;
 
     private final MetaTileEntityLargeTurbine largeTurbine;
     private int rotorCycleLength = CYCLE_LENGTH;
@@ -103,14 +103,18 @@ private void addOutputFluids(FuelRecipe currentRecipe, int fuelAmountUsed) {
     }
 
     private int getBonusForTurbineType(MetaTileEntityLargeTurbine turbine) {
-    	switch (turbine.turbineType) {
-		    case GAS: return ConfigHolder.gasTurbineBonusOutput;
-		    case PLASMA: return ConfigHolder.plasmaTurbineBonusOutput;
-		    case STEAM: return ConfigHolder.steamTurbineBonusOutput;
-		    default: return 1;
-    	}
+        switch (turbine.turbineType) {
+            case GAS:
+                return ConfigHolder.gasTurbineBonusOutput;
+            case PLASMA:
+                return ConfigHolder.plasmaTurbineBonusOutput;
+            case STEAM:
+                return ConfigHolder.steamTurbineBonusOutput;
+            default:
+                return 1;
+        }
     }
-    
+
     @Override
     public long getRecipeOutputVoltage() {
         MetaTileEntityRotorHolder rotorHolder = largeTurbine.getAbilities(MetaTileEntityLargeTurbine.ABILITY_ROTOR_HOLDER).get(0);
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeCombustionEngine.java b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeCombustionEngine.java
index 3a7f8b547bf..a888a8ed8ca 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeCombustionEngine.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeCombustionEngine.java
@@ -76,17 +76,17 @@ protected Predicate intakeCasingPredicate() {
     @Override
     protected BlockPattern createStructurePattern() {
         return FactoryBlockPattern.start()
-            .aisle("XXX", "XDX", "XXX")
-            .aisle("XHX", "HGH", "XHX")
-            .aisle("XHX", "HGH", "XHX")
-            .aisle("AAA", "AYA", "AAA")
-            .where('X', statePredicate(getCasingState()))
-            .where('G', statePredicate(MetaBlocks.TURBINE_CASING.getState(TurbineCasingType.TITANIUM_GEARBOX)))
-            .where('H', statePredicate(getCasingState()).or(abilityPartPredicate(MultiblockAbility.IMPORT_FLUIDS)))
-            .where('D', abilityPartPredicate(MultiblockAbility.OUTPUT_ENERGY))
-            .where('A', intakeCasingPredicate())
-            .where('Y', selfPredicate())
-            .build();
+                .aisle("XXX", "XDX", "XXX")
+                .aisle("XHX", "HGH", "XHX")
+                .aisle("XHX", "HGH", "XHX")
+                .aisle("AAA", "AYA", "AAA")
+                .where('X', statePredicate(getCasingState()))
+                .where('G', statePredicate(MetaBlocks.TURBINE_CASING.getState(TurbineCasingType.TITANIUM_GEARBOX)))
+                .where('H', statePredicate(getCasingState()).or(abilityPartPredicate(MultiblockAbility.IMPORT_FLUIDS)))
+                .where('D', abilityPartPredicate(MultiblockAbility.OUTPUT_ENERGY))
+                .where('A', intakeCasingPredicate())
+                .where('Y', selfPredicate())
+                .build();
     }
 
     public IBlockState getCasingState() {
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeTurbine.java b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeTurbine.java
index 10261384c3e..f10c7c03e47 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeTurbine.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeTurbine.java
@@ -37,7 +37,7 @@ public class MetaTileEntityLargeTurbine extends RotorHolderMultiblockController
     public enum TurbineType {
 
         STEAM(RecipeMaps.STEAM_TURBINE_FUELS, MetaBlocks.TURBINE_CASING.getState(TurbineCasingType.STEEL_TURBINE_CASING), MetaBlocks.TURBINE_CASING.getState(TurbineCasingType.STEEL_GEARBOX), Textures.SOLID_STEEL_CASING, true, Textures.LARGE_STEAM_TURBINE_OVERLAY),
-        GAS(RecipeMaps.GAS_TURBINE_FUELS, MetaBlocks.TURBINE_CASING.getState(TurbineCasingType.STAINLESS_TURBINE_CASING), MetaBlocks.TURBINE_CASING.getState(TurbineCasingType.STEEL_GEARBOX), Textures.CLEAN_STAINLESS_STEEL_CASING,false, Textures.LARGE_GAS_TURBINE_OVERLAY),
+        GAS(RecipeMaps.GAS_TURBINE_FUELS, MetaBlocks.TURBINE_CASING.getState(TurbineCasingType.STAINLESS_TURBINE_CASING), MetaBlocks.TURBINE_CASING.getState(TurbineCasingType.STEEL_GEARBOX), Textures.CLEAN_STAINLESS_STEEL_CASING, false, Textures.LARGE_GAS_TURBINE_OVERLAY),
         PLASMA(RecipeMaps.PLASMA_GENERATOR_FUELS, MetaBlocks.TURBINE_CASING.getState(TurbineCasingType.TUNGSTENSTEEL_TURBINE_CASING), MetaBlocks.TURBINE_CASING.getState(TurbineCasingType.STEEL_GEARBOX), Textures.ROBUST_TUNGSTENSTEEL_CASING, true, Textures.LARGE_PLASMA_TURBINE_OVERLAY);
 
         public final FuelRecipeMap recipeMap;
@@ -144,8 +144,9 @@ public MultiblockAbility[] getAllowedAbilities() {
                 new MultiblockAbility[]{MultiblockAbility.IMPORT_FLUIDS, MultiblockAbility.EXPORT_FLUIDS} :
                 new MultiblockAbility[]{MultiblockAbility.IMPORT_FLUIDS};
     }
+
     @Override
-    public boolean canShare(){
+    public boolean canShare() {
         return false;
 
     }
diff --git a/src/main/java/gregtech/common/metatileentities/steam/SteamAlloySmelter.java b/src/main/java/gregtech/common/metatileentities/steam/SteamAlloySmelter.java
index 1211dc37df3..e89739a8bdb 100644
--- a/src/main/java/gregtech/common/metatileentities/steam/SteamAlloySmelter.java
+++ b/src/main/java/gregtech/common/metatileentities/steam/SteamAlloySmelter.java
@@ -45,16 +45,16 @@ public IItemHandlerModifiable createExportItemHandler() {
     public ModularUI createUI(EntityPlayer player) {
         TextureArea slotBackground = getFullGuiTexture("slot_%s_furnace_background");
         return createUITemplate(player)
-            .widget(new SlotWidget(this.importItems, 0, 53, 25)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, slotBackground))
-            .widget(new SlotWidget(this.importItems, 1, 35, 25)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, slotBackground))
-            .widget(new ProgressWidget(workableHandler::getProgressPercent, 79, 26, 20, 16)
-                .setProgressBar(getFullGuiTexture("progress_bar_%s_furnace"),
-                    getFullGuiTexture("progress_bar_%s_furnace_filled"),
-                    MoveType.HORIZONTAL))
-            .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE))
-            .build(getHolder(), player);
+                .widget(new SlotWidget(this.importItems, 0, 53, 25)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, slotBackground))
+                .widget(new SlotWidget(this.importItems, 1, 35, 25)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, slotBackground))
+                .widget(new ProgressWidget(workableHandler::getProgressPercent, 79, 26, 20, 16)
+                        .setProgressBar(getFullGuiTexture("progress_bar_%s_furnace"),
+                                getFullGuiTexture("progress_bar_%s_furnace_filled"),
+                                MoveType.HORIZONTAL))
+                .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE))
+                .build(getHolder(), player);
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/steam/SteamCompressor.java b/src/main/java/gregtech/common/metatileentities/steam/SteamCompressor.java
index b6fe0c5d60b..13ba51831cc 100644
--- a/src/main/java/gregtech/common/metatileentities/steam/SteamCompressor.java
+++ b/src/main/java/gregtech/common/metatileentities/steam/SteamCompressor.java
@@ -38,14 +38,14 @@ public IItemHandlerModifiable createExportItemHandler() {
     @Override
     public ModularUI createUI(EntityPlayer player) {
         return createUITemplate(player)
-            .widget(new SlotWidget(this.importItems, 0, 53, 25)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("slot_%s_compressor_background")))
-            .widget(new ProgressWidget(workableHandler::getProgressPercent, 78, 25, 20, 18)
-                .setProgressBar(getFullGuiTexture("progress_bar_%s_compressor"),
-                    getFullGuiTexture("progress_bar_%s_compressor_filled"),
-                    MoveType.HORIZONTAL))
-            .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE))
-            .build(getHolder(), player);
+                .widget(new SlotWidget(this.importItems, 0, 53, 25)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("slot_%s_compressor_background")))
+                .widget(new ProgressWidget(workableHandler::getProgressPercent, 78, 25, 20, 18)
+                        .setProgressBar(getFullGuiTexture("progress_bar_%s_compressor"),
+                                getFullGuiTexture("progress_bar_%s_compressor_filled"),
+                                MoveType.HORIZONTAL))
+                .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE))
+                .build(getHolder(), player);
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/steam/SteamExtractor.java b/src/main/java/gregtech/common/metatileentities/steam/SteamExtractor.java
index 80e8d132b65..02174e5a6dc 100644
--- a/src/main/java/gregtech/common/metatileentities/steam/SteamExtractor.java
+++ b/src/main/java/gregtech/common/metatileentities/steam/SteamExtractor.java
@@ -37,14 +37,14 @@ public IItemHandlerModifiable createExportItemHandler() {
     @Override
     public ModularUI createUI(EntityPlayer player) {
         return createUITemplate(player)
-            .widget(new SlotWidget(this.importItems, 0, 53, 25)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("slot_%s_extractor_background")))
-            .widget(new ProgressWidget(workableHandler::getProgressPercent, 79, 25, 20, 18)
-                .setProgressBar(getFullGuiTexture("progress_bar_%s_extractor"),
-                    getFullGuiTexture("progress_bar_%s_extractor_filled"),
-                    ProgressWidget.MoveType.HORIZONTAL))
-            .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE))
-            .build(getHolder(), player);
+                .widget(new SlotWidget(this.importItems, 0, 53, 25)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("slot_%s_extractor_background")))
+                .widget(new ProgressWidget(workableHandler::getProgressPercent, 79, 25, 20, 18)
+                        .setProgressBar(getFullGuiTexture("progress_bar_%s_extractor"),
+                                getFullGuiTexture("progress_bar_%s_extractor_filled"),
+                                ProgressWidget.MoveType.HORIZONTAL))
+                .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE))
+                .build(getHolder(), player);
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/steam/SteamFurnace.java b/src/main/java/gregtech/common/metatileentities/steam/SteamFurnace.java
index 781f9eb01e1..1e42b622935 100644
--- a/src/main/java/gregtech/common/metatileentities/steam/SteamFurnace.java
+++ b/src/main/java/gregtech/common/metatileentities/steam/SteamFurnace.java
@@ -43,14 +43,14 @@ public IItemHandlerModifiable createExportItemHandler() {
     @Override
     public ModularUI createUI(EntityPlayer player) {
         return createUITemplate(player)
-            .widget(new SlotWidget(this.importItems, 0, 53, 25)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("slot_%s_furnace_background")))
-            .widget(new ProgressWidget(workableHandler::getProgressPercent, 79, 26, 20, 16)
-                .setProgressBar(getFullGuiTexture("progress_bar_%s_furnace"),
-                    getFullGuiTexture("progress_bar_%s_furnace_filled"),
-                    MoveType.HORIZONTAL))
-            .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE))
-            .build(getHolder(), player);
+                .widget(new SlotWidget(this.importItems, 0, 53, 25)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("slot_%s_furnace_background")))
+                .widget(new ProgressWidget(workableHandler::getProgressPercent, 79, 26, 20, 16)
+                        .setProgressBar(getFullGuiTexture("progress_bar_%s_furnace"),
+                                getFullGuiTexture("progress_bar_%s_furnace_filled"),
+                                MoveType.HORIZONTAL))
+                .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE))
+                .build(getHolder(), player);
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/steam/SteamHammer.java b/src/main/java/gregtech/common/metatileentities/steam/SteamHammer.java
index ff916dfa0db..0af37c20400 100644
--- a/src/main/java/gregtech/common/metatileentities/steam/SteamHammer.java
+++ b/src/main/java/gregtech/common/metatileentities/steam/SteamHammer.java
@@ -38,16 +38,16 @@ public IItemHandlerModifiable createExportItemHandler() {
     @Override
     public ModularUI createUI(EntityPlayer player) {
         return createUITemplate(player)
-            .widget(new SlotWidget(this.importItems, 0, 53, 25)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("slot_%s_hammer_background")))
-            .widget(new ProgressWidget(workableHandler::getProgressPercent, 79, 25, 20, 18)
-                .setProgressBar(getFullGuiTexture("progress_bar_%s_hammer"),
-                    getFullGuiTexture("progress_bar_%s_hammer_filled"),
-                    ProgressWidget.MoveType.VERTICAL))
-            .widget(new ImageWidget(79, 41, 20, 18)
-                .setImage(getFullGuiTexture("overlay_%s_hammer_base")))
-            .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE))
-            .build(getHolder(), player);
+                .widget(new SlotWidget(this.importItems, 0, 53, 25)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("slot_%s_hammer_background")))
+                .widget(new ProgressWidget(workableHandler::getProgressPercent, 79, 25, 20, 18)
+                        .setProgressBar(getFullGuiTexture("progress_bar_%s_hammer"),
+                                getFullGuiTexture("progress_bar_%s_hammer_filled"),
+                                ProgressWidget.MoveType.VERTICAL))
+                .widget(new ImageWidget(79, 41, 20, 18)
+                        .setImage(getFullGuiTexture("overlay_%s_hammer_base")))
+                .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE))
+                .build(getHolder(), player);
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/steam/SteamMacerator.java b/src/main/java/gregtech/common/metatileentities/steam/SteamMacerator.java
index 580350ae342..29e4264a570 100644
--- a/src/main/java/gregtech/common/metatileentities/steam/SteamMacerator.java
+++ b/src/main/java/gregtech/common/metatileentities/steam/SteamMacerator.java
@@ -19,7 +19,7 @@ public class SteamMacerator extends SteamMetaTileEntity {
     public SteamMacerator(ResourceLocation metaTileEntityId, boolean isHighPressure) {
         super(metaTileEntityId, RecipeMaps.MACERATOR_RECIPES, Textures.MACERATOR_OVERLAY, isHighPressure);
         this.workableHandler = new RecipeLogicSteam(this,
-            workableHandler.recipeMap, isHighPressure, steamFluidTank, 1.0);
+                workableHandler.recipeMap, isHighPressure, steamFluidTank, 1.0);
     }
 
     @Override
@@ -40,14 +40,14 @@ public IItemHandlerModifiable createExportItemHandler() {
     @Override
     public ModularUI createUI(EntityPlayer player) {
         return createUITemplate(player)
-            .widget(new SlotWidget(this.importItems, 0, 53, 25)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("slot_%s_macerator_background")))
-            .widget(new ProgressWidget(workableHandler::getProgressPercent, 79, 26, 21, 18)
-                .setProgressBar(getFullGuiTexture("progress_bar_%s_macerator"),
-                    getFullGuiTexture("progress_bar_%s_macerator_filled"),
-                    ProgressWidget.MoveType.HORIZONTAL))
-            .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("overlay_%s_dust")))
-            .build(getHolder(), player);
+                .widget(new SlotWidget(this.importItems, 0, 53, 25)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("slot_%s_macerator_background")))
+                .widget(new ProgressWidget(workableHandler::getProgressPercent, 79, 26, 21, 18)
+                        .setProgressBar(getFullGuiTexture("progress_bar_%s_macerator"),
+                                getFullGuiTexture("progress_bar_%s_macerator_filled"),
+                                ProgressWidget.MoveType.HORIZONTAL))
+                .widget(new SlotWidget(this.exportItems, 0, 107, 25, true, false)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getFullGuiTexture("overlay_%s_dust")))
+                .build(getHolder(), player);
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java
index 05f287d7b4d..d6bd965a379 100644
--- a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java
+++ b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java
@@ -158,7 +158,7 @@ public void update() {
             generateSteam();
 
             fillInternalTankFromFluidContainer(containerInventory, containerInventory, 0, 1);
-            
+
             if (getOffsetTimer() % 5 == 0) {
                 pushFluidsIntoNearbyHandlers(STEAM_PUSH_DIRECTIONS);
             }
@@ -199,7 +199,7 @@ private void updateCurrentTemperature() {
     }
 
     private void generateSteam() {
-        if(currentTemperature >= 100) {
+        if (currentTemperature >= 100) {
             if (getOffsetTimer() % getBoilingCycleLength() == 0) {
                 int fillAmount = (int) (baseSteamOutput * (currentTemperature / (getMaxTemperate() * 1.0)));
                 boolean hasDrainedWater = waterFluidTank.drain(1, true) != null;
@@ -210,12 +210,12 @@ private void generateSteam() {
                 if (this.hasNoWater && hasDrainedWater) {
                     getWorld().setBlockToAir(getPos());
                     getWorld().createExplosion(null,
-                        getPos().getX() + 0.5, getPos().getY() + 0.5, getPos().getZ() + 0.5,
-                        2.0f, true);
+                            getPos().getX() + 0.5, getPos().getY() + 0.5, getPos().getZ() + 0.5,
+                            2.0f, true);
                 } else this.hasNoWater = !hasDrainedWater;
                 if (filledSteam == 0 && hasDrainedWater) {
                     getWorld().playSound(null, getPos().getX() + 0.5, getPos().getY() + 0.5, getPos().getZ() + 0.5,
-                        SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.BLOCKS, 1.0f, 1.0f);
+                            SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.BLOCKS, 1.0f, 1.0f);
                     steamFluidTank.drain(4000, true);
                 }
             }
@@ -265,31 +265,31 @@ protected FluidTankList createExportFluidHandler() {
     protected TextureArea getGuiTexture(String pathTemplate) {
         String type = isHighPressure ? "steel" : "bronze";
         return TextureArea.fullImage(String.format("textures/gui/steam/%s/%s.png",
-            type, pathTemplate.replace("%s", type)));
+                type, pathTemplate.replace("%s", type)));
     }
 
     public ModularUI.Builder createUITemplate(EntityPlayer player) {
         return ModularUI.builder(BRONZE_BACKGROUND_TEXTURE, 176, 166)
-            .widget(new LabelWidget(6, 6, getMetaFullName()))
-
-            .widget(new ProgressWidget(this::getTemperaturePercent, 96, 26, 10, 54)
-                .setProgressBar(getGuiTexture("bar_%s_empty"),
-                    getGuiTexture("bar_heat"),
-                    MoveType.VERTICAL))
-
-            .widget(new TankWidget(waterFluidTank, 83, 26, 10, 54)
-                .setBackgroundTexture(getGuiTexture("bar_%s_empty")))
-            .widget(new TankWidget(steamFluidTank, 70, 26, 10, 54)
-                .setBackgroundTexture(getGuiTexture("bar_%s_empty")))
-
-            .widget(new FluidContainerSlotWidget(containerInventory, 0, 43, 26, true)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getGuiTexture("overlay_%s_in")))
-            .widget(new SlotWidget(containerInventory, 1, 43, 62, true, false)
-                .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getGuiTexture("overlay_%s_out")))
-            .widget(new ImageWidget(43, 44, 18, 18)
-                .setImage(getGuiTexture("overlay_%s_fluid_container")))
-
-            .bindPlayerInventory(player.inventory, BRONZE_SLOT_BACKGROUND_TEXTURE, 0);
+                .widget(new LabelWidget(6, 6, getMetaFullName()))
+
+                .widget(new ProgressWidget(this::getTemperaturePercent, 96, 26, 10, 54)
+                        .setProgressBar(getGuiTexture("bar_%s_empty"),
+                                getGuiTexture("bar_heat"),
+                                MoveType.VERTICAL))
+
+                .widget(new TankWidget(waterFluidTank, 83, 26, 10, 54)
+                        .setBackgroundTexture(getGuiTexture("bar_%s_empty")))
+                .widget(new TankWidget(steamFluidTank, 70, 26, 10, 54)
+                        .setBackgroundTexture(getGuiTexture("bar_%s_empty")))
+
+                .widget(new FluidContainerSlotWidget(containerInventory, 0, 43, 26, true)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getGuiTexture("overlay_%s_in")))
+                .widget(new SlotWidget(containerInventory, 1, 43, 62, true, false)
+                        .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE, getGuiTexture("overlay_%s_out")))
+                .widget(new ImageWidget(43, 44, 18, 18)
+                        .setImage(getGuiTexture("overlay_%s_fluid_container")))
+
+                .bindPlayerInventory(player.inventory, BRONZE_SLOT_BACKGROUND_TEXTURE, 0);
     }
 
     private int getBoilingCycleLength() {
diff --git a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamSolarBoiler.java b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamSolarBoiler.java
index 9faa543d632..3d44d8a9fa3 100644
--- a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamSolarBoiler.java
+++ b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamSolarBoiler.java
@@ -38,9 +38,9 @@ protected void tryConsumeNewFuel() {
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         return createUITemplate(entityPlayer)
-            .widget(new ProgressWidget(() -> checkCanSeeSun() ? 1.0 : 0.0, 114, 44, 20, 20)
-                .setProgressBar(getGuiTexture("boiler_sun"),
-                    getGuiTexture("boiler_sun_active"), MoveType.HORIZONTAL))
-            .build(getHolder(), entityPlayer);
+                .widget(new ProgressWidget(() -> checkCanSeeSun() ? 1.0 : 0.0, 114, 44, 20, 20)
+                        .setProgressBar(getGuiTexture("boiler_sun"),
+                                getGuiTexture("boiler_sun_active"), MoveType.HORIZONTAL))
+                .build(getHolder(), entityPlayer);
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java b/src/main/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java
index ffe6dc100fb..e2ac1f3d5da 100644
--- a/src/main/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java
+++ b/src/main/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java
@@ -86,7 +86,7 @@ public void clearMachineInventory(NonNullList itemBuffer) {
     @Override
     public void update() {
         super.update();
-        if(!getWorld().isRemote) {
+        if (!getWorld().isRemote) {
             fillContainerFromInternalTank(containerInventory, containerInventory, 0, 1);
             fillInternalTankFromFluidContainer(containerInventory, containerInventory, 0, 1);
             pullFluidsFromNearbyHandlers(getFrontFacing());
@@ -108,13 +108,13 @@ public void pullFluidsFromNearbyHandlers(EnumFacing... allowedFaces) {
         EnumFacing[] AllowedFaces = allowedFaces;
         int length = allowedFaces.length;
 
-        for(int i = 0; i < length; ++i) {
+        for (int i = 0; i < length; ++i) {
             EnumFacing nearbyFacing = AllowedFaces[i];
             blockPos.setPos(this.getPos()).move(nearbyFacing);
             TileEntity tileEntity = this.getWorld().getTileEntity(blockPos);
             if (tileEntity != null) {
-                IFluidHandler fluidHandler = (IFluidHandler)tileEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, nearbyFacing.getOpposite());
-                IFluidHandler myFluidHandler = (IFluidHandler)this.getCoverCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, nearbyFacing);
+                IFluidHandler fluidHandler = (IFluidHandler) tileEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, nearbyFacing.getOpposite());
+                IFluidHandler myFluidHandler = (IFluidHandler) this.getCoverCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, nearbyFacing);
                 if (fluidHandler != null && myFluidHandler != null && ModHandler.isSteam(fluidHandler.drain(1, false))) {
                     GTFluidUtils.transferFluids(fluidHandler, myFluidHandler, 2147483647);
                 }
diff --git a/src/main/java/gregtech/common/metatileentities/storage/CachedRecipeData.java b/src/main/java/gregtech/common/metatileentities/storage/CachedRecipeData.java
index 21a3f2409b5..f1830831f9f 100755
--- a/src/main/java/gregtech/common/metatileentities/storage/CachedRecipeData.java
+++ b/src/main/java/gregtech/common/metatileentities/storage/CachedRecipeData.java
@@ -113,7 +113,7 @@ private boolean getIngredientEquivalent(int slot) {
             //update item in slot, and check that recipe matches and output item is equal to the expected one
             inventory.setInventorySlotContents(slot, itemStack);
             if (recipe.matches(inventory, itemSourceList.getWorld()) &&
-                ItemStack.areItemStacksEqual(expectedOutput, recipe.getCraftingResult(inventory))) {
+                    ItemStack.areItemStacksEqual(expectedOutput, recipe.getCraftingResult(inventory))) {
                 //ingredient matched, attempt to extract it and return if successful
                 if (simulateExtractItem(itemStackKey)) {
                     return true;
diff --git a/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeMemory.java b/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeMemory.java
index 728a3bc0807..3536eab9d60 100644
--- a/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeMemory.java
+++ b/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeMemory.java
@@ -42,7 +42,7 @@ public MemorizedRecipe getRecipeAtIndex(int index) {
 
     private boolean isNullOrUnlockedRecipe(int index) {
         return memorizedRecipes[index] == null ||
-            !memorizedRecipes[index].recipeLocked;
+                !memorizedRecipes[index].recipeLocked;
     }
 
     private void insertRecipe(MemorizedRecipe insertedRecipe, int startIndex) {
@@ -58,15 +58,15 @@ private void insertRecipe(MemorizedRecipe insertedRecipe, int startIndex) {
 
     private MemorizedRecipe findOrCreateRecipe(ItemStack itemStack) {
         Optional result = Arrays.stream(memorizedRecipes)
-            .filter(Objects::nonNull)
-            .filter(recipe -> ItemStack.areItemStacksEqual(recipe.recipeResult, itemStack))
-            .findFirst();
+                .filter(Objects::nonNull)
+                .filter(recipe -> ItemStack.areItemStacksEqual(recipe.recipeResult, itemStack))
+                .findFirst();
         return result.orElseGet(() -> {
             MemorizedRecipe recipe = new MemorizedRecipe();
             recipe.recipeResult = itemStack.copy();
             int firstFreeIndex = GTUtility.indices(memorizedRecipes)
-                .filter(this::isNullOrUnlockedRecipe)
-                .findFirst().orElse(-1);
+                    .filter(this::isNullOrUnlockedRecipe)
+                    .findFirst().orElse(-1);
             if (firstFreeIndex == -1) {
                 return null;
             }
diff --git a/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeResolver.java b/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeResolver.java
index 12b771907f5..7c741171bf5 100644
--- a/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeResolver.java
+++ b/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeResolver.java
@@ -76,7 +76,7 @@ private boolean updateInventoryCrafting() {
             ItemStack craftingGridStack = craftingGrid.getStackInSlot(i);
             ItemStack inventoryCraftingStack = inventoryCrafting.getStackInSlot(i);
             if (!ItemStack.areItemsEqual(craftingGridStack, inventoryCraftingStack) ||
-                !ItemStack.areItemStackTagsEqual(craftingGridStack, inventoryCraftingStack)) {
+                    !ItemStack.areItemStackTagsEqual(craftingGridStack, inventoryCraftingStack)) {
                 inventoryCrafting.setInventorySlotContents(i, craftingGridStack.copy());
                 craftingGridChanged = true;
             }
diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLockedSafe.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLockedSafe.java
index f6a25e318db..b0f1404e72f 100644
--- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLockedSafe.java
+++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLockedSafe.java
@@ -52,7 +52,7 @@
 import java.util.function.DoubleSupplier;
 
 public class MetaTileEntityLockedSafe extends MetaTileEntity implements IFastRenderMetaTileEntity {
-    
+
     private static final int MAX_UNLOCK_PROGRESS = 100;
     private static Component[] ALLOWED_COMPONENTS;
     private static final IndexedCuboid6 COLLISION_BOX = new IndexedCuboid6(null, new Cuboid6(3 / 16.0, 0 / 16.0, 3 / 16.0, 13 / 16.0, 14 / 16.0, 13 / 16.0));
@@ -87,7 +87,7 @@ protected void onContentsChanged(int slot) {
     private final ItemStackHandler safeLootInventory = new ItemStackHandler(27);
     private float doorAngle = 0.0f;
     private float prevDoorAngle = 0.0f;
-        
+
     public MetaTileEntityLockedSafe(ResourceLocation metaTileEntityId) {
         super(metaTileEntityId);
     }
@@ -155,9 +155,9 @@ private CountableIngredient[] getUnlockComponents() {
             ALLOWED_COMPONENTS = new Component[]{CraftingComponent.PUMP, CraftingComponent.CONVEYOR, CraftingComponent.EMITTER, CraftingComponent.SENSOR};
 
         Random random = new Random(unlockComponentsSeed);
-        return new CountableIngredient[] {
-            new CountableIngredient(createIngredient(CraftingComponent.CIRCUIT.getIngredient(unlockComponentTier)), 1),
-            new CountableIngredient(createIngredient(ALLOWED_COMPONENTS[random.nextInt(ALLOWED_COMPONENTS.length)].getIngredient(unlockComponentTier)), 1)
+        return new CountableIngredient[]{
+                new CountableIngredient(createIngredient(CraftingComponent.CIRCUIT.getIngredient(unlockComponentTier)), 1),
+                new CountableIngredient(createIngredient(ALLOWED_COMPONENTS[random.nextInt(ALLOWED_COMPONENTS.length)].getIngredient(unlockComponentTier)), 1)
         };
     }
 
@@ -176,7 +176,7 @@ private static ItemStack getItemStackForIngredient(CountableIngredient ingredien
 
     private void recheckUnlockItemsAndUnlock() {
         if (getWorld() != null && !getWorld().isRemote && !isSafeUnlocked() &&
-            checkUnlockedItems() && unlockProgress == -1) {
+                checkUnlockedItems() && unlockProgress == -1) {
             this.unlockProgress++;
             markDirty();
         }
@@ -247,7 +247,7 @@ private void generateChestContents() {
     private void updateOpenVisualAnimation() {
         this.prevDoorAngle = doorAngle;
         if ((!isSafeUnlocked && this.doorAngle > 0.0F) ||
-            (isSafeUnlocked && this.doorAngle < 1.0F)) {
+                (isSafeUnlocked && this.doorAngle < 1.0F)) {
             if (isSafeUnlocked) {
                 this.doorAngle += 0.1F;
             } else {
@@ -356,7 +356,7 @@ public void renderMetaTileEntityFast(CCRenderState renderState, Matrix4 translat
         float angle = prevDoorAngle + (doorAngle - prevDoorAngle) * partialTicks;
         angle = 1.0f - (1.0f - angle) * (1.0f - angle) * (1.0f - angle);
         float resultDoorAngle = angle * 120.0f;
-        Textures.SAFE.render(renderState, translation, new IVertexOperation[] { colourMultiplier }, getFrontFacing(), resultDoorAngle);
+        Textures.SAFE.render(renderState, translation, new IVertexOperation[]{colourMultiplier}, getFrontFacing(), resultDoorAngle);
     }
 
     @Override
@@ -383,10 +383,10 @@ public AxisAlignedBB getRenderBoundingBox() {
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         DoubleSupplier supplier = () -> 0.2 + (unlockProgress / (MAX_UNLOCK_PROGRESS * 1.0)) * 0.8;
         ModularUI.Builder builder = ModularUI.defaultBuilder()
-            .widget(new ProgressWidget(supplier, 5, 5, 166, 74,
-                GuiTextures.PROGRESS_BAR_UNLOCK,
-                MoveType.VERTICAL_INVERTED))
-            .bindPlayerInventory(entityPlayer.inventory);
+                .widget(new ProgressWidget(supplier, 5, 5, 166, 74,
+                        GuiTextures.PROGRESS_BAR_UNLOCK,
+                        MoveType.VERTICAL_INVERTED))
+                .bindPlayerInventory(entityPlayer.inventory);
 
         ServerWidgetGroup lockedGroup = new ServerWidgetGroup(() -> !isSafeUnlocked && unlockProgress < 0);
         lockedGroup.addWidget(new LabelWidget(5, 20, "gregtech.machine.locked_safe.malfunctioning"));
@@ -402,12 +402,12 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
         for (int row = 0; row < 3; row++) {
             for (int col = 0; col < 9; col++) {
                 unlockedGroup.addWidget(new SlotWidget(safeLootInventory, col + row * 9,
-                    8 + col * 18, 15 + row * 18, true, false));
+                        8 + col * 18, 15 + row * 18, true, false));
             }
         }
 
         return builder.widget(unlockedGroup)
-            .widget(lockedGroup)
-            .build(getHolder(), entityPlayer);
+                .widget(lockedGroup)
+                .build(getHolder(), entityPlayer);
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java
index 55fe398c693..a7b235d9be4 100644
--- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java
+++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java
@@ -45,7 +45,7 @@
 import javax.annotation.Nullable;
 import java.util.List;
 
-public class MetaTileEntityQuantumChest extends MetaTileEntity implements ITieredMetaTileEntity,IActiveOutputSide {
+public class MetaTileEntityQuantumChest extends MetaTileEntity implements ITieredMetaTileEntity, IActiveOutputSide {
 
 
     private final int tier;
@@ -251,6 +251,7 @@ public void writeItemStackData(NBTTagCompound itemStack) {
         this.itemsStoredInside = 0;
         exportItems.setStackInSlot(0, ItemStack.EMPTY);
     }
+
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         Builder builder = ModularUI.defaultBuilder();
@@ -271,6 +272,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
     public EnumFacing getOutputFacing() {
         return outputFacing == null ? EnumFacing.SOUTH : outputFacing;
     }
+
     public void setOutputFacing(EnumFacing outputFacing) {
         this.outputFacing = outputFacing;
         if (!getWorld().isRemote) {
@@ -347,7 +349,7 @@ public  T getCapability(Capability capability, EnumFacing side) {
     @Override
     public boolean canPlaceCoverOnSide(EnumFacing side) {
         //Done to prevent loops as output always acts as input
-        if (side == getOutputFacing()){
+        if (side == getOutputFacing()) {
             return false;
         }
         return true;
@@ -427,7 +429,7 @@ public ItemStack extractItem(int slot, int amount, boolean simulate) {
         @Nonnull
         @Override
         public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) {
-            if(stack.isEmpty()) {
+            if (stack.isEmpty()) {
                 return ItemStack.EMPTY;
             }
             if (itemsStoredInside > 0L &&
@@ -442,7 +444,7 @@ public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate
                 return stack;
             }
             ItemStack remainingStack = ItemStack.EMPTY;
-            if(stack.getCount() > insertedAmount) {
+            if (stack.getCount() > insertedAmount) {
                 remainingStack = stack.copy();
                 remainingStack.setCount(stack.getCount() - insertedAmount);
                 return ItemStack.EMPTY;
diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumTank.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumTank.java
index 59f924c7dcf..d05adb16972 100644
--- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumTank.java
+++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumTank.java
@@ -211,6 +211,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
                 .bindPlayerInventory(entityPlayer.inventory)
                 .build(getHolder(), entityPlayer);
     }
+
     @Override
     public void writeInitialSyncData(PacketBuffer buf) {
         super.writeInitialSyncData(buf);
@@ -260,6 +261,7 @@ public void receiveInitialSyncData(PacketBuffer buf) {
         this.outputFacing = EnumFacing.VALUES[buf.readByte()];
         this.autoOutputFluids = buf.readBoolean();
     }
+
     public void setOutputFacing(EnumFacing outputFacing) {
         this.outputFacing = outputFacing;
         if (!getWorld().isRemote) {
@@ -284,7 +286,7 @@ public  T getCapability(Capability capability, EnumFacing side) {
     @Override
     public boolean canPlaceCoverOnSide(EnumFacing side) {
         //Done to prevent loops as output always acts as input
-        if (side == getOutputFacing()){
+        if (side == getOutputFacing()) {
             return false;
         }
         return true;
@@ -311,6 +313,4 @@ public void setAutoOutputFluids(boolean autoOutputFluids) {
     }
 
 
-
-
 }
diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityTank.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityTank.java
index 66690212c25..4121b6794a6 100644
--- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityTank.java
+++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityTank.java
@@ -248,9 +248,9 @@ private MetaTileEntityTank getTankTile(BlockPos blockPos) {
         }
         MetaTileEntityTank metaTileEntityTank = (MetaTileEntityTank) metaTileEntity;
         if (metaTileEntityTank.isRemoved ||
-            metaTileEntityTank.material != material ||
-            metaTileEntityTank.tankSize != tankSize ||
-            !isTankFluidEqual(metaTileEntityTank, this)) {
+                metaTileEntityTank.material != material ||
+                metaTileEntityTank.tankSize != tankSize ||
+                !isTankFluidEqual(metaTileEntityTank, this)) {
             return null;
         }
         return metaTileEntityTank;
@@ -264,7 +264,7 @@ private FluidTank getActualFluidTank() {
         if (controllerPos != null) {
             MetaTileEntityTank metaTileEntityTank = getControllerEntity();
             return metaTileEntityTank == null ? new FluidTank(0) :
-                metaTileEntityTank.getActualFluidTank();
+                    metaTileEntityTank.getActualFluidTank();
         } else {
             return multiblockFluidTank;
         }
@@ -309,7 +309,7 @@ private void recomputeTankSizeNow(boolean allowShrinking) {
         int newCapacity = (connectedTanks.size() + 1) * tankSize;
         this.multiblockFluidTank.setCapacity(newCapacity);
         if (allowShrinking && multiblockFluidTank.getFluid() != null &&
-            multiblockFluidTank.getFluidAmount() > multiblockFluidTank.getCapacity()) {
+                multiblockFluidTank.getFluidAmount() > multiblockFluidTank.getCapacity()) {
             multiblockFluidTank.getFluid().amount = multiblockFluidTank.getCapacity();
         }
     }
@@ -425,7 +425,7 @@ private static boolean isTankFluidEqual(MetaTileEntityTank tank1, MetaTileEntity
 
     private static boolean canTanksConnect(MetaTileEntityTank tank1, MetaTileEntityTank tank2, EnumFacing side) {
         return side == null || ((tank1.blockedSides & 1 << side.getIndex()) <= 0 &&
-            (tank2.blockedSides & 1 << side.getOpposite().getIndex()) <= 0);
+                (tank2.blockedSides & 1 << side.getOpposite().getIndex()) <= 0);
     }
 
     @Override
@@ -616,8 +616,8 @@ private TankRenderer getTankRenderer() {
     @SideOnly(Side.CLIENT)
     private int getActualPaintingColor() {
         int color = ColourRGBA.multiply(
-            GTUtility.convertRGBtoOpaqueRGBA_CL(material.getMaterialRGB()),
-            GTUtility.convertRGBtoOpaqueRGBA_CL(getPaintingColorForRendering())
+                GTUtility.convertRGBtoOpaqueRGBA_CL(material.getMaterialRGB()),
+                GTUtility.convertRGBtoOpaqueRGBA_CL(getPaintingColorForRendering())
         );
         color = convertOpaqueRGBA_CLtoRGB(color);
         return color;
@@ -727,8 +727,8 @@ public void readFromNBT(NBTTagCompound data) {
 
     protected boolean canFillFluidType(FluidStack fluid) {
         return !ModHandler.isMaterialWood(material) &&
-            !material.hasFlag(FLAMMABLE) ||
-            fluid.getFluid().getTemperature(fluid) <= 325;
+                !material.hasFlag(FLAMMABLE) ||
+                fluid.getFluid().getTemperature(fluid) <= 325;
     }
 
     @Override
@@ -795,9 +795,9 @@ private static Map findConnectedTanks(MetaTileEnti
                 currentPos.move(facing);
                 MetaTileEntityTank metaTileEntity;
                 if (!visitedSet.contains(currentPos) &&
-                    !observedSet.containsKey(currentPos) &&
-                    (metaTileEntity = tank.getTankTile(currentPos)) != null &&
-                    canTanksConnect(firstNode, metaTileEntity, facing)) {
+                        !observedSet.containsKey(currentPos) &&
+                        (metaTileEntity = tank.getTankTile(currentPos)) != null &&
+                        canTanksConnect(firstNode, metaTileEntity, facing)) {
                     observedSet.put(metaTileEntity.getPos(), metaTileEntity);
                     visitedSet.add(metaTileEntity.getPos());
                     firstNode = metaTileEntity;
diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java
index 5110137b0df..c8b71f494dd 100644
--- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java
+++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java
@@ -196,7 +196,7 @@ private AbstractWidgetGroup createItemListTab() {
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         Builder builder = ModularUI.builder(GuiTextures.BORDERED_BACKGROUND, 176, 221)
-            .bindPlayerInventory(entityPlayer.inventory, 140);
+                .bindPlayerInventory(entityPlayer.inventory, 140);
         builder.label(5, 5, getMetaFullName());
 
         TabGroup tabGroup = new TabGroup(TabLocation.HORIZONTAL_TOP_LEFT, Position.ORIGIN);
diff --git a/src/main/java/gregtech/common/pipelike/cable/BlockCable.java b/src/main/java/gregtech/common/pipelike/cable/BlockCable.java
index 5fa5d24c410..c1f2d1124db 100644
--- a/src/main/java/gregtech/common/pipelike/cable/BlockCable.java
+++ b/src/main/java/gregtech/common/pipelike/cable/BlockCable.java
@@ -8,9 +8,9 @@
 import gregtech.api.pipenet.tile.AttachmentType;
 import gregtech.api.pipenet.tile.IPipeTile;
 import gregtech.api.pipenet.tile.TileEntityPipeBase;
+import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.MaterialRegistry;
 import gregtech.api.unification.material.properties.WireProperties;
-import gregtech.api.unification.material.Material;
 import gregtech.api.util.GTUtility;
 import gregtech.common.ConfigHolder;
 import gregtech.common.pipelike.cable.net.EnergyNet;
@@ -99,7 +99,7 @@ public int onPipeToolUsed(ItemStack stack, EnumFacing coverSide, IPipeTile routePath.minVoltage ||
-                amperesUsed > routePath.maxAmperage) {
+                    amperesUsed > routePath.maxAmperage) {
                 burnAllPaths(paths, voltage, amperage, amperesUsed);
                 break; //break after burning all paths
             }
@@ -114,8 +114,8 @@ public long getEnergyCapacity() {
     public long changeEnergy(long energyToAdd) {
         //just a fallback case if somebody will call this method
         return acceptEnergyFromNetwork(EnumFacing.UP,
-            energyToAdd / getInputVoltage(),
-            energyToAdd / getInputAmperage()) * getInputVoltage();
+                energyToAdd / getInputVoltage(),
+                energyToAdd / getInputAmperage()) * getInputVoltage();
     }
 
     @Override
@@ -152,7 +152,7 @@ private List getPaths() {
     private EnergyNet getEnergyNet() {
         EnergyNet currentEnergyNet = this.currentEnergyNet.get();
         if (currentEnergyNet != null && currentEnergyNet.isValid() &&
-            currentEnergyNet.containsNode(tileEntityCable.getPipePos()))
+                currentEnergyNet.containsNode(tileEntityCable.getPipePos()))
             return currentEnergyNet; //return current net if it is still valid
         WorldENet worldENet = (WorldENet) tileEntityCable.getPipeBlock().getWorldPipeNet(tileEntityCable.getPipeWorld());
         currentEnergyNet = worldENet.getNetFromPos(tileEntityCable.getPipePos());
diff --git a/src/main/java/gregtech/common/pipelike/cable/tile/TileEntityCable.java b/src/main/java/gregtech/common/pipelike/cable/tile/TileEntityCable.java
index c670fdb91d5..06740774218 100644
--- a/src/main/java/gregtech/common/pipelike/cable/tile/TileEntityCable.java
+++ b/src/main/java/gregtech/common/pipelike/cable/tile/TileEntityCable.java
@@ -3,8 +3,8 @@
 import gregtech.api.capability.GregtechCapabilities;
 import gregtech.api.capability.IEnergyContainer;
 import gregtech.api.pipenet.block.material.TileEntityMaterialPipeBase;
-import gregtech.common.pipelike.cable.Insulation;
 import gregtech.api.unification.material.properties.WireProperties;
+import gregtech.common.pipelike.cable.Insulation;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
 
diff --git a/src/main/java/gregtech/common/pipelike/fluidpipe/BlockFluidPipe.java b/src/main/java/gregtech/common/pipelike/fluidpipe/BlockFluidPipe.java
index 73d529b045e..fc7e6a7d36a 100755
--- a/src/main/java/gregtech/common/pipelike/fluidpipe/BlockFluidPipe.java
+++ b/src/main/java/gregtech/common/pipelike/fluidpipe/BlockFluidPipe.java
@@ -5,9 +5,9 @@
 import gregtech.api.pipenet.block.material.BlockMaterialPipe;
 import gregtech.api.pipenet.tile.IPipeTile;
 import gregtech.api.pipenet.tile.TileEntityPipeBase;
+import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.MaterialRegistry;
 import gregtech.api.unification.material.properties.FluidPipeProperties;
-import gregtech.api.unification.material.Material;
 import gregtech.common.pipelike.fluidpipe.net.FluidPipeNet;
 import gregtech.common.pipelike.fluidpipe.net.WorldFluidPipeNet;
 import gregtech.common.pipelike.fluidpipe.tile.FluidPipeFluidHandler;
@@ -141,7 +141,7 @@ public int getActiveNodeConnections(IBlockAccess world, BlockPos nodePos, IPipeT
     public boolean canPushIntoFluidHandler(IPipeTile selfTileEntity, TileEntity otherTileEntity, IFluidHandler sourceHandler, IFluidHandler destinationHandler) {
         boolean isSourcePipe = sourceHandler instanceof FluidPipeFluidHandler;
         boolean isDestPipe = destinationHandler instanceof FluidPipeFluidHandler;
-        if(isSourcePipe && isDestPipe) {
+        if (isSourcePipe && isDestPipe) {
             float sourceThickness = selfTileEntity.getPipeType().getThickness();
             IPipeTile otherPipe = getPipeTileEntity(otherTileEntity);
             if (otherPipe == null) {
diff --git a/src/main/java/gregtech/common/pipelike/fluidpipe/FluidPipeType.java b/src/main/java/gregtech/common/pipelike/fluidpipe/FluidPipeType.java
index 640a55a66c7..3d210a2f10c 100644
--- a/src/main/java/gregtech/common/pipelike/fluidpipe/FluidPipeType.java
+++ b/src/main/java/gregtech/common/pipelike/fluidpipe/FluidPipeType.java
@@ -47,9 +47,9 @@ public OrePrefix getOrePrefix() {
     @Override
     public FluidPipeProperties modifyProperties(FluidPipeProperties baseProperties) {
         return new FluidPipeProperties(
-            baseProperties.maxFluidTemperature,
-            baseProperties.throughput * capacityMultiplier,
-            baseProperties.gasProof);
+                baseProperties.maxFluidTemperature,
+                baseProperties.throughput * capacityMultiplier,
+                baseProperties.gasProof);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/pipelike/fluidpipe/net/FluidNetTank.java b/src/main/java/gregtech/common/pipelike/fluidpipe/net/FluidNetTank.java
index 234343c031c..0541021a3ab 100644
--- a/src/main/java/gregtech/common/pipelike/fluidpipe/net/FluidNetTank.java
+++ b/src/main/java/gregtech/common/pipelike/fluidpipe/net/FluidNetTank.java
@@ -1,8 +1,8 @@
 package gregtech.common.pipelike.fluidpipe.net;
 
 import com.google.common.base.Preconditions;
-import gregtech.api.util.PerTickIntCounter;
 import gregtech.api.unification.material.properties.FluidPipeProperties;
+import gregtech.api.util.PerTickIntCounter;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTank;
 
diff --git a/src/main/java/gregtech/common/pipelike/fluidpipe/tile/FluidPipeFluidHandler.java b/src/main/java/gregtech/common/pipelike/fluidpipe/tile/FluidPipeFluidHandler.java
index 3bd008e1b96..0fe17c70bac 100644
--- a/src/main/java/gregtech/common/pipelike/fluidpipe/tile/FluidPipeFluidHandler.java
+++ b/src/main/java/gregtech/common/pipelike/fluidpipe/tile/FluidPipeFluidHandler.java
@@ -56,7 +56,7 @@ protected FluidTank getNetFluidTank() {
     public FluidPipeNet getFluidPipeNet() {
         FluidPipeNet currentPipeNet = this.currentPipeNet.get();
         if (currentPipeNet != null && currentPipeNet.isValid() &&
-            currentPipeNet.containsNode(pipeTile.getPipePos()))
+                currentPipeNet.containsNode(pipeTile.getPipePos()))
             return currentPipeNet; //if current net is valid and does contain position, return it
         WorldFluidPipeNet worldFluidPipeNet = (WorldFluidPipeNet) pipeTile.getPipeBlock().getWorldPipeNet(pipeTile.getPipeWorld());
         currentPipeNet = worldFluidPipeNet.getNetFromPos(pipeTile.getPipePos());
diff --git a/src/main/java/gregtech/common/pipelike/fluidpipe/tile/TileEntityFluidPipe.java b/src/main/java/gregtech/common/pipelike/fluidpipe/tile/TileEntityFluidPipe.java
index 36b9118fe3f..05a27794db0 100644
--- a/src/main/java/gregtech/common/pipelike/fluidpipe/tile/TileEntityFluidPipe.java
+++ b/src/main/java/gregtech/common/pipelike/fluidpipe/tile/TileEntityFluidPipe.java
@@ -56,7 +56,7 @@ public static void setNeighboursToFire(World world, BlockPos selfPos) {
             BlockPos blockPos = selfPos.offset(side);
             IBlockState blockState = world.getBlockState(blockPos);
             if (blockState.getBlock().isAir(blockState, world, blockPos) ||
-                blockState.getBlock().isFlammable(world, blockPos, side.getOpposite())) {
+                    blockState.getBlock().isFlammable(world, blockPos, side.getOpposite())) {
                 world.setBlockState(blockPos, Blocks.FIRE.getDefaultState());
             }
         }
@@ -65,12 +65,12 @@ public static void setNeighboursToFire(World world, BlockPos selfPos) {
     public static void spawnParticles(World worldIn, BlockPos pos, EnumFacing direction, EnumParticleTypes particleType, int particleCount, Random rand) {
         for (int i = 0; i < particleCount; i++) {
             worldIn.spawnParticle(particleType,
-                pos.getX() + 0.5 - direction.getXOffset() / 1.8,
-                pos.getY() + 0.5 - direction.getYOffset() / 1.8,
-                pos.getZ() + 0.5 - direction.getZOffset() / 1.8,
-                direction.getXOffset() * 0.2 + rand.nextDouble() * 0.1,
-                direction.getYOffset() * 0.2 + rand.nextDouble() * 0.1,
-                direction.getZOffset() * 0.2 + rand.nextDouble() * 0.1);
+                    pos.getX() + 0.5 - direction.getXOffset() / 1.8,
+                    pos.getY() + 0.5 - direction.getYOffset() / 1.8,
+                    pos.getZ() + 0.5 - direction.getZOffset() / 1.8,
+                    direction.getXOffset() * 0.2 + rand.nextDouble() * 0.1,
+                    direction.getYOffset() * 0.2 + rand.nextDouble() * 0.1,
+                    direction.getZOffset() * 0.2 + rand.nextDouble() * 0.1);
         }
     }
 }
diff --git a/src/main/java/gregtech/common/pipelike/fluidpipe/tile/TileEntityFluidPipeTickable.java b/src/main/java/gregtech/common/pipelike/fluidpipe/tile/TileEntityFluidPipeTickable.java
index 76bb0ac33e3..bdc7252151d 100644
--- a/src/main/java/gregtech/common/pipelike/fluidpipe/tile/TileEntityFluidPipeTickable.java
+++ b/src/main/java/gregtech/common/pipelike/fluidpipe/tile/TileEntityFluidPipeTickable.java
@@ -1,9 +1,9 @@
 package gregtech.common.pipelike.fluidpipe.tile;
 
 import gregtech.api.pipenet.tile.IPipeTile;
+import gregtech.api.unification.material.properties.FluidPipeProperties;
 import gregtech.api.util.GTFluidUtils;
 import gregtech.common.pipelike.fluidpipe.BlockFluidPipe;
-import gregtech.api.unification.material.properties.FluidPipeProperties;
 import gregtech.common.pipelike.fluidpipe.FluidPipeType;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/gregtech/common/pipelike/itempipe/BlockItemPipe.java b/src/main/java/gregtech/common/pipelike/itempipe/BlockItemPipe.java
index bc85d841d9b..134132f26be 100644
--- a/src/main/java/gregtech/common/pipelike/itempipe/BlockItemPipe.java
+++ b/src/main/java/gregtech/common/pipelike/itempipe/BlockItemPipe.java
@@ -4,9 +4,9 @@
 import gregtech.api.pipenet.block.material.BlockMaterialPipe;
 import gregtech.api.pipenet.tile.IPipeTile;
 import gregtech.api.pipenet.tile.TileEntityPipeBase;
+import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.MaterialRegistry;
 import gregtech.api.unification.material.properties.ItemPipeProperties;
-import gregtech.api.unification.material.Material;
 import gregtech.common.pipelike.itempipe.net.ItemPipeNet;
 import gregtech.common.pipelike.itempipe.net.WorldItemPipeNet;
 import gregtech.common.pipelike.itempipe.tile.TileEntityItemPipe;
diff --git a/src/main/java/gregtech/common/pipelike/itempipe/ItemPipeType.java b/src/main/java/gregtech/common/pipelike/itempipe/ItemPipeType.java
index abb0bb82cc9..a6e7b0f356a 100644
--- a/src/main/java/gregtech/common/pipelike/itempipe/ItemPipeType.java
+++ b/src/main/java/gregtech/common/pipelike/itempipe/ItemPipeType.java
@@ -35,7 +35,7 @@ public boolean isRestrictive() {
     }
 
     public String getSizeForTexture() {
-        if(!isRestrictive())
+        if (!isRestrictive())
             return name;
         else
             return name.substring(0, name.length() - 12);
diff --git a/src/main/java/gregtech/common/pipelike/itempipe/net/ItemNetHandler.java b/src/main/java/gregtech/common/pipelike/itempipe/net/ItemNetHandler.java
index 7ee2aeec9c6..9dc73b5b1e5 100644
--- a/src/main/java/gregtech/common/pipelike/itempipe/net/ItemNetHandler.java
+++ b/src/main/java/gregtech/common/pipelike/itempipe/net/ItemNetHandler.java
@@ -18,7 +18,10 @@
 import net.minecraftforge.items.ItemHandlerHelper;
 
 import javax.annotation.Nonnull;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 public class ItemNetHandler implements IItemHandler {
 
diff --git a/src/main/java/gregtech/common/pipelike/itempipe/tile/TileEntityItemPipeTickable.java b/src/main/java/gregtech/common/pipelike/itempipe/tile/TileEntityItemPipeTickable.java
index 75c8179f010..e355041a7aa 100644
--- a/src/main/java/gregtech/common/pipelike/itempipe/tile/TileEntityItemPipeTickable.java
+++ b/src/main/java/gregtech/common/pipelike/itempipe/tile/TileEntityItemPipeTickable.java
@@ -19,7 +19,7 @@ public void setActive(boolean active) {
 
     @Override
     public void update() {
-        if(++timer == 1000000000) timer = 0;
+        if (++timer == 1000000000) timer = 0;
         getCoverableImplementation().update();
         if (timer % 20 == 0) {
             transferredItems = 0;
diff --git a/src/main/java/gregtech/common/render/CableRenderer.java b/src/main/java/gregtech/common/render/CableRenderer.java
index e575f354670..26fabe967bc 100644
--- a/src/main/java/gregtech/common/render/CableRenderer.java
+++ b/src/main/java/gregtech/common/render/CableRenderer.java
@@ -100,8 +100,8 @@ public void renderItem(ItemStack rawItemStack, TransformType transformType) {
         Material material = blockCable.getItemMaterial(stack);
         if (insulation != null && material != null) {
             renderCableBlock(material, insulation, IPipeTile.DEFAULT_INSULATION_COLOR, renderState, new IVertexOperation[0],
-                1 << EnumFacing.SOUTH.getIndex() | 1 << EnumFacing.NORTH.getIndex() |
-                    1 << (6 + EnumFacing.SOUTH.getIndex()) | 1 << (6 + EnumFacing.NORTH.getIndex()));
+                    1 << EnumFacing.SOUTH.getIndex() | 1 << EnumFacing.NORTH.getIndex() |
+                            1 << (6 + EnumFacing.SOUTH.getIndex()) | 1 << (6 + EnumFacing.NORTH.getIndex()));
         }
         renderState.draw();
         GlStateManager.disableBlend();
@@ -265,7 +265,7 @@ public Pair getParticleTexture(IPipeTile 0 && (connectMask & ~(1 << oppositeIndex)) == 0) {
-                        renderPipeSide(state, pipeConnectSide, renderedSide, cuboid6);
-                    } else {
-                        renderPipeSide(state, pipeSide, renderedSide, cuboid6);
-                        if(restrictive)
-                            renderPipeSide(state, pipeRestrictive, renderedSide, cuboid6);
-                    }
+                int oppositeIndex = renderedSide.getOpposite().getIndex();
+                if ((connectMask & 1 << oppositeIndex) > 0 && (connectMask & ~(1 << oppositeIndex)) == 0) {
+                    renderPipeSide(state, pipeConnectSide, renderedSide, cuboid6);
+                } else {
+                    renderPipeSide(state, pipeSide, renderedSide, cuboid6);
+                    if (restrictive)
+                        renderPipeSide(state, pipeRestrictive, renderedSide, cuboid6);
+                }
                 //}
             }
             renderPipeCube(connectMask, state, pipeSide, pipeConnectSide, pipeRestrictive, EnumFacing.DOWN, thickness, restrictive);
@@ -206,7 +206,7 @@ private void renderPipeCube(int connections, CCRenderState renderState, IVertexO
                     }
                 } else if (renderedSide != side.getOpposite()) {
                     renderPipeSide(renderState, pipeline, renderedSide, cuboid6);
-                    if(isRestrictive)
+                    if (isRestrictive)
                         renderPipeSide(renderState, pipeRestrictive, renderedSide, cuboid6);
                 }
             }
diff --git a/src/main/java/gregtech/common/render/StonePileModelGenerator.java b/src/main/java/gregtech/common/render/StonePileModelGenerator.java
index 05504703645..a1d059641cd 100644
--- a/src/main/java/gregtech/common/render/StonePileModelGenerator.java
+++ b/src/main/java/gregtech/common/render/StonePileModelGenerator.java
@@ -25,7 +25,7 @@ public static CCModel generatePebblePileModel(Random random) {
             int b = (int) cuboid6.data;
             int[] colours = ccModel.getOrAllocate(ColourAttribute.attributeKey);
             int color = (b & 0xFF) << 24 | (b & 0xFF) << 16 | (b & 0xFF) << 8 | (0xFF);
-            Arrays.fill(colours, i * 24, i* 24 + 24, color);
+            Arrays.fill(colours, i * 24, i * 24 + 24, color);
         }
         return ccModel.computeNormals();
     }
diff --git a/src/main/java/gregtech/common/render/StoneRenderer.java b/src/main/java/gregtech/common/render/StoneRenderer.java
index 887ab7e3a1d..013c83877d1 100644
--- a/src/main/java/gregtech/common/render/StoneRenderer.java
+++ b/src/main/java/gregtech/common/render/StoneRenderer.java
@@ -72,10 +72,10 @@ public boolean renderBlock(IBlockAccess world, BlockPos pos, IBlockState state,
         TextureAtlasSprite stoneSprite = TextureUtils.getBlockTexture("stone");
         Material material = ((BlockSurfaceRock) state.getBlock()).getStoneMaterial(world, pos, state);
         int renderingColor = GTUtility.convertRGBtoOpaqueRGBA_CL(material.getMaterialRGB());
-        IVertexOperation[] operations = new IVertexOperation[] {
-            new IconTransformation(stoneSprite),
-            new ColourMultiplier(renderingColor),
-            new TransformationList(translation)};
+        IVertexOperation[] operations = new IVertexOperation[]{
+                new IconTransformation(stoneSprite),
+                new ColourMultiplier(renderingColor),
+                new TransformationList(translation)};
         if (world != null) {
             renderState.setBrightness(world, pos);
         }
diff --git a/src/main/java/gregtech/common/render/WrenchOverlayRenderer.java b/src/main/java/gregtech/common/render/WrenchOverlayRenderer.java
index b21aa1c4e0a..3222e6aead3 100644
--- a/src/main/java/gregtech/common/render/WrenchOverlayRenderer.java
+++ b/src/main/java/gregtech/common/render/WrenchOverlayRenderer.java
@@ -77,12 +77,12 @@ public static void onDrawBlockHighlight(DrawBlockHighlightEvent event) {
     }
 
     public static boolean useGridForRayTraceResult(RayTraceResult result) {
-        if(result instanceof CuboidRayTraceResult) {
+        if (result instanceof CuboidRayTraceResult) {
             CuboidRayTraceResult traceResult = (CuboidRayTraceResult) result;
             //use grid only for center hit or for primary box with placement grid enabled
-            if(traceResult.cuboid6.data == null) {
+            if (traceResult.cuboid6.data == null) {
                 return true; //default is true
-            } else if(traceResult.cuboid6.data instanceof PrimaryBoxData) {
+            } else if (traceResult.cuboid6.data instanceof PrimaryBoxData) {
                 PrimaryBoxData primaryBoxData = (PrimaryBoxData) traceResult.cuboid6.data;
                 return primaryBoxData.usePlacementGrid;
             } else return false; //otherwise, do not use grid
@@ -110,12 +110,12 @@ public static boolean shouldDrawOverlayForItem(ItemStack itemStack, TileEntity t
         }
 
         // MetaTileEntities
-        if(tileEntity instanceof MetaTileEntityHolder &&
-            itemStack.hasCapability(GregtechCapabilities.CAPABILITY_WRENCH, null))
+        if (tileEntity instanceof MetaTileEntityHolder &&
+                itemStack.hasCapability(GregtechCapabilities.CAPABILITY_WRENCH, null))
             return true;
 
         // ICoverable
-        if(tileEntity.hasCapability(GregtechTileCapabilities.CAPABILITY_COVERABLE, null))
+        if (tileEntity.hasCapability(GregtechTileCapabilities.CAPABILITY_COVERABLE, null))
             return itemStack.hasCapability(GregtechCapabilities.CAPABILITY_SCREWDRIVER, null) || GTUtility.isCoverBehaviorItem(itemStack);
 
         return false;
diff --git a/src/main/java/gregtech/common/tools/ToolAxe.java b/src/main/java/gregtech/common/tools/ToolAxe.java
index d92d7dfc0f8..d1a3f0f6cb0 100644
--- a/src/main/java/gregtech/common/tools/ToolAxe.java
+++ b/src/main/java/gregtech/common/tools/ToolAxe.java
@@ -54,12 +54,12 @@ public float getAttackSpeed(ItemStack stack) {
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         return (tool != null && tool.equals("axe")) ||
-            block.getMaterial() == Material.WOOD;
+                block.getMaterial() == Material.WOOD;
     }
 
     @Override
     public boolean onBlockPreBreak(ItemStack stack, BlockPos blockPos, EntityPlayer player) {
-        if(!player.isSneaking()) {
+        if (!player.isSneaking()) {
             return ToolUtility.applyTimberAxe(stack, player.world, blockPos, player);
         }
         return false;
diff --git a/src/main/java/gregtech/common/tools/ToolChainsawLV.java b/src/main/java/gregtech/common/tools/ToolChainsawLV.java
index 8920a596682..7dc9e7db519 100644
--- a/src/main/java/gregtech/common/tools/ToolChainsawLV.java
+++ b/src/main/java/gregtech/common/tools/ToolChainsawLV.java
@@ -36,7 +36,7 @@ public float getMaxDurabilityMultiplier(ItemStack stack) {
 
     @Override
     public boolean onBlockPreBreak(ItemStack stack, BlockPos blockPos, EntityPlayer player) {
-        if(!player.isSneaking()) {
+        if (!player.isSneaking()) {
             return ToolUtility.applyTimberAxe(stack, player.world, blockPos, player);
         }
         return false;
diff --git a/src/main/java/gregtech/common/tools/ToolCrowbar.java b/src/main/java/gregtech/common/tools/ToolCrowbar.java
index f875d0aeb07..7f4bd1a6ed0 100644
--- a/src/main/java/gregtech/common/tools/ToolCrowbar.java
+++ b/src/main/java/gregtech/common/tools/ToolCrowbar.java
@@ -42,7 +42,7 @@ public void onStatsAddedToTool(MetaValueItem item) {
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         return (tool != null && tool.equals("crowbar")) ||
-            block.getMaterial() == Material.CIRCUITS;
+                block.getMaterial() == Material.CIRCUITS;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/ToolFile.java b/src/main/java/gregtech/common/tools/ToolFile.java
index 49b1e59438c..cd0e5eb7d4d 100644
--- a/src/main/java/gregtech/common/tools/ToolFile.java
+++ b/src/main/java/gregtech/common/tools/ToolFile.java
@@ -30,7 +30,7 @@ public float getBaseDamage(ItemStack stack) {
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         return (tool != null && tool.equals("file")) ||
-            block.getMaterial() == Material.CIRCUITS;
+                block.getMaterial() == Material.CIRCUITS;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/ToolHardHammer.java b/src/main/java/gregtech/common/tools/ToolHardHammer.java
index 3c204644d65..811877422b5 100644
--- a/src/main/java/gregtech/common/tools/ToolHardHammer.java
+++ b/src/main/java/gregtech/common/tools/ToolHardHammer.java
@@ -23,7 +23,8 @@
 public class ToolHardHammer extends ToolBase {
 
     private static final Set HAMMER_TOOL_CLASSES = new HashSet() {{
-        add("hammer"); add("pickaxe");
+        add("hammer");
+        add("pickaxe");
     }};
 
     @Override
@@ -78,11 +79,11 @@ public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         ItemStack itemStack = new ItemStack(block.getBlock(), 1, block.getBlock().getMetaFromState(block));
         return (tool != null && (tool.equals("hammer") || tool.equals("pickaxe"))) ||
-            block.getMaterial() == Material.ROCK ||
-            block.getMaterial() == Material.GLASS ||
-            block.getMaterial() == Material.ICE ||
-            block.getMaterial() == Material.PACKED_ICE ||
-            RecipeMaps.FORGE_HAMMER_RECIPES.findRecipe(Long.MAX_VALUE, Collections.singletonList(itemStack), Collections.emptyList(), 0, MatchingMode.DEFAULT) != null;
+                block.getMaterial() == Material.ROCK ||
+                block.getMaterial() == Material.GLASS ||
+                block.getMaterial() == Material.ICE ||
+                block.getMaterial() == Material.PACKED_ICE ||
+                RecipeMaps.FORGE_HAMMER_RECIPES.findRecipe(Long.MAX_VALUE, Collections.singletonList(itemStack), Collections.emptyList(), 0, MatchingMode.DEFAULT) != null;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/ToolHoe.java b/src/main/java/gregtech/common/tools/ToolHoe.java
index 6c53f84bc78..c05261643b5 100644
--- a/src/main/java/gregtech/common/tools/ToolHoe.java
+++ b/src/main/java/gregtech/common/tools/ToolHoe.java
@@ -27,7 +27,7 @@ public float getBaseDamage(ItemStack stack) {
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         return (tool != null && tool.equals("hoe")) ||
-            block.getMaterial() == Material.GROUND;
+                block.getMaterial() == Material.GROUND;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/ToolMiningHammer.java b/src/main/java/gregtech/common/tools/ToolMiningHammer.java
index 526382f6d09..fc5cb42a4ba 100644
--- a/src/main/java/gregtech/common/tools/ToolMiningHammer.java
+++ b/src/main/java/gregtech/common/tools/ToolMiningHammer.java
@@ -21,7 +21,8 @@
 public class ToolMiningHammer extends ToolBase {
 
     private static final Set HAMMER_TOOL_CLASSES = new HashSet() {{
-        add("pickaxe"); add("hammer");
+        add("pickaxe");
+        add("hammer");
     }};
 
     public enum MiningHammerMode implements ModeSwitchBehavior.ILocalizationKey {
@@ -97,13 +98,13 @@ public boolean canMineBlock(IBlockState block, ItemStack stack) {
 
     @Override
     public List getAOEBlocks(ItemStack itemStack, EntityPlayer player, RayTraceResult rayTraceResult) {
-        if(player.isCreative()) {
+        if (player.isCreative()) {
             return Collections.emptyList();
         }
         ArrayList result = new ArrayList<>();
         BlockPos pos = rayTraceResult.getBlockPos();
         MiningHammerMode miningHammerMode;
-        if(player.isSneaking()) {
+        if (player.isSneaking()) {
             miningHammerMode = MiningHammerMode.SINGLE_BLOCK;
         } else {
             miningHammerMode = MiningHammerMode.THREE_BY_THREE;
@@ -117,7 +118,7 @@ public List getAOEBlocks(ItemStack itemStack, EntityPlayer player, Ray
                 if (x == 0 && y == 0) continue;
                 BlockPos offsetPos = rotate(pos, x, y, rayTraceResult.sideHit, horizontalFacing);
                 IBlockState blockState = player.world.getBlockState(offsetPos);
-                if(itemStack.canHarvestBlock(blockState)) {
+                if (itemStack.canHarvestBlock(blockState)) {
                     result.add(offsetPos);
                 }
             }
@@ -132,7 +133,7 @@ public void onBlockDestroyed(ItemStack stack, World world, IBlockState state, Bl
             EnumFacing sideHit = ToolUtility.getSideHit(world, pos, entityPlayer);
             int damagePerBlockBreak = getToolDamagePerBlockBreak(stack);
             MiningHammerMode miningHammerMode;
-            if(entityPlayer.isSneaking()) {
+            if (entityPlayer.isSneaking()) {
                 miningHammerMode = MiningHammerMode.SINGLE_BLOCK;
             } else {
                 miningHammerMode = MiningHammerMode.THREE_BY_THREE;
@@ -160,19 +161,26 @@ public void onBlockDestroyed(ItemStack stack, World world, IBlockState state, Bl
 
     private static BlockPos rotate(BlockPos origin, int x, int y, EnumFacing sideHit, EnumFacing horizontalFacing) {
         switch (sideHit.getAxis()) {
-            case X: return origin.add(0, y, x);
-            case Z: return origin.add(x, y, 0);
-            case Y: return rotateVertical(origin, x, y, horizontalFacing);
-            default: return BlockPos.ORIGIN;
+            case X:
+                return origin.add(0, y, x);
+            case Z:
+                return origin.add(x, y, 0);
+            case Y:
+                return rotateVertical(origin, x, y, horizontalFacing);
+            default:
+                return BlockPos.ORIGIN;
         }
     }
 
     @SuppressWarnings("SuspiciousNameCombination")
     private static BlockPos rotateVertical(BlockPos origin, int x, int y, EnumFacing horizontalFacing) {
         switch (horizontalFacing.getAxis()) {
-            case X: return origin.add(y, 0, x);
-            case Z: return origin.add(x, 0, y);
-            default: return BlockPos.ORIGIN;
+            case X:
+                return origin.add(y, 0, x);
+            case Z:
+                return origin.add(x, 0, y);
+            default:
+                return BlockPos.ORIGIN;
         }
     }
 
diff --git a/src/main/java/gregtech/common/tools/ToolPickaxe.java b/src/main/java/gregtech/common/tools/ToolPickaxe.java
index e2a07a3189a..947d4c9126f 100644
--- a/src/main/java/gregtech/common/tools/ToolPickaxe.java
+++ b/src/main/java/gregtech/common/tools/ToolPickaxe.java
@@ -37,10 +37,10 @@ public float getDigSpeedMultiplier(ItemStack stack) {
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         return (tool != null && tool.equals("pickaxe")) ||
-            block.getMaterial() == Material.ROCK ||
-            block.getMaterial() == Material.IRON ||
-            block.getMaterial() == Material.ANVIL ||
-            block.getMaterial() == Material.GLASS;
+                block.getMaterial() == Material.ROCK ||
+                block.getMaterial() == Material.IRON ||
+                block.getMaterial() == Material.ANVIL ||
+                block.getMaterial() == Material.GLASS;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/ToolSaw.java b/src/main/java/gregtech/common/tools/ToolSaw.java
index ccc3a88cbe1..a5ab1cb7ee3 100644
--- a/src/main/java/gregtech/common/tools/ToolSaw.java
+++ b/src/main/java/gregtech/common/tools/ToolSaw.java
@@ -1,5 +1,6 @@
 package gregtech.common.tools;
 
+import gregtech.api.items.toolitem.ToolMetaItem;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.enchantment.Enchantment;
@@ -17,9 +18,6 @@
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
-
-import gregtech.api.items.toolitem.ToolMetaItem;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -27,7 +25,8 @@
 public class ToolSaw extends ToolBase {
 
     private static final Set SAW_TOOL_CLASSES = new HashSet() {{
-        add("axe"); add("saw");
+        add("axe");
+        add("saw");
     }};
 
     @Override
@@ -54,12 +53,12 @@ public float getBaseDamage(ItemStack stack) {
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         return (tool != null && (tool.equals("axe") || tool.equals("saw"))) ||
-            block.getMaterial() == Material.LEAVES ||
-            block.getMaterial() == Material.VINE ||
-            block.getMaterial() == Material.WOOD ||
-            block.getMaterial() == Material.CACTUS ||
-            block.getMaterial() == Material.ICE ||
-            block.getMaterial() == Material.PACKED_ICE;
+                block.getMaterial() == Material.LEAVES ||
+                block.getMaterial() == Material.VINE ||
+                block.getMaterial() == Material.WOOD ||
+                block.getMaterial() == Material.CACTUS ||
+                block.getMaterial() == Material.ICE ||
+                block.getMaterial() == Material.PACKED_ICE;
     }
 
     @Override
@@ -95,7 +94,7 @@ public Set getToolClasses(ItemStack stack) {
 
     /**
      * Added to the world event listeners to hopefully catch and revert the ice-to-water conversion.
-     *
+     * 

      * The conversion may never happen, for example when there is air under the ice block,
      * so this invalidates itself on the first block update after the tick it was added.
      */
diff --git a/src/main/java/gregtech/common/tools/ToolScrewdriver.java b/src/main/java/gregtech/common/tools/ToolScrewdriver.java
index bdf320367bc..ec1319aa306 100644
--- a/src/main/java/gregtech/common/tools/ToolScrewdriver.java
+++ b/src/main/java/gregtech/common/tools/ToolScrewdriver.java
@@ -38,7 +38,7 @@ public float getBaseDamage(ItemStack stack) {
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         return (tool != null && tool.equals("screwdriver")) ||
-            block.getMaterial() == Material.CIRCUITS;
+                block.getMaterial() == Material.CIRCUITS;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/ToolSense.java b/src/main/java/gregtech/common/tools/ToolSense.java
index 1d81b3a4443..e8338dc859d 100644
--- a/src/main/java/gregtech/common/tools/ToolSense.java
+++ b/src/main/java/gregtech/common/tools/ToolSense.java
@@ -24,9 +24,9 @@ public float getMaxDurabilityMultiplier(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         return block.getMaterial() == Material.PLANTS ||
-            block.getMaterial() == Material.LEAVES ||
-            block.getMaterial() == Material.VINE ||
-            block.getBlock() instanceof BlockCrops;
+                block.getMaterial() == Material.LEAVES ||
+                block.getMaterial() == Material.VINE ||
+                block.getBlock() instanceof BlockCrops;
     }
 
     @Override
@@ -36,20 +36,21 @@ public boolean onBlockPreBreak(ItemStack stack, BlockPos blockPos, EntityPlayer
         }
         ToolMetaItem toolMetaItem = (ToolMetaItem) stack.getItem();
         int damagePerBlockBreak = getToolDamagePerBlockBreak(stack);
-        for(int x = -5; x <= 5; x++) {
-            for(int z = -5; z <= 5; z++) {
-                for(int y = -5; y <= 5; y++) {BlockPos offsetPos = blockPos.add(x, y, z);
+        for (int x = -5; x <= 5; x++) {
+            for (int z = -5; z <= 5; z++) {
+                for (int y = -5; y <= 5; y++) {
+                    BlockPos offsetPos = blockPos.add(x, y, z);
                     IBlockState blockState = player.world.getBlockState(offsetPos);
-                    if(player.world.isBlockModifiable(player, offsetPos) && toolMetaItem.isUsable(stack, damagePerBlockBreak)) {
-                        if(blockState.getBlock() instanceof BlockCrops) {
+                    if (player.world.isBlockModifiable(player, offsetPos) && toolMetaItem.isUsable(stack, damagePerBlockBreak)) {
+                        if (blockState.getBlock() instanceof BlockCrops) {
 
                             player.world.playEvent(2001, offsetPos, Block.getStateId(blockState));
                             ToolUtility.applyHarvestBehavior(offsetPos, player);
                             toolMetaItem.damageItem(stack, damagePerBlockBreak, false);
 
-                        } else if(blockState.getMaterial() == Material.PLANTS ||
-                            blockState.getMaterial() == Material.LEAVES ||
-                            blockState.getMaterial() == Material.VINE) {
+                        } else if (blockState.getMaterial() == Material.PLANTS ||
+                                blockState.getMaterial() == Material.LEAVES ||
+                                blockState.getMaterial() == Material.VINE) {
 
                             player.world.playEvent(2001, offsetPos, Block.getStateId(blockState));
                             player.world.setBlockToAir(offsetPos);
diff --git a/src/main/java/gregtech/common/tools/ToolShovel.java b/src/main/java/gregtech/common/tools/ToolShovel.java
index 52aa1c525fb..ac8e64213cb 100644
--- a/src/main/java/gregtech/common/tools/ToolShovel.java
+++ b/src/main/java/gregtech/common/tools/ToolShovel.java
@@ -42,11 +42,11 @@ public float getDigSpeedMultiplier(ItemStack stack) {
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         return (tool != null && tool.equals("shovel")) ||
-            block.getMaterial() == Material.SAND ||
-            block.getMaterial() == Material.GRASS ||
-            block.getMaterial() == Material.GROUND ||
-            block.getMaterial() == Material.SNOW ||
-            block.getMaterial() == Material.CLAY;
+                block.getMaterial() == Material.SAND ||
+                block.getMaterial() == Material.GRASS ||
+                block.getMaterial() == Material.GROUND ||
+                block.getMaterial() == Material.SNOW ||
+                block.getMaterial() == Material.CLAY;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/ToolSword.java b/src/main/java/gregtech/common/tools/ToolSword.java
index 97a99b128b1..056fbddf197 100644
--- a/src/main/java/gregtech/common/tools/ToolSword.java
+++ b/src/main/java/gregtech/common/tools/ToolSword.java
@@ -52,17 +52,17 @@ public boolean canPerformSweepAttack(ItemStack stack) {
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         return (tool != null && tool.equals("sword")) ||
-            block.getMaterial() == Material.LEAVES ||
-            block.getMaterial() == Material.GOURD ||
-            block.getMaterial() == Material.VINE ||
-            block.getMaterial() == Material.WEB ||
-            block.getMaterial() == Material.CLOTH ||
-            block.getMaterial() == Material.CARPET ||
-            block.getMaterial() == Material.PLANTS ||
-            block.getMaterial() == Material.CACTUS ||
-            block.getMaterial() == Material.CAKE ||
-            block.getMaterial() == Material.TNT ||
-            block.getMaterial() == Material.SPONGE;
+                block.getMaterial() == Material.LEAVES ||
+                block.getMaterial() == Material.GOURD ||
+                block.getMaterial() == Material.VINE ||
+                block.getMaterial() == Material.WEB ||
+                block.getMaterial() == Material.CLOTH ||
+                block.getMaterial() == Material.CARPET ||
+                block.getMaterial() == Material.PLANTS ||
+                block.getMaterial() == Material.CACTUS ||
+                block.getMaterial() == Material.CAKE ||
+                block.getMaterial() == Material.TNT ||
+                block.getMaterial() == Material.SPONGE;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/ToolUniversalSpade.java b/src/main/java/gregtech/common/tools/ToolUniversalSpade.java
index 4af0c2613dc..e83853e231e 100644
--- a/src/main/java/gregtech/common/tools/ToolUniversalSpade.java
+++ b/src/main/java/gregtech/common/tools/ToolUniversalSpade.java
@@ -12,7 +12,11 @@
 public class ToolUniversalSpade extends ToolBase {
 
     private static final Set SPADE_TOOL_CLASSES = new HashSet() {{
-        add("shovel"); add("axe"); add("saw"); add("sword"); add("crowbar");
+        add("shovel");
+        add("axe");
+        add("saw");
+        add("sword");
+        add("crowbar");
     }};
 
     @Override
@@ -44,29 +48,29 @@ public float getDigSpeedMultiplier(ItemStack stack) {
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         return (tool != null && (tool.equals("shovel") ||
-            tool.equals("axe") ||
-            tool.equals("saw") ||
-            tool.equals("sword") ||
-            tool.equals("crowbar"))) ||
-            block.getMaterial() == Material.SAND ||
-            block.getMaterial() == Material.GRASS ||
-            block.getMaterial() == Material.GROUND ||
-            block.getMaterial() == Material.SNOW ||
-            block.getMaterial() == Material.CLAY ||
-            block.getMaterial() == Material.CRAFTED_SNOW ||
-            block.getMaterial() == Material.LEAVES ||
-            block.getMaterial() == Material.VINE ||
-            block.getMaterial() == Material.WOOD ||
-            block.getMaterial() == Material.CACTUS ||
-            block.getMaterial() == Material.CIRCUITS ||
-            block.getMaterial() == Material.GOURD ||
-            block.getMaterial() == Material.WEB ||
-            block.getMaterial() == Material.CLOTH ||
-            block.getMaterial() == Material.CARPET ||
-            block.getMaterial() == Material.PLANTS ||
-            block.getMaterial() == Material.CAKE ||
-            block.getMaterial() == Material.TNT ||
-            block.getMaterial() == Material.SPONGE;
+                tool.equals("axe") ||
+                tool.equals("saw") ||
+                tool.equals("sword") ||
+                tool.equals("crowbar"))) ||
+                block.getMaterial() == Material.SAND ||
+                block.getMaterial() == Material.GRASS ||
+                block.getMaterial() == Material.GROUND ||
+                block.getMaterial() == Material.SNOW ||
+                block.getMaterial() == Material.CLAY ||
+                block.getMaterial() == Material.CRAFTED_SNOW ||
+                block.getMaterial() == Material.LEAVES ||
+                block.getMaterial() == Material.VINE ||
+                block.getMaterial() == Material.WOOD ||
+                block.getMaterial() == Material.CACTUS ||
+                block.getMaterial() == Material.CIRCUITS ||
+                block.getMaterial() == Material.GOURD ||
+                block.getMaterial() == Material.WEB ||
+                block.getMaterial() == Material.CLOTH ||
+                block.getMaterial() == Material.CARPET ||
+                block.getMaterial() == Material.PLANTS ||
+                block.getMaterial() == Material.CAKE ||
+                block.getMaterial() == Material.TNT ||
+                block.getMaterial() == Material.SPONGE;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/ToolUtility.java b/src/main/java/gregtech/common/tools/ToolUtility.java
index 1f2de68a2e4..3c589a3a3c5 100644
--- a/src/main/java/gregtech/common/tools/ToolUtility.java
+++ b/src/main/java/gregtech/common/tools/ToolUtility.java
@@ -40,8 +40,8 @@ public static boolean applyTimberAxe(ItemStack itemStack, World world, BlockPos
             return false;
         }
         IBlockState blockState = world.getBlockState(blockPos);
-        if(TreeChopTask.isLogBlock(blockState) == 1) {
-            if(!world.isRemote) {
+        if (TreeChopTask.isLogBlock(blockState) == 1) {
+            if (!world.isRemote) {
                 EntityPlayerMP playerMP = (EntityPlayerMP) player;
                 TreeChopTask treeChopTask = new TreeChopTask(blockPos, world, playerMP, itemStack);
                 TaskScheduler.scheduleTask(world, treeChopTask);
@@ -59,7 +59,7 @@ public static boolean applyShearBehavior(ItemStack itemStack, BlockPos pos, Enti
                 int fortuneLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, itemStack);
                 List drops = target.onSheared(itemStack, player.world, pos, fortuneLevel);
                 dropListOfItems(player.world, pos, drops);
-                         player.world.setBlockState(pos, Blocks.AIR.getDefaultState(), 11);
+                player.world.setBlockState(pos, Blocks.AIR.getDefaultState(), 11);
                 return true;
             }
         }
@@ -69,9 +69,9 @@ public static boolean applyShearBehavior(ItemStack itemStack, BlockPos pos, Enti
     public static boolean applyHarvestBehavior(BlockPos pos, EntityPlayer player) {
         IBlockState blockState = player.world.getBlockState(pos);
         Block block = blockState.getBlock();
-        if(block instanceof BlockCrops) {
+        if (block instanceof BlockCrops) {
             BlockCrops blockCrops = (BlockCrops) block;
-            if(blockCrops.isMaxAge(blockState)) {
+            if (blockCrops.isMaxAge(blockState)) {
                 @SuppressWarnings("deprecation")
                 List drops = blockCrops.getDrops(player.world, pos, blockState, 0);
                 dropListOfItems(player.world, pos, drops);
diff --git a/src/main/java/gregtech/common/tools/ToolWrench.java b/src/main/java/gregtech/common/tools/ToolWrench.java
index 7273be0f16b..3649dd86802 100644
--- a/src/main/java/gregtech/common/tools/ToolWrench.java
+++ b/src/main/java/gregtech/common/tools/ToolWrench.java
@@ -38,11 +38,11 @@ public boolean canMineBlock(IBlockState blockState, ItemStack stack) {
         Block block = blockState.getBlock();
         String tool = block.getHarvestTool(blockState);
         return (tool != null && tool.equals("wrench"))
-            || blockState.getMaterial() == Material.PISTON
-            || block == Blocks.HOPPER
-            || block == Blocks.DISPENSER
-            || block == Blocks.DROPPER
-            || blockState.getMaterial() == Material.IRON;
+                || blockState.getMaterial() == Material.PISTON
+                || block == Blocks.HOPPER
+                || block == Blocks.DISPENSER
+                || block == Blocks.DROPPER
+                || blockState.getMaterial() == Material.IRON;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/TreeChopTask.java b/src/main/java/gregtech/common/tools/TreeChopTask.java
index 93c881aaa1a..14fe16682a0 100644
--- a/src/main/java/gregtech/common/tools/TreeChopTask.java
+++ b/src/main/java/gregtech/common/tools/TreeChopTask.java
@@ -64,15 +64,15 @@ public boolean run() {
         IToolStats toolStats = toolValueItem.getToolStats();
         int damagePerBlockBreak = toolStats.getToolDamagePerBlockBreak(itemStack);
 
-        if(!finishedSearchingBlocks) {
+        if (!finishedSearchingBlocks) {
             this.finishedSearchingBlocks = !attemptSearchWoodBlocks() ||
-                this.visitedBlockPos.size() >= MAX_BLOCKS_TO_SEARCH;
-            if(finishedSearchingBlocks) {
+                    this.visitedBlockPos.size() >= MAX_BLOCKS_TO_SEARCH;
+            if (finishedSearchingBlocks) {
                 this.woodBlockPos.sort(new WoodBlockComparator());
             }
             return true;
         }
-        if(toolMetaItem.isUsable(itemInMainHand, damagePerBlockBreak) && tryBreakAny()) {
+        if (toolMetaItem.isUsable(itemInMainHand, damagePerBlockBreak) && tryBreakAny()) {
             toolMetaItem.damageItem(itemInMainHand, damagePerBlockBreak, false);
             return true;
         }
@@ -84,7 +84,7 @@ private class WoodBlockComparator implements Comparator {
         @Override
         public int compare(BlockPos o1, BlockPos o2) {
             int a = -Integer.compare(o1.getY(), o2.getY());
-            if(a != 0) {
+            if (a != 0) {
                 return a;
             }
             return Integer.compare(distance(o1), distance(o2));
@@ -99,8 +99,8 @@ private int distance(BlockPos pos) {
 
     private boolean isItemEqual(ItemStack heldItem) {
         if (heldItem.getItem() != itemStack.getItem() ||
-            heldItem.getItemDamage() != itemStack.getItemDamage() ||
-            !(heldItem.getItem() instanceof ToolMetaItem)) {
+                heldItem.getItemDamage() != itemStack.getItemDamage() ||
+                !(heldItem.getItem() instanceof ToolMetaItem)) {
             return false;
         }
         Material heldToolMaterial = ToolMetaItem.getToolMaterial(heldItem);
@@ -109,10 +109,10 @@ private boolean isItemEqual(ItemStack heldItem) {
     }
 
     private boolean tryBreakAny() {
-        if(woodBlockPos.size() > currentWoodBlockIndex) {
+        if (woodBlockPos.size() > currentWoodBlockIndex) {
             BlockPos woodPos = woodBlockPos.get(currentWoodBlockIndex++);
             IBlockState blockState = this.world.getBlockState(woodPos);
-            if(isLogBlock(blockState) == 1) {
+            if (isLogBlock(blockState) == 1) {
                 this.world.destroyBlock(woodPos, true);
                 return true;
             }
@@ -124,14 +124,15 @@ private boolean tryBreakAny() {
     private boolean attemptSearchWoodBlocks() {
         int blocksSearchedNow = 0;
         int validWoodBlocksFound = 0;
-        main: while (blocksSearchedNow <= MAX_BLOCKS_SEARCH_PER_TICK) {
+        main:
+        while (blocksSearchedNow <= MAX_BLOCKS_SEARCH_PER_TICK) {
             //try to iterate neighbour blocks
             blocksSearchedNow++;
             for (MultiFacing facing : MultiFacing.VALUES) {
                 //move at facing
                 facing.move(currentPos);
 
-                if(!visitedBlockPos.contains(currentPos)) {
+                if (!visitedBlockPos.contains(currentPos)) {
                     IBlockState blockState = this.world.getBlockState(currentPos);
                     int blockType = isLogBlock(blockState);
                     boolean currentIsLeavesBlock = isLastBlockLeaves;
@@ -139,7 +140,7 @@ private boolean attemptSearchWoodBlocks() {
                         this.isLastBlockLeaves = blockType == 2;
                         BlockPos immutablePos = currentPos.toImmutable();
                         this.visitedBlockPos.add(immutablePos);
-                        if(blockType == 1) {
+                        if (blockType == 1) {
                             this.woodBlockPos.add(immutablePos);
                         }
                         validWoodBlocksFound++;
@@ -162,20 +163,20 @@ private boolean attemptSearchWoodBlocks() {
     }
 
     public static int isLogBlock(IBlockState blockState) {
-        if(blockState.getMaterial() == net.minecraft.block.material.Material.AIR) {
+        if (blockState.getMaterial() == net.minecraft.block.material.Material.AIR) {
             return 0;
         }
-        if(blockState.getBlock() instanceof BlockLog) {
+        if (blockState.getBlock() instanceof BlockLog) {
             return 1;
-        } else if(blockState.getBlock() instanceof BlockLeaves) {
+        } else if (blockState.getBlock() instanceof BlockLeaves) {
             return 2;
         }
         Item itemBlock = Item.getItemFromBlock(blockState.getBlock());
         ItemStack blockStack = new ItemStack(itemBlock, 1, blockState.getBlock().damageDropped(blockState));
         Set blocks = OreDictUnifier.getOreDictionaryNames(blockStack);
-        if(blocks.contains("logWood")) {
+        if (blocks.contains("logWood")) {
             return 1;
-        } else if(blocks.contains("treeLeaves")) {
+        } else if (blocks.contains("treeLeaves")) {
             return 2;
         } else return 0;
     }
@@ -219,8 +220,8 @@ private enum MultiFacing {
 
         public void move(MutableBlockPos blockPos) {
             blockPos.setPos(blockPos.getX() + direction.getX(),
-                blockPos.getY() + direction.getY(),
-                blockPos.getZ() + direction.getZ());
+                    blockPos.getY() + direction.getY(),
+                    blockPos.getZ() + direction.getZ());
         }
 
         public MultiFacing getOpposite() {
diff --git a/src/main/java/gregtech/common/tools/largedrills/DrillModes.java b/src/main/java/gregtech/common/tools/largedrills/DrillModes.java
index d071dc30186..35cc8e8bb5d 100644
--- a/src/main/java/gregtech/common/tools/largedrills/DrillModes.java
+++ b/src/main/java/gregtech/common/tools/largedrills/DrillModes.java
@@ -2,7 +2,7 @@
 
 public class DrillModes {
     public enum DrillMode implements IDrillMode {
-        SINGLE_BLOCK("metaitem.drill.mode.single_block", 1,  2.0f);
+        SINGLE_BLOCK("metaitem.drill.mode.single_block", 1, 2.0f);
 
         private final String localizationKey;
         private final int cubeSize;
@@ -32,8 +32,8 @@ public static DrillMode getSingleBlock() {
     }
 
     public enum DrillMVMode implements IDrillMode {
-        SINGLE_BLOCK("metaitem.drill.mode.single_block", 1,  4.0f),
-        THREE_CUBE("metaitem.drill.mode.three_cube", 3,  1.0f);
+        SINGLE_BLOCK("metaitem.drill.mode.single_block", 1, 4.0f),
+        THREE_CUBE("metaitem.drill.mode.three_cube", 3, 1.0f);
 
         private final String localizationKey;
         private final int cubeSize;
@@ -59,9 +59,9 @@ public String getUnlocalizedName() {
     }
 
     public enum DrillHVMode implements IDrillMode {
-        SINGLE_BLOCK("metaitem.drill.mode.single_block", 1,  8.0f),
-        THREE_CUBE("metaitem.drill.mode.three_cube", 3,  2.0f),
-        FIVE_CUBE("metaitem.drill.mode.five_cube", 5,  1.0f);
+        SINGLE_BLOCK("metaitem.drill.mode.single_block", 1, 8.0f),
+        THREE_CUBE("metaitem.drill.mode.three_cube", 3, 2.0f),
+        FIVE_CUBE("metaitem.drill.mode.five_cube", 5, 1.0f);
 
         private final String localizationKey;
         private final int cubeSize;
@@ -87,10 +87,10 @@ public String getUnlocalizedName() {
     }
 
     public enum DrillEVMode implements IDrillMode {
-        SINGLE_BLOCK("metaitem.drill.mode.single_block", 1,  16.0f),
-        THREE_CUBE("metaitem.drill.mode.three_cube", 3,  4.0f),
-        FIVE_CUBE("metaitem.drill.mode.five_cube", 5,  2.0f),
-        SEVEN_CUBE("metaitem.drill.mode.seven_cube", 7,  1.0f);
+        SINGLE_BLOCK("metaitem.drill.mode.single_block", 1, 16.0f),
+        THREE_CUBE("metaitem.drill.mode.three_cube", 3, 4.0f),
+        FIVE_CUBE("metaitem.drill.mode.five_cube", 5, 2.0f),
+        SEVEN_CUBE("metaitem.drill.mode.seven_cube", 7, 1.0f);
 
         private final String localizationKey;
         private final int cubeSize;
@@ -116,10 +116,10 @@ public String getUnlocalizedName() {
     }
 
     public enum DrillIVMode implements IDrillMode {
-        SINGLE_BLOCK("metaitem.drill.mode.single_block", 1,  32.0f),
-        THREE_CUBE("metaitem.drill.mode.three_cube", 3,  8.0f),
-        FIVE_CUBE("metaitem.drill.mode.five_cube", 5,  4.0f),
-        SEVEN_CUBE("metaitem.drill.mode.seven_cube", 7,  2.0f),
+        SINGLE_BLOCK("metaitem.drill.mode.single_block", 1, 32.0f),
+        THREE_CUBE("metaitem.drill.mode.three_cube", 3, 8.0f),
+        FIVE_CUBE("metaitem.drill.mode.five_cube", 5, 4.0f),
+        SEVEN_CUBE("metaitem.drill.mode.seven_cube", 7, 2.0f),
         NINE_CUBE("metaitem.drill.mode.nine_cube", 9, 1.0f);
 
         private final String localizationKey;
diff --git a/src/main/java/gregtech/common/tools/largedrills/ToolDrillLarge.java b/src/main/java/gregtech/common/tools/largedrills/ToolDrillLarge.java
index bd5ad98924d..79ce666467d 100644
--- a/src/main/java/gregtech/common/tools/largedrills/ToolDrillLarge.java
+++ b/src/main/java/gregtech/common/tools/largedrills/ToolDrillLarge.java
@@ -33,7 +33,9 @@
 public abstract class ToolDrillLarge & IDrillMode> extends ToolBase {
 
     private static final Set DRILL_TOOL_CLASSES = new HashSet() {{
-        add("pickaxe"); add("shovel"); add("hammer");
+        add("pickaxe");
+        add("shovel");
+        add("hammer");
     }};
 
     abstract ModeSwitchBehavior getModeSwitchBehavior();
@@ -200,7 +202,7 @@ public void onBlockDestroyed(ItemStack stack, World world, IBlockState state, Bl
             EntityPlayer entityPlayer = (EntityPlayer) entity;
             int damagePerBlockBreak = getToolDamagePerBlockBreak(stack);
             IDrillMode drillMode;
-            if (entityPlayer.isSneaking()  || !canAOEMineBlock(entityPlayer.world.getBlockState(pos), stack)) {
+            if (entityPlayer.isSneaking() || !canAOEMineBlock(entityPlayer.world.getBlockState(pos), stack)) {
                 drillMode = IDrillMode.getSingleBlock();
             } else {
                 drillMode = this.getModeSwitchBehavior().getModeFromItemStack(stack);
diff --git a/src/main/java/gregtech/common/tools/largedrills/ToolDrills.java b/src/main/java/gregtech/common/tools/largedrills/ToolDrills.java
index 9b413ee99ba..f267be12e73 100644
--- a/src/main/java/gregtech/common/tools/largedrills/ToolDrills.java
+++ b/src/main/java/gregtech/common/tools/largedrills/ToolDrills.java
@@ -3,6 +3,7 @@
 import gregtech.api.items.metaitem.MetaItem.MetaValueItem;
 import gregtech.common.items.MetaItems;
 import gregtech.common.items.behaviors.ModeSwitchBehavior;
+
 import static gregtech.common.tools.largedrills.DrillModes.*;
 
 
@@ -10,7 +11,7 @@
 public class ToolDrills {
     public static class ToolDrillLV extends ToolDrillLarge {
         public final ModeSwitchBehavior MODE_SWITCH_BEHAVIOR = new ModeSwitchBehavior<>(DrillMode.class);
-        
+
         @Override
         ModeSwitchBehavior getModeSwitchBehavior() {
             return MODE_SWITCH_BEHAVIOR;
diff --git a/src/main/java/gregtech/common/worldgen/LootEntryMetaItem.java b/src/main/java/gregtech/common/worldgen/LootEntryMetaItem.java
index 339a3501acb..55e77227bfa 100644
--- a/src/main/java/gregtech/common/worldgen/LootEntryMetaItem.java
+++ b/src/main/java/gregtech/common/worldgen/LootEntryMetaItem.java
@@ -25,10 +25,10 @@ protected ItemStack createItemStack() {
 
     public static MetaValueItem getMetaItem(String name) {
         return MetaItem.getMetaItems().stream()
-            .flatMap(item -> item.getAllItems().stream())
-            .map(item -> (MetaValueItem) item)
-            .filter(item -> item.unlocalizedName.equals(name))
-            .findFirst().orElse(null);
+                .flatMap(item -> item.getAllItems().stream())
+                .map(item -> (MetaValueItem) item)
+                .filter(item -> item.unlocalizedName.equals(name))
+                .findFirst().orElse(null);
     }
 
     public static LootEntryMetaItem deserialize(JsonObject object, JsonDeserializationContext context, int weight, int quality, LootCondition[] conditions) {
diff --git a/src/main/java/gregtech/common/worldgen/LootTableHelper.java b/src/main/java/gregtech/common/worldgen/LootTableHelper.java
index df05e5050a6..a1c8d9a9aea 100644
--- a/src/main/java/gregtech/common/worldgen/LootTableHelper.java
+++ b/src/main/java/gregtech/common/worldgen/LootTableHelper.java
@@ -45,8 +45,8 @@ public static void registerLootEntry(String type, LootTableEntrySerializer se
     public static void initialize() {
         try {
             Field gsonField = Arrays.stream(LootTableManager.class.getDeclaredFields())
-                .filter(it -> Gson.class.isAssignableFrom(it.getType()))
-                .findFirst().orElseThrow(() -> new RuntimeException("Failed to find Gson field!"));
+                    .filter(it -> Gson.class.isAssignableFrom(it.getType()))
+                    .findFirst().orElseThrow(() -> new RuntimeException("Failed to find Gson field!"));
             gsonField.setAccessible(true);
             Gson gsonInstance = (Gson) gsonField.get(null);
             replaceGsonTypeHierarchySerializer(gsonInstance, LootEntry.class, LootTableEntrySerializerDelegate::new);
@@ -119,14 +119,14 @@ private static void replaceGsonTypeHierarchySerializer(Gson gson, Class type,
             hierarchyTypeField.setAccessible(true);
             List factories = (List) field.get(gson);
             Object factoryObject = factories.stream()
-                .filter(factory -> singleTypeFactoryClass.isAssignableFrom(factory.getClass()))
-                .filter(factory -> {
-                    try {
-                        return hierarchyTypeField.get(factory) == type;
-                    } catch (IllegalAccessException e) {
-                        throw new RuntimeException(e);
-                    }
-                }).findFirst().orElseThrow(() -> new IllegalArgumentException("Serializer not found for " + type));
+                    .filter(factory -> singleTypeFactoryClass.isAssignableFrom(factory.getClass()))
+                    .filter(factory -> {
+                        try {
+                            return hierarchyTypeField.get(factory) == type;
+                        } catch (IllegalAccessException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }).findFirst().orElseThrow(() -> new IllegalArgumentException("Serializer not found for " + type));
 
             Field serializerField = singleTypeFactoryClass.getDeclaredField("serializer");
             Field deserializerField = singleTypeFactoryClass.getDeclaredField("deserializer");
diff --git a/src/main/java/gregtech/common/worldgen/WorldGenAbandonedBase.java b/src/main/java/gregtech/common/worldgen/WorldGenAbandonedBase.java
index f34c666473b..04d7672a9e7 100644
--- a/src/main/java/gregtech/common/worldgen/WorldGenAbandonedBase.java
+++ b/src/main/java/gregtech/common/worldgen/WorldGenAbandonedBase.java
@@ -21,9 +21,9 @@ public class WorldGenAbandonedBase implements IWorldGenerator {
     @Override
     public void generate(Random random, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) {
         if (ConfigHolder.abandonedBaseRarity == 0 ||
-            world.getWorldType() == WorldType.FLAT ||
-            world.provider.getDimensionType() != DimensionType.OVERWORLD ||
-            !world.getWorldInfo().isMapFeaturesEnabled()) {
+                world.getWorldType() == WorldType.FLAT ||
+                world.provider.getDimensionType() != DimensionType.OVERWORLD ||
+                !world.getWorldInfo().isMapFeaturesEnabled()) {
             return; //do not generate in flat worlds, or in non-surface worlds
         }
         BlockPos randomPos = new BlockPos(chunkX * 16 + 8, 0, chunkZ * 16 + 8);
diff --git a/src/main/java/gregtech/common/worldgen/WorldGenRubberTree.java b/src/main/java/gregtech/common/worldgen/WorldGenRubberTree.java
index d23a7e6680c..43a2541e66c 100644
--- a/src/main/java/gregtech/common/worldgen/WorldGenRubberTree.java
+++ b/src/main/java/gregtech/common/worldgen/WorldGenRubberTree.java
@@ -24,7 +24,7 @@ public class WorldGenRubberTree implements IWorldGenerator {
     @Override
     public void generate(Random random, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) {
         if (world.getWorldType() == WorldType.FLAT ||
-            !world.provider.isSurfaceWorld()) {
+                !world.provider.isSurfaceWorld()) {
             return; //do not generate in flat worlds, or in non-surface worlds
         }
         BlockPos randomPos = new BlockPos(
@@ -35,15 +35,15 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG
         Biome biome = world.getBiome(randomPos);
 
         if (BiomeDictionary.hasType(biome, Type.COLD) ||
-            BiomeDictionary.hasType(biome, Type.HOT) ||
-            BiomeDictionary.hasType(biome, Type.DRY) ||
-            BiomeDictionary.hasType(biome, Type.DEAD) ||
-            BiomeDictionary.hasType(biome, Type.SPOOKY))
+                BiomeDictionary.hasType(biome, Type.HOT) ||
+                BiomeDictionary.hasType(biome, Type.DRY) ||
+                BiomeDictionary.hasType(biome, Type.DEAD) ||
+                BiomeDictionary.hasType(biome, Type.SPOOKY))
             return; //do not generate in inappropriate biomes
 
         int rubberTreeChance = 6;
         if (BiomeDictionary.hasType(biome, Type.SWAMP) ||
-            BiomeDictionary.hasType(biome, Type.WET))
+                BiomeDictionary.hasType(biome, Type.WET))
             rubberTreeChance /= 2; //double chance of spawning in swamp or wet biomes
 
         if (random.nextInt(rubberTreeChance) == 0) {
@@ -56,9 +56,9 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG
                 if (aboveState.getBlock() instanceof BlockLiquid) {
                     return;
                 }
-                
+
                 IBlockState saplingState = sapling.getDefaultState()
-                    .withProperty(BlockGregSapling.VARIANT, LogVariant.RUBBER_WOOD);
+                        .withProperty(BlockGregSapling.VARIANT, LogVariant.RUBBER_WOOD);
                 world.setBlockState(abovePos, saplingState);
                 sapling.generateTree(world, abovePos, saplingState, random);
             }
diff --git a/src/main/java/gregtech/integration/jei/GTJeiPlugin.java b/src/main/java/gregtech/integration/jei/GTJeiPlugin.java
index 83cb0a6f27e..3634b7a1cd1 100755
--- a/src/main/java/gregtech/integration/jei/GTJeiPlugin.java
+++ b/src/main/java/gregtech/integration/jei/GTJeiPlugin.java
@@ -15,9 +15,9 @@
 import gregtech.api.recipes.ingredients.IntCircuitIngredient;
 import gregtech.api.recipes.machines.FuelRecipeMap;
 import gregtech.api.recipes.machines.RecipeMapFurnace;
+import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.MaterialRegistry;
 import gregtech.api.unification.material.Materials;
-import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.properties.PropertyKey;
 import gregtech.api.worldgen.config.OreDepositDefinition;
 import gregtech.api.worldgen.config.WorldGenRegistry;
@@ -69,7 +69,7 @@ public void registerCategories(IRecipeCategoryRegistration registry) {
         registry.addRecipeCategories(new IntCircuitCategory(registry.getJeiHelpers().getGuiHelper()));
         registry.addRecipeCategories(new MultiblockInfoCategory(registry.getJeiHelpers()));
         for (RecipeMap recipeMap : RecipeMap.getRecipeMaps()) {
-            if(!recipeMap.isHidden) {
+            if (!recipeMap.isHidden) {
                 registry.addRecipeCategories(new RecipeMapCategory(recipeMap, registry.getJeiHelpers().getGuiHelper()));
             }
         }
@@ -98,16 +98,16 @@ public void register(IModRegistry registry) {
 
         for (RecipeMap recipeMap : RecipeMap.getRecipeMaps()) {
             List recipesList = recipeMap.getRecipeList()
-                .stream().filter(recipe -> !recipe.isHidden() && recipe.hasValidInputsForDisplay())
-                .map(GTRecipeWrapper::new)
-                .collect(Collectors.toList());
+                    .stream().filter(recipe -> !recipe.isHidden() && recipe.hasValidInputsForDisplay())
+                    .map(GTRecipeWrapper::new)
+                    .collect(Collectors.toList());
             registry.addRecipes(recipesList, GTValues.MODID + ":" + recipeMap.unlocalizedName);
         }
 
         for (FuelRecipeMap fuelRecipeMap : FuelRecipeMap.getRecipeMaps()) {
             List recipeList = fuelRecipeMap.getRecipeList().stream()
-                .map(GTFuelRecipeWrapper::new)
-                .collect(Collectors.toList());
+                    .map(GTFuelRecipeWrapper::new)
+                    .collect(Collectors.toList());
             registry.addRecipes(recipeList, GTValues.MODID + ":" + fuelRecipeMap.unlocalizedName);
         }
 
@@ -154,14 +154,14 @@ public void register(IModRegistry registry) {
 
         String primitiveBlastId = GTValues.MODID + ":" + "primitive_blast_furnace";
         registry.addRecipes(RecipeMaps.PRIMITIVE_BLAST_FURNACE_RECIPES.stream()
-            .map(PrimitiveBlastRecipeWrapper::new)
-            .collect(Collectors.toList()), primitiveBlastId);
+                .map(PrimitiveBlastRecipeWrapper::new)
+                .collect(Collectors.toList()), primitiveBlastId);
         registry.addRecipeCatalyst(MetaTileEntities.PRIMITIVE_BLAST_FURNACE.getStackForm(), primitiveBlastId);
 
         String cokeOvenId = GTValues.MODID + ":" + "coke_oven";
         registry.addRecipes(RecipeMaps.COKE_OVEN_RECIPES.stream()
-            .map(CokeOvenRecipeWrapper::new)
-            .collect(Collectors.toList()), cokeOvenId);
+                .map(CokeOvenRecipeWrapper::new)
+                .collect(Collectors.toList()), cokeOvenId);
         registry.addRecipeCatalyst(MetaTileEntities.COKE_OVEN.getStackForm(), cokeOvenId);
 
         //TODO, add Electromagnetic Separator to the Ore Byproduct page
@@ -199,7 +199,7 @@ public void register(IModRegistry registry) {
         //Ore Veins
         List oreVeins = WorldGenRegistry.getOreDeposits();
         List oreInfoList = new CopyOnWriteArrayList<>();
-        for(OreDepositDefinition vein : oreVeins) {
+        for (OreDepositDefinition vein : oreVeins) {
             oreInfoList.add(new GTOreInfo(vein));
         }
 
@@ -212,7 +212,7 @@ public void register(IModRegistry registry) {
         ingredientRegistry = registry.getIngredientRegistry();
         for (int i = 0; i <= IntCircuitIngredient.CIRCUIT_MAX; i++) {
             registry.addIngredientInfo(IntCircuitIngredient.getIntegratedCircuit(i), VanillaTypes.ITEM,
-                "metaitem.circuit.integrated.jei_description");
+                    "metaitem.circuit.integrated.jei_description");
         }
 
         registry.addRecipeCatalyst(MetaTileEntities.WORKBENCH.getStackForm(), VanillaRecipeCategoryUid.CRAFTING);
@@ -220,7 +220,7 @@ public void register(IModRegistry registry) {
         for (MetaTileEntity machine : MetaTileEntities.CANNER) {
             if (machine == null) continue;
             registry.addIngredientInfo(machine.getStackForm(), VanillaTypes.ITEM,
-                "gregtech.machine.canner.jei_description");
+                    "gregtech.machine.canner.jei_description");
         }
 
         //Multiblock info page registration
diff --git a/src/main/java/gregtech/integration/jei/GTOreCategory.java b/src/main/java/gregtech/integration/jei/GTOreCategory.java
index 2c93e73230c..2a248251607 100644
--- a/src/main/java/gregtech/integration/jei/GTOreCategory.java
+++ b/src/main/java/gregtech/integration/jei/GTOreCategory.java
@@ -36,7 +36,7 @@ public class GTOreCategory extends PrimitiveRecipeCategory
     protected List dimensionIDs;
     protected final int FONT_HEIGHT = Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT;
     protected final Map namedDimensions = WorldGenRegistry.getNamedDimensions();
-    private final Map dimMap =  DimensionManager.getRegisteredDimensions();
+    private final Map dimMap = DimensionManager.getRegisteredDimensions();
     private final Supplier> dimension = this::getAllRegisteredDimensions;
     private final int NUM_OF_SLOTS = 5;
     private final int SLOT_WIDTH = 18;
@@ -44,9 +44,9 @@ public class GTOreCategory extends PrimitiveRecipeCategory
 
     public GTOreCategory(IGuiHelper guiHelper) {
         super("ore_spawn_location",
-            "ore.spawnlocation.name",
-            guiHelper.createBlankDrawable(176, 166),
-            guiHelper);
+                "ore.spawnlocation.name",
+                guiHelper.createBlankDrawable(176, 166),
+                guiHelper);
 
         this.slot = guiHelper.drawableBuilder(GuiTextures.SLOT.imageLocation, 0, 0, 18, 18).setTextureSize(18, 18).build();
     }
@@ -64,7 +64,7 @@ public void setRecipe(IRecipeLayout recipeLayout, GTOreInfo recipeWrapper, @Nonn
         itemStackGroup.init(1, true, 22, 73);
 
 
-        for(int i = 0; i < recipeWrapper.getOutputCount(); i++) {
+        for (int i = 0; i < recipeWrapper.getOutputCount(); i++) {
             int yPos = baseYPos + (i / NUM_OF_SLOTS) * SLOT_HEIGHT;
             int xPos = 70 + (i % NUM_OF_SLOTS) * SLOT_WIDTH;
 
@@ -103,7 +103,7 @@ public void drawExtras(Minecraft minecraft) {
         this.slot.draw(minecraft, 22, SLOT_HEIGHT * (NUM_OF_SLOTS - 1) + 1);
 
         int yPos = 0;
-        for(int i = 0; i < outputCount; i++) {
+        for (int i = 0; i < outputCount; i++) {
             yPos = baseYPos + (i / NUM_OF_SLOTS) * SLOT_HEIGHT;
             int xPos = baseXPos + (i % NUM_OF_SLOTS) * SLOT_WIDTH;
 
@@ -119,10 +119,9 @@ public void drawExtras(Minecraft minecraft) {
         //Begin Drawing information, depending on how many rows of ore outputs were created
         //Give room for 5 lines of 5 ores each, so 25 unique ores in the vein
         //73 is SLOT_HEIGHT * (NUM_OF_SLOTS - 1) + 1
-        if(baseYPos >= SLOT_HEIGHT * NUM_OF_SLOTS) {
+        if (baseYPos >= SLOT_HEIGHT * NUM_OF_SLOTS) {
             minecraft.fontRenderer.drawString("Spawn Range: " + minHeight + "-" + maxHeight, 70, baseYPos + 1, 0x111111);
-        }
-        else {
+        } else {
             minecraft.fontRenderer.drawString("Spawn Range: " + minHeight + "-" + maxHeight, 70, SLOT_HEIGHT * (NUM_OF_SLOTS - 1) + 1, 0x111111);
             //Update the position at which the spawn information ends
             baseYPos = 73;
@@ -138,28 +137,28 @@ public void drawExtras(Minecraft minecraft) {
 
         //Will attempt to write dimension IDs in a single line, separated by commas. If the list is so long such that it
         //would run off the end of the page, the list is continued on a new line.
-        for(int i = 0; i < dimensionIDs.size(); i++) {
+        for (int i = 0; i < dimensionIDs.size(); i++) {
 
             //If the dimension name is included, append it to the dimension number
-            if(namedDimensions.containsKey(dimensionIDs.get(i))) {
+            if (namedDimensions.containsKey(dimensionIDs.get(i))) {
                 dimName = namedDimensions.get(dimensionIDs.get(i));
                 fullDimName = i == dimensionIDs.size() - 1 ?
-                    dimensionIDs.get(i) + " (" + dimName + ")" :
-                    dimensionIDs.get(i) + " (" + dimName + "), ";
+                        dimensionIDs.get(i) + " (" + dimName + ")" :
+                        dimensionIDs.get(i) + " (" + dimName + "), ";
             }
             //If the dimension name is not included, just add the dimension number
             else {
 
                 fullDimName = i == dimensionIDs.size() - 1 ?
-                    Integer.toString(dimensionIDs.get(i)) :
-                    dimensionIDs.get(i) + ", ";
+                        Integer.toString(dimensionIDs.get(i)) :
+                        dimensionIDs.get(i) + ", ";
             }
 
             //Find the length of the dimension name string
             dimDisplayLength = minecraft.fontRenderer.getStringWidth(fullDimName);
 
             //If the length of the string would go off the edge of screen, instead increment the y position
-            if(dimDisplayLength > (176 - dimDisplayPos)) {
+            if (dimDisplayLength > (176 - dimDisplayPos)) {
                 baseYPos = baseYPos + FONT_HEIGHT;
                 dimDisplayPos = 70;
             }
@@ -200,7 +199,7 @@ public List getAllRegisteredDimensions() {
                 .filter(num -> definition.getDimensionFilter().test(DimensionManager.createProviderFor(num)))
                 .forEach(dims::add);
 
-        if(isModLoaded(MODID_AR)) {
+        if (isModLoaded(MODID_AR)) {
             try {
                 int[] plantDims = DimensionManager.getDimensions(DimensionType.byName("planet"));
                 int[] asteroidDims = DimensionManager.getDimensions(DimensionType.byName("asteroid"));
@@ -224,8 +223,7 @@ public List getAllRegisteredDimensions() {
                         dims.remove((Integer) spaceDim);
                     }
                 }
-            }
-            catch (IllegalArgumentException e) {
+            } catch (IllegalArgumentException e) {
                 GTLog.logger.error("Something went wrong with AR JEI integration, No DimensionType found");
                 GTLog.logger.error(e);
             }
diff --git a/src/main/java/gregtech/integration/jei/GTOreInfo.java b/src/main/java/gregtech/integration/jei/GTOreInfo.java
index a060e6ba8ba..320a801ea04 100644
--- a/src/main/java/gregtech/integration/jei/GTOreInfo.java
+++ b/src/main/java/gregtech/integration/jei/GTOreInfo.java
@@ -18,7 +18,10 @@
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.Biome;
-import net.minecraftforge.fluids.*;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
+import net.minecraftforge.fluids.IFluidBlock;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.nio.file.FileSystem;
@@ -48,11 +51,10 @@ public GTOreInfo(OreDepositDefinition definition) {
 
         //Don't default to vanilla Maximums and minimums if the values are not defined and Cubic Chunks is loaded
         //This could be improved to use the actual minimum and maximum heights, at the cost of including the CC Api
-        if(isModLoaded(MODID_CC)) {
+        if (isModLoaded(MODID_CC)) {
             this.maxHeight = definition.getMaximumHeight() == Integer.MAX_VALUE ? Integer.MAX_VALUE : definition.getMaximumHeight();
             this.minHeight = definition.getMinimumHeight() == Integer.MIN_VALUE ? Integer.MIN_VALUE : definition.getMinimumHeight();
-        }
-        else {
+        } else {
             //Some veins don't have a maximum height, so set it to the maximum world height?
             this.maxHeight = definition.getMaximumHeight() == Integer.MAX_VALUE ? 255 : definition.getMaximumHeight();
             //Some veins don't have a minimum height, so set it to 0 in that case
@@ -60,10 +62,9 @@ public GTOreInfo(OreDepositDefinition definition) {
         }
 
         //Get the Name and trim unneeded information
-        if(definition.getAssignedName() == null) {
+        if (definition.getAssignedName() == null) {
             this.name = makePrettyName(definition.getDepositName());
-        }
-        else {
+        } else {
             this.name = definition.getAssignedName();
         }
 
@@ -103,25 +104,24 @@ public List findComponentBlocksAsItemStacks() {
         //Find all possible states in the Filler
         //Needed because one generation option returns all possible blockStates
         List possibleStates = blockFiller.getAllPossibleStates();
-        for(FillerEntry entry: possibleStates) {
+        for (FillerEntry entry : possibleStates) {
             containedStates.addAll(entry.getPossibleResults());
         }
 
         //Check to see if we are dealing with a fluid generation case, before transforming states
-        if(veinPopulator instanceof FluidSpringPopulator) {
-            for(IBlockState state : containedStates) {
+        if (veinPopulator instanceof FluidSpringPopulator) {
+            for (IBlockState state : containedStates) {
                 Block temp = state.getBlock();
-                if(temp instanceof IFluidBlock) {
+                if (temp instanceof IFluidBlock) {
                     Fluid fluid = ((IFluidBlock) temp).getFluid();
                     FluidStack fStack = new FluidStack(fluid, 1000);
                     ItemStack stack = FluidUtil.getFilledBucket(fStack);
                     containedBlocksAsItemStacks.add(stack);
                 }
             }
-        }
-        else {
+        } else {
             //Transform the list of BlockStates to a list of ItemStacks
-            for(IBlockState state : containedStates) {
+            for (IBlockState state : containedStates) {
                 containedBlocksAsItemStacks.add(new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)));
             }
         }
@@ -139,7 +139,7 @@ public List> findUniqueBlocksAsItemStack(List itemLis
 
 
         //return early for Fluid Generation
-        if(veinPopulator instanceof FluidSpringPopulator) {
+        if (veinPopulator instanceof FluidSpringPopulator) {
             groupedItems.add(new ArrayList<>(itemList));
             return groupedItems;
         }
@@ -176,23 +176,23 @@ public ItemStack findSurfaceBlock(IVeinPopulator veinPopulator) {
         FluidStack fStack;
 
         //Legacy Surface rock Support
-        if(veinPopulator instanceof SurfaceRockPopulator) {
+        if (veinPopulator instanceof SurfaceRockPopulator) {
             mat = ((SurfaceRockPopulator) veinPopulator).getMaterial();
             //Create a Tiny Dust for the Identifier.
             stack = OreDictUnifier.getDust(mat.createMaterialStack(M / 9));
             return stack.isEmpty() ? new ItemStack(Items.AIR) : stack;
         }
         //Surface Block support
-        else if(veinPopulator instanceof SurfaceBlockPopulator) {
+        else if (veinPopulator instanceof SurfaceBlockPopulator) {
             state = ((SurfaceBlockPopulator) veinPopulator).getBlockState();
             stack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state));
             return stack;
         }
         //Fluid generation support
-        else if(veinPopulator instanceof FluidSpringPopulator) {
+        else if (veinPopulator instanceof FluidSpringPopulator) {
             state = ((FluidSpringPopulator) veinPopulator).getFluidState();
             Block temp = state.getBlock();
-            if(temp instanceof IFluidBlock) {
+            if (temp instanceof IFluidBlock) {
                 Fluid fluid = ((IFluidBlock) temp).getFluid();
                 fStack = new FluidStack(fluid, 1000);
                 stack = FluidUtil.getFilledBucket(fStack);
@@ -221,7 +221,7 @@ public String makePrettyName(String name) {
         //Replace all "_" with a space
         newName = newName.replaceAll("_", " ");
         //Capitalize the first letter
-        newName = newName.substring(0,1).toUpperCase() + newName.substring(1);
+        newName = newName.substring(0, 1).toUpperCase() + newName.substring(1);
 
         return newName;
     }
@@ -230,21 +230,20 @@ public String makePrettyName(String name) {
     public void addTooltip(int slotIndex, boolean input, Object ingredient, List tooltip) {
 
         //Only add the Biome Information to the selected Ore
-        if(slotIndex == 0) {
+        if (slotIndex == 0) {
             tooltip.addAll(createBiomeTooltip());
-            if(description != null) {
+            if (description != null) {
                 tooltip.add(description);
             }
         }
         //Surface Indicator slot
-        else if(slotIndex == 1) {
+        else if (slotIndex == 1) {
             //Only add the special tooltip to the Material rock piles
-            if(veinPopulator instanceof SurfaceRockPopulator) {
+            if (veinPopulator instanceof SurfaceRockPopulator) {
                 tooltip.add(I18n.format("gregtech.jei.ore.surface_rock_1"));
                 tooltip.add(I18n.format("gregtech.jei.ore.surface_rock_2"));
             }
-        }
-        else {
+        } else {
             tooltip.addAll(createOreWeightingTooltip(slotIndex));
         }
     }
@@ -258,27 +257,26 @@ public List createBiomeTooltip() {
         List tooltip = new ArrayList<>();
 
         //Tests biomes against all registered biomes to find which biomes have had their weights modified
-        while(biomeIterator.hasNext()) {
+        while (biomeIterator.hasNext()) {
 
             Biome biome = biomeIterator.next();
 
             //Gives the Biome Weight
             biomeWeight = biomeFunction.apply(biome);
             //Check if the biomeWeight is modified
-            if(biomeWeight != weight) {
+            if (biomeWeight != weight) {
                 modifiedBiomeMap.put(biome, weight + biomeWeight);
             }
         }
 
-        for(Map.Entry entry : modifiedBiomeMap.entrySet()) {
+        for (Map.Entry entry : modifiedBiomeMap.entrySet()) {
 
             //Don't show non changed weights, to save room
-            if(!(entry.getValue() == weight)) {
+            if (!(entry.getValue() == weight)) {
                 //Cannot Spawn
-                if(entry.getValue() <= 0) {
+                if (entry.getValue() <= 0) {
                     tooltip.add(I18n.format("gregtech.jei.ore.biome_weighting_no_spawn", entry.getKey().getBiomeName()));
-                }
-                else {
+                } else {
                     tooltip.add(I18n.format("gregtech.jei.ore.biome_weighting", entry.getKey().getBiomeName(), entry.getValue()));
                 }
             }
@@ -304,8 +302,8 @@ public List createOreWeightingTooltip(int slotIndex) {
             }
         }
 
-        for(FillerEntry entry : fillerEntries) {
-            if(entry.getEntries() != null && !entry.getEntries().isEmpty()) {
+        for (FillerEntry entry : fillerEntries) {
+            if (entry.getEntries() != null && !entry.getEntries().isEmpty()) {
                 Pair entryWithWeight = entry.getEntries().get(slotIndex - 2);
                 weight = Math.round((entryWithWeight.getKey() / (double) totalWeight) * 100);
                 tooltip.add("Weight in vein: " + weight + "%");
diff --git a/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoPage.java b/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoPage.java
index 6ff9ab6cdc0..121b6b2afd0 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoPage.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoPage.java
@@ -48,6 +48,7 @@ public List informationText() {
     /**
      * Gets the Map containing all tooltips for Blocks that have had tooltips applied.
      * Will generate the map if it does not exist
+     *
      * @return - The Map containing Tooltips and Formatting for specific Blocks
      */
     public Map> getBlockTooltipMap() {
@@ -63,11 +64,11 @@ public Map> getBlockTooltipMap() {
      */
     protected void generateBlockTooltips() {
 
-        for(int i  = 0; i < GTValues.UHV + 1; i++) {
+        for (int i = 0; i < GTValues.UHV + 1; i++) {
             addBlockTooltip(MetaTileEntities.ITEM_EXPORT_BUS[i].getStackForm(), defaultText);
-            addBlockTooltip(MetaTileEntities.ITEM_IMPORT_BUS[i].getStackForm(),  defaultText);
-            addBlockTooltip(MetaTileEntities.FLUID_EXPORT_HATCH[i].getStackForm(),  defaultText);
-            addBlockTooltip(MetaTileEntities.FLUID_IMPORT_HATCH[i].getStackForm(),  defaultText);
+            addBlockTooltip(MetaTileEntities.ITEM_IMPORT_BUS[i].getStackForm(), defaultText);
+            addBlockTooltip(MetaTileEntities.FLUID_EXPORT_HATCH[i].getStackForm(), defaultText);
+            addBlockTooltip(MetaTileEntities.FLUID_IMPORT_HATCH[i].getStackForm(), defaultText);
         }
     }
 
@@ -75,19 +76,19 @@ protected void generateBlockTooltips() {
      * A Helper method for adding tooltips to Blocks in the multiblock preview screen.
      * Can be called if {@link MultiblockInfoPage#generateBlockTooltips()} is not overridden
      * Will add tooltips to MultiblockAbilities with existing tooltips
+     *
      * @param itemStack - The ItemStack form of the Block to add a Tooltip too
-     * @param tooltip - An ITextComponent object consisting of the tooltip and format to add to the block
+     * @param tooltip   - An ITextComponent object consisting of the tooltip and format to add to the block
      */
     protected void addBlockTooltip(ItemStack itemStack, ITextComponent tooltip) {
 
         List tooltipList = this.blockTooltips.getOrDefault(itemStack, null);
 
-        if(tooltipList == null) {
+        if (tooltipList == null) {
             List tooltipToAdd = new ArrayList<>();
             tooltipToAdd.add(tooltip);
             this.blockTooltips.put(itemStack, tooltipToAdd);
-        }
-        else {
+        } else {
             tooltipList.add(tooltip);
             this.blockTooltips.put(itemStack, tooltipList);
 
diff --git a/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoRecipeWrapper.java b/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoRecipeWrapper.java
index c267511bcf5..f1e5db21f4d 100755
--- a/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoRecipeWrapper.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoRecipeWrapper.java
@@ -349,9 +349,9 @@ public List getTooltipStrings(int mouseX, int mouseY) {
                 }
             }
             Map> blockTooltipMap = infoPage.getBlockTooltipMap();
-            if(blockTooltipMap.containsKey(tooltipBlockStack)) {
+            if (blockTooltipMap.containsKey(tooltipBlockStack)) {
                 List tooltips = blockTooltipMap.get(tooltipBlockStack);
-                for(int i = 0; i < tooltips.size(); i++) {
+                for (int i = 0; i < tooltips.size(); i++) {
                     //Start at i+1 due to ItemStack name
                     tooltip.add(i + 1, tooltips.get(i).getFormattedText());
                 }
@@ -363,9 +363,9 @@ public List getTooltipStrings(int mouseX, int mouseY) {
 
     public void addBlockTooltips(int slotIndex, boolean input, ItemStack itemStack, List tooltip) {
         Map> blockTooltipMap = infoPage.getBlockTooltipMap();
-        if(blockTooltipMap.containsKey(itemStack)) {
+        if (blockTooltipMap.containsKey(itemStack)) {
             List tooltips = blockTooltipMap.get(itemStack);
-            for(int i = 0; i < tooltips.size(); i++) {
+            for (int i = 0; i < tooltips.size(); i++) {
                 tooltip.add(i + 1, tooltips.get(i).getFormattedText());
             }
         }
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/AssemblyLineInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/AssemblyLineInfo.java
index d88c77082e0..3dfa7c985a3 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/AssemblyLineInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/AssemblyLineInfo.java
@@ -2,7 +2,10 @@
 
 import gregtech.api.GTValues;
 import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
-import gregtech.common.blocks.*;
+import gregtech.common.blocks.BlockMetalCasing;
+import gregtech.common.blocks.BlockMultiblockCasing;
+import gregtech.common.blocks.BlockTransparentCasing;
+import gregtech.common.blocks.MetaBlocks;
 import gregtech.common.metatileentities.MetaTileEntities;
 import gregtech.integration.jei.multiblock.MultiblockInfoPage;
 import gregtech.integration.jei.multiblock.MultiblockShapeInfo;
@@ -75,11 +78,11 @@ protected void generateBlockTooltips() {
                 new TextComponentTranslation("gregtech.machine.item_bus.export.ulv.name"))
                 .setStyle(new Style().setColor(TextFormatting.RED));
 
-        for(int i = 0; i < GTValues.UHV + 1; i++) {
+        for (int i = 0; i < GTValues.UHV + 1; i++) {
             addBlockTooltip(MetaTileEntities.ITEM_EXPORT_BUS[i].getStackForm(), defaultText);
             addBlockTooltip(MetaTileEntities.ITEM_EXPORT_BUS[i].getStackForm(), outputTooltip);
-            addBlockTooltip(MetaTileEntities.FLUID_EXPORT_HATCH[i].getStackForm(),  defaultText);
-            addBlockTooltip(MetaTileEntities.FLUID_IMPORT_HATCH[i].getStackForm(),  defaultText);
+            addBlockTooltip(MetaTileEntities.FLUID_EXPORT_HATCH[i].getStackForm(), defaultText);
+            addBlockTooltip(MetaTileEntities.FLUID_IMPORT_HATCH[i].getStackForm(), defaultText);
         }
         addBlockTooltip(MetaTileEntities.ITEM_IMPORT_BUS[0].getStackForm(), inputTooltip);
     }
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/CokeOvenInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/CokeOvenInfo.java
index 65abbb21273..07c88cc45dd 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/CokeOvenInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/CokeOvenInfo.java
@@ -23,14 +23,14 @@ public MultiblockControllerBase getController() {
     @Override
     public List getMatchingShapes() {
         MultiblockShapeInfo shapeInfo = MultiblockShapeInfo.builder()
-            .aisle("XXX", "XXX", "XXX")
-            .aisle("XXX", "C#X", "XXX")
-            .aisle("XXX", "XSX", "XXX")
-            .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.COKE_BRICKS))
-            .where('C', MetaTileEntities.COKE_OVEN, EnumFacing.WEST)
-            .where('S', MetaTileEntities.COKE_OVEN_HATCH, EnumFacing.SOUTH)
-            .where('#', Blocks.AIR.getDefaultState())
-            .build();
+                .aisle("XXX", "XXX", "XXX")
+                .aisle("XXX", "C#X", "XXX")
+                .aisle("XXX", "XSX", "XXX")
+                .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.COKE_BRICKS))
+                .where('C', MetaTileEntities.COKE_OVEN, EnumFacing.WEST)
+                .where('S', MetaTileEntities.COKE_OVEN_HATCH, EnumFacing.SOUTH)
+                .where('#', Blocks.AIR.getDefaultState())
+                .build();
         return Lists.newArrayList(shapeInfo);
     }
 
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/CrackerUnitInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/CrackerUnitInfo.java
index fe23c7c9dce..2114ce6eee5 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/CrackerUnitInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/CrackerUnitInfo.java
@@ -29,17 +29,17 @@ public MultiblockControllerBase getController() {
     @Override
     public List getMatchingShapes() {
         MultiblockShapeInfo shapeInfo = MultiblockShapeInfo.builder()
-            .aisle("XCXCX", "XCSCF", "XCXCX")
-            .aisle("XCXCX", "H###X", "XCXCX")
-            .aisle("XCXCX", "XCECF", "XCXCX")
-            .where('S', MetaTileEntities.CRACKER, EnumFacing.NORTH)
-            .where('X', MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.STAINLESS_CLEAN))
-            .where('C', MetaBlocks.WIRE_COIL.getState(BlockWireCoil.CoilType.CUPRONICKEL))
-            .where('#', Blocks.AIR.getDefaultState())
-            .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.HV], EnumFacing.EAST)
-            .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.HV], EnumFacing.SOUTH)
-            .where('H', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.HV], EnumFacing.WEST)
-            .build();
+                .aisle("XCXCX", "XCSCF", "XCXCX")
+                .aisle("XCXCX", "H###X", "XCXCX")
+                .aisle("XCXCX", "XCECF", "XCXCX")
+                .where('S', MetaTileEntities.CRACKER, EnumFacing.NORTH)
+                .where('X', MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.STAINLESS_CLEAN))
+                .where('C', MetaBlocks.WIRE_COIL.getState(BlockWireCoil.CoilType.CUPRONICKEL))
+                .where('#', Blocks.AIR.getDefaultState())
+                .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.HV], EnumFacing.EAST)
+                .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.HV], EnumFacing.SOUTH)
+                .where('H', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.HV], EnumFacing.WEST)
+                .build();
         return Lists.newArrayList(shapeInfo);
     }
 
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/DistillationTowerInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/DistillationTowerInfo.java
index 24a8785b9f5..1210aec697a 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/DistillationTowerInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/DistillationTowerInfo.java
@@ -28,17 +28,17 @@ public MultiblockControllerBase getController() {
     @Override
     public List getMatchingShapes() {
         MultiblockShapeInfo shapeInfo = MultiblockShapeInfo.builder()
-            .aisle("EXX", "XXX", "XXX", "XXX", "XXX", "XXX")
-            .aisle("SFX", "X#X", "X#X", "X#X", "X#X", "XXX")
-            .aisle("IXX", "HXX", "HXX", "HXX", "HXX", "HXX")
-            .where('#', Blocks.AIR.getDefaultState())
-            .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.STAINLESS_CLEAN))
-            .where('S', MetaTileEntities.DISTILLATION_TOWER, EnumFacing.WEST)
-            .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.EV], EnumFacing.WEST)
-            .where('I', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.EV], EnumFacing.WEST)
-            .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.EV], EnumFacing.DOWN)
-            .where('H', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.EV], EnumFacing.WEST)
-            .build();
+                .aisle("EXX", "XXX", "XXX", "XXX", "XXX", "XXX")
+                .aisle("SFX", "X#X", "X#X", "X#X", "X#X", "XXX")
+                .aisle("IXX", "HXX", "HXX", "HXX", "HXX", "HXX")
+                .where('#', Blocks.AIR.getDefaultState())
+                .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.STAINLESS_CLEAN))
+                .where('S', MetaTileEntities.DISTILLATION_TOWER, EnumFacing.WEST)
+                .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.EV], EnumFacing.WEST)
+                .where('I', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.EV], EnumFacing.WEST)
+                .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.EV], EnumFacing.DOWN)
+                .where('H', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.EV], EnumFacing.WEST)
+                .build();
         return Lists.newArrayList(shapeInfo);
     }
 
@@ -58,7 +58,7 @@ protected void generateBlockTooltips() {
         ITextComponent tooltip = new TextComponentTranslation("gregtech.multiblock.preview.limit_per_layer", 1).setStyle(new Style().setColor(TextFormatting.DARK_RED));
         ITextComponent inputTooltip = new TextComponentTranslation("gregtech.multiblock.preview.only_location", I18n.format("gregtech.multiblock.preview.location.b_c")).setStyle(new Style().setColor(TextFormatting.DARK_RED));
 
-        for(int i = 0; i < GTValues.UHV + 1; i++) {
+        for (int i = 0; i < GTValues.UHV + 1; i++) {
             addBlockTooltip(MetaTileEntities.FLUID_EXPORT_HATCH[i].getStackForm(), tooltip);
             addBlockTooltip(MetaTileEntities.FLUID_IMPORT_HATCH[i].getStackForm(), inputTooltip);
         }
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/ElectricBlastFurnaceInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/ElectricBlastFurnaceInfo.java
index 23e35e6ccc3..bb9d1497f65 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/ElectricBlastFurnaceInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/ElectricBlastFurnaceInfo.java
@@ -31,23 +31,23 @@ public List getMatchingShapes() {
         ArrayList shapeInfo = new ArrayList<>();
         for (CoilType coilType : CoilType.values()) {
             shapeInfo.add(MultiblockShapeInfo.builder()
-                .aisle("IFX", "CCC", "CCC", "XXX")
-                .aisle("SXE", "C#C", "C#C", "XXX")
-                .aisle("ODX", "CCC", "CCC", "XXX")
-                .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.INVAR_HEATPROOF))
-                .where('C', MetaBlocks.WIRE_COIL.getState(coilType))
-                .where('S', MetaTileEntities.ELECTRIC_BLAST_FURNACE, EnumFacing.WEST)
+                    .aisle("IFX", "CCC", "CCC", "XXX")
+                    .aisle("SXE", "C#C", "C#C", "XXX")
+                    .aisle("ODX", "CCC", "CCC", "XXX")
+                    .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.INVAR_HEATPROOF))
+                    .where('C', MetaBlocks.WIRE_COIL.getState(coilType))
+                    .where('S', MetaTileEntities.ELECTRIC_BLAST_FURNACE, EnumFacing.WEST)
 
-                .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.MV], EnumFacing.EAST)
-                .where('I', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.LV], EnumFacing.WEST)
-                .where('O', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.LV], EnumFacing.WEST)
+                    .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.MV], EnumFacing.EAST)
+                    .where('I', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.LV], EnumFacing.WEST)
+                    .where('O', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.LV], EnumFacing.WEST)
 
-                .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.LV], EnumFacing.NORTH)
-                .where('D', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.LV], EnumFacing.SOUTH)
+                    .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.LV], EnumFacing.NORTH)
+                    .where('D', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.LV], EnumFacing.SOUTH)
 
 
-                .where('#', Blocks.AIR.getDefaultState())
-                .build());
+                    .where('#', Blocks.AIR.getDefaultState())
+                    .build());
         }
         return shapeInfo;
     }
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/FusionReactorInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/FusionReactorInfo.java
index 620a118cc3d..62114be913b 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/FusionReactorInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/FusionReactorInfo.java
@@ -66,7 +66,7 @@ public List getMatchingShapes() {
     }
 
     private static IBlockState getCasing(int tier) {
-        switch(tier) {
+        switch (tier) {
             case 0:
                 return MetaBlocks.MACHINE_CASING.getState(BlockMachineCasing.MachineCasingType.LuV);
             case 1:
@@ -84,7 +84,7 @@ private static IBlockState getCoil(int tier) {
 
     @Override
     public String[] getDescription() {
-        return new String[] {
+        return new String[]{
                 I18n.format(String.format("gregtech.multiblock.fusion_reactor_mk%d.description", tier + 1))
         };
     }
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/ImplosionCompressorInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/ImplosionCompressorInfo.java
index 1c93a2f1063..35733f9585a 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/ImplosionCompressorInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/ImplosionCompressorInfo.java
@@ -28,16 +28,16 @@ public MultiblockControllerBase getController() {
     @Override
     public List getMatchingShapes() {
         MultiblockShapeInfo shapeInfo = MultiblockShapeInfo.builder()
-            .aisle("XXX", "XBX", "XXX")
-            .aisle("XXX", "C#E", "XXX")
-            .aisle("XXX", "XIX", "XXX")
-            .where('C', MetaTileEntities.IMPLOSION_COMPRESSOR, EnumFacing.WEST)
-            .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID))
-            .where('#', Blocks.AIR.getDefaultState())
-            .where('I', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.HV], EnumFacing.SOUTH)
-            .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.HV], EnumFacing.EAST)
-            .where('B', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.HV], EnumFacing.NORTH)
-            .build();
+                .aisle("XXX", "XBX", "XXX")
+                .aisle("XXX", "C#E", "XXX")
+                .aisle("XXX", "XIX", "XXX")
+                .where('C', MetaTileEntities.IMPLOSION_COMPRESSOR, EnumFacing.WEST)
+                .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID))
+                .where('#', Blocks.AIR.getDefaultState())
+                .where('I', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.HV], EnumFacing.SOUTH)
+                .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.HV], EnumFacing.EAST)
+                .where('B', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.HV], EnumFacing.NORTH)
+                .build();
         return Lists.newArrayList(shapeInfo);
     }
 
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/LargeBoilerInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/LargeBoilerInfo.java
index 351fb7ab5b3..559b594e741 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/LargeBoilerInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/LargeBoilerInfo.java
@@ -28,17 +28,17 @@ public MultiblockControllerBase getController() {
     @Override
     public List getMatchingShapes() {
         MultiblockShapeInfo shapeInfo = MultiblockShapeInfo.builder()
-            .aisle("FXX", "CCC", "CCC", "CCC")
-            .aisle("XXX", "SPC", "CPC", "CCC")
-            .aisle("IXX", "COC", "CCC", "CCC")
-            .where('S', boiler, EnumFacing.WEST)
-            .where('P', boiler.boilerType.pipeState)
-            .where('X', boiler.boilerType.fireboxState)
-            .where('C', boiler.boilerType.casingState)
-            .where('O', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.MV], EnumFacing.SOUTH)
-            .where('I', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.MV], EnumFacing.WEST)
-            .where('F', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.MV], EnumFacing.WEST)
-            .build();
+                .aisle("FXX", "CCC", "CCC", "CCC")
+                .aisle("XXX", "SPC", "CPC", "CCC")
+                .aisle("IXX", "COC", "CCC", "CCC")
+                .where('S', boiler, EnumFacing.WEST)
+                .where('P', boiler.boilerType.pipeState)
+                .where('X', boiler.boilerType.fireboxState)
+                .where('C', boiler.boilerType.casingState)
+                .where('O', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.MV], EnumFacing.SOUTH)
+                .where('I', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.MV], EnumFacing.WEST)
+                .where('F', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.MV], EnumFacing.WEST)
+                .build();
         return Lists.newArrayList(shapeInfo);
     }
 
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/LargeChemicalReactorInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/LargeChemicalReactorInfo.java
index d5e34a913db..585f930cd92 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/LargeChemicalReactorInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/LargeChemicalReactorInfo.java
@@ -42,39 +42,39 @@ public List getMatchingShapes() {
                 .where('H', MetaTileEntities.FLUID_EXPORT_HATCH[3], EnumFacing.WEST);
 
         shapeInfo.add(
-            baseBuilder.shallowCopy()
-                .aisle("IXX", "FXX", "XXX")
-                .aisle("EXX", "SPC", "XXX")
-                .aisle("OXX", "HXX", "XXX")
-                .build()
+                baseBuilder.shallowCopy()
+                        .aisle("IXX", "FXX", "XXX")
+                        .aisle("EXX", "SPC", "XXX")
+                        .aisle("OXX", "HXX", "XXX")
+                        .build()
         );
         shapeInfo.add(
                 baseBuilder.shallowCopy()
-                .aisle("IXX", "FXX", "XXX")
-                .aisle("EXX", "SPX", "XCX")
-                .aisle("OXX", "HXX", "XXX")
-                .build()
+                        .aisle("IXX", "FXX", "XXX")
+                        .aisle("EXX", "SPX", "XCX")
+                        .aisle("OXX", "HXX", "XXX")
+                        .build()
         );
         shapeInfo.add(
                 baseBuilder.shallowCopy()
-                .aisle("IXX", "FXX", "XXX")
-                .aisle("ECX", "SPX", "XXX")
-                .aisle("OXX", "HXX", "XXX")
-                .build()
+                        .aisle("IXX", "FXX", "XXX")
+                        .aisle("ECX", "SPX", "XXX")
+                        .aisle("OXX", "HXX", "XXX")
+                        .build()
         );
         shapeInfo.add(
                 baseBuilder.shallowCopy()
-                .aisle("IXX", "FCX", "XXX")
-                .aisle("EXX", "SPX", "XXX")
-                .aisle("OXX", "HXX", "XXX")
-                .build()
+                        .aisle("IXX", "FCX", "XXX")
+                        .aisle("EXX", "SPX", "XXX")
+                        .aisle("OXX", "HXX", "XXX")
+                        .build()
         );
         shapeInfo.add(
                 baseBuilder.shallowCopy()
-                .aisle("IXX", "FXX", "XXX")
-                .aisle("EXX", "SPX", "XXX")
-                .aisle("OXX", "HCX", "XXX")
-                .build()
+                        .aisle("IXX", "FXX", "XXX")
+                        .aisle("EXX", "SPX", "XXX")
+                        .aisle("OXX", "HCX", "XXX")
+                        .build()
         );
 
         return shapeInfo;
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/LargeCombustionEngineInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/LargeCombustionEngineInfo.java
index adb6c59e1ef..9d82b27736d 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/LargeCombustionEngineInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/LargeCombustionEngineInfo.java
@@ -26,18 +26,18 @@ public MultiblockControllerBase getController() {
     @Override
     public List getMatchingShapes() {
         MultiblockShapeInfo shapeInfo = MultiblockShapeInfo.builder()
-            .aisle("AAA", "ACA", "AAA")
-            .aisle("HHH", "HGH", "HHH")
-            .aisle("HHH", "FGH", "HHH")
-            .aisle("HHH", "HEH", "HHH")
-            .where('H', MetaBlocks.METAL_CASING.getState(MetalCasingType.TITANIUM_STABLE))
-            .where('G', MetaBlocks.TURBINE_CASING.getState(BlockTurbineCasing.TurbineCasingType.TITANIUM_GEARBOX))
-            .where('A', MetaBlocks.MULTIBLOCK_CASING.getState(BlockMultiblockCasing.MultiblockCasingType.ENGINE_INTAKE_CASING))
-            .where('C', MetaTileEntities.LARGE_COMBUSTION_ENGINE, EnumFacing.NORTH)
-            .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.EV], EnumFacing.WEST)
-            .where('E', MetaTileEntities.ENERGY_OUTPUT_HATCH[GTValues.EV], EnumFacing.SOUTH)
-            .where('#', Blocks.AIR.getDefaultState())
-            .build();
+                .aisle("AAA", "ACA", "AAA")
+                .aisle("HHH", "HGH", "HHH")
+                .aisle("HHH", "FGH", "HHH")
+                .aisle("HHH", "HEH", "HHH")
+                .where('H', MetaBlocks.METAL_CASING.getState(MetalCasingType.TITANIUM_STABLE))
+                .where('G', MetaBlocks.TURBINE_CASING.getState(BlockTurbineCasing.TurbineCasingType.TITANIUM_GEARBOX))
+                .where('A', MetaBlocks.MULTIBLOCK_CASING.getState(BlockMultiblockCasing.MultiblockCasingType.ENGINE_INTAKE_CASING))
+                .where('C', MetaTileEntities.LARGE_COMBUSTION_ENGINE, EnumFacing.NORTH)
+                .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.EV], EnumFacing.WEST)
+                .where('E', MetaTileEntities.ENERGY_OUTPUT_HATCH[GTValues.EV], EnumFacing.SOUTH)
+                .where('#', Blocks.AIR.getDefaultState())
+                .build();
         return Lists.newArrayList(shapeInfo);
     }
 
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/LargeTurbineInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/LargeTurbineInfo.java
index cac715e9282..c63d6cac897 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/LargeTurbineInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/LargeTurbineInfo.java
@@ -43,15 +43,15 @@ public List getMatchingShapes() {
         TurbineRotorBehavior.getInstanceFor(rotorStack).setPartMaterial(rotorStack, Materials.Darmstadtium);
         ((MetaTileEntityRotorHolder) holder.getMetaTileEntity()).getRotorInventory().setStackInSlot(0, rotorStack);
         MultiblockShapeInfo.Builder shapeInfo = MultiblockShapeInfo.builder()
-            .aisle("CCCC", "CIOC", "CCCC")
-            .aisle("CCCC", "RGGD", "CCCC")
-            .aisle("CCCC", "CSCC", "CCCC")
-            .where('S', turbine, EnumFacing.SOUTH)
-            .where('C', turbine.turbineType.casingState)
-            .where('R', new BlockInfo(MetaBlocks.MACHINE.getDefaultState(), holder))
-            .where('D', MetaTileEntities.ENERGY_OUTPUT_HATCH[GTValues.EV], EnumFacing.EAST)
-            .where('G', turbine.turbineType.gearboxState)
-            .where('I', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.HV], EnumFacing.NORTH);
+                .aisle("CCCC", "CIOC", "CCCC")
+                .aisle("CCCC", "RGGD", "CCCC")
+                .aisle("CCCC", "CSCC", "CCCC")
+                .where('S', turbine, EnumFacing.SOUTH)
+                .where('C', turbine.turbineType.casingState)
+                .where('R', new BlockInfo(MetaBlocks.MACHINE.getDefaultState(), holder))
+                .where('D', MetaTileEntities.ENERGY_OUTPUT_HATCH[GTValues.EV], EnumFacing.EAST)
+                .where('G', turbine.turbineType.gearboxState)
+                .where('I', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.HV], EnumFacing.NORTH);
         if (turbine.turbineType.hasOutputHatch) {
             shapeInfo.where('O', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.EV], EnumFacing.NORTH);
         } else {
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/MultiSmelterInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/MultiSmelterInfo.java
index 6e2aee9b290..24e1d87f152 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/MultiSmelterInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/MultiSmelterInfo.java
@@ -31,17 +31,17 @@ public List getMatchingShapes() {
         ArrayList shapeInfo = new ArrayList<>();
         for (CoilType coilType : CoilType.values()) {
             shapeInfo.add(MultiblockShapeInfo.builder()
-                .aisle("IXX", "CCC", "XXX")
-                .aisle("SXE", "C#C", "XXX")
-                .aisle("OXX", "CCC", "XXX")
-                .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.INVAR_HEATPROOF))
-                .where('C', MetaBlocks.WIRE_COIL.getState(coilType))
-                .where('S', MetaTileEntities.MULTI_FURNACE, EnumFacing.WEST)
-                .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.MV], EnumFacing.EAST)
-                .where('I', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.LV], EnumFacing.WEST)
-                .where('O', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.LV], EnumFacing.WEST)
-                .where('#', Blocks.AIR.getDefaultState())
-                .build());
+                    .aisle("IXX", "CCC", "XXX")
+                    .aisle("SXE", "C#C", "XXX")
+                    .aisle("OXX", "CCC", "XXX")
+                    .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.INVAR_HEATPROOF))
+                    .where('C', MetaBlocks.WIRE_COIL.getState(coilType))
+                    .where('S', MetaTileEntities.MULTI_FURNACE, EnumFacing.WEST)
+                    .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.MV], EnumFacing.EAST)
+                    .where('I', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.LV], EnumFacing.WEST)
+                    .where('O', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.LV], EnumFacing.WEST)
+                    .where('#', Blocks.AIR.getDefaultState())
+                    .build());
         }
         return shapeInfo;
     }
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/PrimitiveBlastFurnaceInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/PrimitiveBlastFurnaceInfo.java
index 4775fd0569c..60bcf2da692 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/PrimitiveBlastFurnaceInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/PrimitiveBlastFurnaceInfo.java
@@ -23,13 +23,13 @@ public MultiblockControllerBase getController() {
     @Override
     public List getMatchingShapes() {
         MultiblockShapeInfo shapeInfo = MultiblockShapeInfo.builder()
-            .aisle("XXX", "XXX", "XXX", "XXX")
-            .aisle("XXX", "C#X", "X#X", "X#X")
-            .aisle("XXX", "XXX", "XXX", "XXX")
-            .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.PRIMITIVE_BRICKS))
-            .where('C', MetaTileEntities.PRIMITIVE_BLAST_FURNACE, EnumFacing.WEST)
-            .where('#', Blocks.AIR.getDefaultState())
-            .build();
+                .aisle("XXX", "XXX", "XXX", "XXX")
+                .aisle("XXX", "C#X", "X#X", "X#X")
+                .aisle("XXX", "XXX", "XXX", "XXX")
+                .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.PRIMITIVE_BRICKS))
+                .where('C', MetaTileEntities.PRIMITIVE_BLAST_FURNACE, EnumFacing.WEST)
+                .where('#', Blocks.AIR.getDefaultState())
+                .build();
         return Lists.newArrayList(shapeInfo);
     }
 
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/PyrolyseOvenInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/PyrolyseOvenInfo.java
index 1700bd1bf71..a68d1feb260 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/PyrolyseOvenInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/PyrolyseOvenInfo.java
@@ -30,20 +30,20 @@ public MultiblockControllerBase getController() {
     @Override
     public List getMatchingShapes() {
         MultiblockShapeInfo shapeInfo = MultiblockShapeInfo.builder()
-            .aisle("XXX", "ISF", "XXX")
-            .aisle("CCC", "C#C", "CCC")
-            .aisle("CCC", "C#C", "CCC")
-            .aisle("XXX", "BEH", "XXX")
-            .where('S', MetaTileEntities.PYROLYSE_OVEN, EnumFacing.NORTH)
-            .where('X', MetaBlocks.MACHINE_CASING.getState(BlockMachineCasing.MachineCasingType.ULV))
-            .where('C', MetaBlocks.WIRE_COIL.getState(BlockWireCoil.CoilType.CUPRONICKEL))
-            .where('#', Blocks.AIR.getDefaultState())
-            .where('I', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.HV], EnumFacing.NORTH)
-            .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.HV], EnumFacing.NORTH)
-            .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.HV], EnumFacing.SOUTH)
-            .where('B', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.HV], EnumFacing.SOUTH)
-            .where('H', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.HV], EnumFacing.SOUTH)
-            .build();
+                .aisle("XXX", "ISF", "XXX")
+                .aisle("CCC", "C#C", "CCC")
+                .aisle("CCC", "C#C", "CCC")
+                .aisle("XXX", "BEH", "XXX")
+                .where('S', MetaTileEntities.PYROLYSE_OVEN, EnumFacing.NORTH)
+                .where('X', MetaBlocks.MACHINE_CASING.getState(BlockMachineCasing.MachineCasingType.ULV))
+                .where('C', MetaBlocks.WIRE_COIL.getState(BlockWireCoil.CoilType.CUPRONICKEL))
+                .where('#', Blocks.AIR.getDefaultState())
+                .where('I', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.HV], EnumFacing.NORTH)
+                .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.HV], EnumFacing.NORTH)
+                .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.HV], EnumFacing.SOUTH)
+                .where('B', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.HV], EnumFacing.SOUTH)
+                .where('H', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.HV], EnumFacing.SOUTH)
+                .build();
         return Lists.newArrayList(shapeInfo);
     }
 
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/SteamOvenInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/SteamOvenInfo.java
index 38da9402746..927650958e5 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/SteamOvenInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/SteamOvenInfo.java
@@ -33,7 +33,7 @@ public List getMatchingShapes() {
                     .aisle("HFF", "S#X", "XXX")
                     .aisle("FFF", "OXX", "###")
                     .where('S', MetaTileEntities.STEAM_OVEN, EnumFacing.WEST)
-                    .where('X',  MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.STEEL_SOLID))
+                    .where('X', MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.STEEL_SOLID))
                     .where('F', MetaBlocks.BOILER_FIREBOX_CASING.getState(BlockFireboxCasing.FireboxCasingType.STEEL_FIREBOX))
                     .where('I', MetaTileEntities.STEAM_IMPORT_BUS, EnumFacing.WEST)
                     .where('O', MetaTileEntities.STEAM_EXPORT_BUS, EnumFacing.WEST)
@@ -47,7 +47,7 @@ public List getMatchingShapes() {
                     .aisle("HFF", "S#X", "XXX")
                     .aisle("FFF", "OXX", "###")
                     .where('S', MetaTileEntities.STEAM_OVEN, EnumFacing.WEST)
-                    .where('X',  MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.BRONZE_BRICKS))
+                    .where('X', MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.BRONZE_BRICKS))
                     .where('F', MetaBlocks.BOILER_FIREBOX_CASING.getState(BlockFireboxCasing.FireboxCasingType.BRONZE_FIREBOX))
                     .where('I', MetaTileEntities.STEAM_IMPORT_BUS, EnumFacing.WEST)
                     .where('O', MetaTileEntities.STEAM_EXPORT_BUS, EnumFacing.WEST)
diff --git a/src/main/java/gregtech/integration/jei/multiblock/infos/VacuumFreezerInfo.java b/src/main/java/gregtech/integration/jei/multiblock/infos/VacuumFreezerInfo.java
index 97dde4a4a0e..080aac82ad8 100644
--- a/src/main/java/gregtech/integration/jei/multiblock/infos/VacuumFreezerInfo.java
+++ b/src/main/java/gregtech/integration/jei/multiblock/infos/VacuumFreezerInfo.java
@@ -28,18 +28,18 @@ public MultiblockControllerBase getController() {
     @Override
     public List getMatchingShapes() {
         MultiblockShapeInfo shapeInfo = MultiblockShapeInfo.builder()
-            .aisle("XXX", "BXH", "XXX")
-            .aisle("XXX", "C#E", "XXX")
-            .aisle("XXX", "IXF", "XXX")
-            .where('C', MetaTileEntities.VACUUM_FREEZER, EnumFacing.WEST)
-            .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.ALUMINIUM_FROSTPROOF))
-            .where('#', Blocks.AIR.getDefaultState())
-            .where('I', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.HV], EnumFacing.SOUTH)
-            .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.HV], EnumFacing.SOUTH)
-            .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.HV], EnumFacing.EAST)
-            .where('B', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.HV], EnumFacing.NORTH)
-            .where('H', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.HV], EnumFacing.NORTH)
-            .build();
+                .aisle("XXX", "BXH", "XXX")
+                .aisle("XXX", "C#E", "XXX")
+                .aisle("XXX", "IXF", "XXX")
+                .where('C', MetaTileEntities.VACUUM_FREEZER, EnumFacing.WEST)
+                .where('X', MetaBlocks.METAL_CASING.getState(MetalCasingType.ALUMINIUM_FROSTPROOF))
+                .where('#', Blocks.AIR.getDefaultState())
+                .where('I', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.HV], EnumFacing.SOUTH)
+                .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.HV], EnumFacing.SOUTH)
+                .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.HV], EnumFacing.EAST)
+                .where('B', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.HV], EnumFacing.NORTH)
+                .where('H', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.HV], EnumFacing.NORTH)
+                .build();
         return Lists.newArrayList(shapeInfo);
     }
 
diff --git a/src/main/java/gregtech/integration/jei/recipe/FacadeRegistryPlugin.java b/src/main/java/gregtech/integration/jei/recipe/FacadeRegistryPlugin.java
index ca469191ad1..58f3d9e98e6 100644
--- a/src/main/java/gregtech/integration/jei/recipe/FacadeRegistryPlugin.java
+++ b/src/main/java/gregtech/integration/jei/recipe/FacadeRegistryPlugin.java
@@ -3,8 +3,8 @@
 import com.google.common.collect.Lists;
 import gregtech.api.GTValues;
 import gregtech.api.unification.OreDictUnifier;
-import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.common.covers.facade.FacadeHelper;
 import gregtech.common.items.MetaItems;
@@ -67,16 +67,16 @@ public  List getRecipeWrappers(IRecipeCategory createFacadeRecipes(ItemStack itemStack) {
         return Lists.newArrayList(
-            createFacadeRecipe(itemStack, Materials.Aluminium, 5),
-            createFacadeRecipe(itemStack, Materials.WroughtIron, 3),
-            createFacadeRecipe(itemStack, Materials.Iron, 2));
+                createFacadeRecipe(itemStack, Materials.Aluminium, 5),
+                createFacadeRecipe(itemStack, Materials.WroughtIron, 3),
+                createFacadeRecipe(itemStack, Materials.Iron, 2));
     }
 
     private static IRecipeWrapper createFacadeRecipe(ItemStack itemStack, Material material, int facadeAmount) {
         ItemStack itemStackCopy = itemStack.copy();
         itemStackCopy.setCount(facadeAmount);
         return new FacadeRecipeWrapper(new ResourceLocation(GTValues.MODID, "facade_" + material),
-            OreDictUnifier.get(OrePrefix.plate, material), itemStackCopy);
+                OreDictUnifier.get(OrePrefix.plate, material), itemStackCopy);
     }
 
     @Nonnull
diff --git a/src/main/java/gregtech/integration/jei/recipe/GTRecipeWrapper.java b/src/main/java/gregtech/integration/jei/recipe/GTRecipeWrapper.java
index 871c3852a3c..e18b4509c06 100644
--- a/src/main/java/gregtech/integration/jei/recipe/GTRecipeWrapper.java
+++ b/src/main/java/gregtech/integration/jei/recipe/GTRecipeWrapper.java
@@ -130,7 +130,7 @@ public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int
         minecraft.fontRenderer.drawString(I18n.format(recipe.getEUt() >= 0 ? "gregtech.recipe.eu" : "gregtech.recipe.eu_inverted", Math.abs(recipe.getEUt()), JEIHelpers.getMinTierForVoltage(recipe.getEUt())), 0, yPosition += LINE_HEIGHT, 0x111111);
         minecraft.fontRenderer.drawString(I18n.format("gregtech.recipe.duration", recipe.getDuration() / 20f), 0, yPosition += LINE_HEIGHT, 0x111111);
         for (Map.Entry, Object> propertyEntry : recipe.getPropertyValues()) {
-            if(!propertyEntry.getKey().isHidden()) {
+            if (!propertyEntry.getKey().isHidden()) {
                 propertyEntry.getKey().drawInfo(minecraft, 0, yPosition += LINE_HEIGHT, 0x111111, propertyEntry.getValue());
             }
         }
diff --git a/src/main/java/gregtech/integration/jei/recipe/IntCircuitCategory.java b/src/main/java/gregtech/integration/jei/recipe/IntCircuitCategory.java
index d6873763182..dfb14c19d21 100644
--- a/src/main/java/gregtech/integration/jei/recipe/IntCircuitCategory.java
+++ b/src/main/java/gregtech/integration/jei/recipe/IntCircuitCategory.java
@@ -52,55 +52,55 @@ public class IntCircuitCategory implements IRecipeCategory> otherItemRenderer =
-        Suppliers.memoize(() -> {
-            IIngredientRenderer defaultRenderer = GTJeiPlugin.ingredientRegistry.getIngredientRenderer(VanillaTypes.ITEM);
-            return CompositeRenderer.startBuilder(defaultRenderer)
-                .then(this::slice)
-                .then(defaultRenderer::render)
-                .then(() -> GL11.glDisable(GL11.GL_STENCIL_TEST))
-                .build();
-        });
+            Suppliers.memoize(() -> {
+                IIngredientRenderer defaultRenderer = GTJeiPlugin.ingredientRegistry.getIngredientRenderer(VanillaTypes.ITEM);
+                return CompositeRenderer.startBuilder(defaultRenderer)
+                        .then(this::slice)
+                        .then(defaultRenderer::render)
+                        .then(() -> GL11.glDisable(GL11.GL_STENCIL_TEST))
+                        .build();
+            });
 
     private final Supplier> firstItemRenderer =
-        Suppliers.memoize(() -> CompositeRenderer.startBuilder(otherItemRenderer.get())
-            .then(GlStateManager::pushMatrix)
-            .then((minecraft, xPosition, yPosition, ingredient) -> {
-                if (xPosition * yPosition != 0)
-                    GlStateManager.translate(xPosition, yPosition, 0);
-                GlStateManager.scale(FIRST_SLOT_SCALE, FIRST_SLOT_SCALE, 0);
-            })
-            .then((minecraft, xPosition, yPosition, ingredient) -> otherItemRenderer.get()
-                .render(minecraft, 0, 0, ingredient))
-            .then(GlStateManager::popMatrix)
-            .build());
+            Suppliers.memoize(() -> CompositeRenderer.startBuilder(otherItemRenderer.get())
+                    .then(GlStateManager::pushMatrix)
+                    .then((minecraft, xPosition, yPosition, ingredient) -> {
+                        if (xPosition * yPosition != 0)
+                            GlStateManager.translate(xPosition, yPosition, 0);
+                        GlStateManager.scale(FIRST_SLOT_SCALE, FIRST_SLOT_SCALE, 0);
+                    })
+                    .then((minecraft, xPosition, yPosition, ingredient) -> otherItemRenderer.get()
+                            .render(minecraft, 0, 0, ingredient))
+                    .then(GlStateManager::popMatrix)
+                    .build());
 
     public IntCircuitCategory(IGuiHelper guiHelper) {
         iconDrawable = guiHelper.createDrawableIngredient(MetaItems.INTEGRATED_CIRCUIT.getStackForm());
         backgroundDrawable = guiHelper.createBlankDrawable(108, 108);
 
         Iterator counter = Iterators.cycle(IntStream.range(0, IntCircuitIngredient.CIRCUIT_MAX + 1)
-            .boxed()
-            .collect(Collectors.toList()));
+                .boxed()
+                .collect(Collectors.toList()));
 
         FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
         slotBase = CompositeDrawable.startBuilder(SLOT_SIZE, SLOT_SIZE)
-            .then(guiHelper.drawableBuilder(new ResourceLocation(GTValues.MODID, "textures/gui/base/slot.png"), 0, 0, SLOT_SIZE, SLOT_SIZE)
-                .setTextureSize(SLOT_SIZE, SLOT_SIZE)
-                .build()::draw)
-            .then((minecraft, xOffset, yOffset) ->
-                fontRenderer.drawString(counter.next().toString(), xOffset + 1, yOffset + 1, 0x555555))
-            .build();
+                .then(guiHelper.drawableBuilder(new ResourceLocation(GTValues.MODID, "textures/gui/base/slot.png"), 0, 0, SLOT_SIZE, SLOT_SIZE)
+                        .setTextureSize(SLOT_SIZE, SLOT_SIZE)
+                        .build()::draw)
+                .then((minecraft, xOffset, yOffset) ->
+                        fontRenderer.drawString(counter.next().toString(), xOffset + 1, yOffset + 1, 0x555555))
+                .build();
 
         scaledSlot = CompositeDrawable.startBuilder(SLOT_SIZE * FIRST_SLOT_SCALE, SLOT_SIZE * FIRST_SLOT_SCALE)
-            .then(GlStateManager::pushMatrix)
-            .then((minecraft, xOffset, yOffset) -> {
-                if (xOffset * yOffset != 0)
-                    GlStateManager.translate(xOffset, yOffset, 0);
-                GlStateManager.scale(FIRST_SLOT_SCALE, FIRST_SLOT_SCALE, 0);
-            })
-            .then((minecraft, xOffset, yOffset) -> slotBase.draw(minecraft, 0, 0))
-            .then(GlStateManager::popMatrix)
-            .build();
+                .then(GlStateManager::pushMatrix)
+                .then((minecraft, xOffset, yOffset) -> {
+                    if (xOffset * yOffset != 0)
+                        GlStateManager.translate(xOffset, yOffset, 0);
+                    GlStateManager.scale(FIRST_SLOT_SCALE, FIRST_SLOT_SCALE, 0);
+                })
+                .then((minecraft, xOffset, yOffset) -> slotBase.draw(minecraft, 0, 0))
+                .then(GlStateManager::popMatrix)
+                .build();
     }
 
     @Override
@@ -131,19 +131,19 @@ public IDrawable getIcon() {
 
     private static final int shortenedRowLength = ROW_LENGTH - FIRST_SLOT_SCALE;
     private static final int[][] positions =
-        Stream.concat(
-            IntStream.range(0, shortenedRowLength * FIRST_SLOT_SCALE)
-                .mapToObj(i -> new int[]{
-                    SLOT_SIZE * FIRST_SLOT_SCALE + SLOT_SIZE * (i % shortenedRowLength),
-                    SLOT_SIZE * (i / shortenedRowLength)
-                }),
-            IntStream.range(0, IntCircuitIngredient.CIRCUIT_MAX - (shortenedRowLength * FIRST_SLOT_SCALE))
-                .mapToObj(i -> new int[]{
-                    SLOT_SIZE * (i % ROW_LENGTH),
-                    SLOT_SIZE * FIRST_SLOT_SCALE + SLOT_SIZE * (i / ROW_LENGTH)
-                })
-        )
-            .toArray(int[][]::new);
+            Stream.concat(
+                    IntStream.range(0, shortenedRowLength * FIRST_SLOT_SCALE)
+                            .mapToObj(i -> new int[]{
+                                    SLOT_SIZE * FIRST_SLOT_SCALE + SLOT_SIZE * (i % shortenedRowLength),
+                                    SLOT_SIZE * (i / shortenedRowLength)
+                            }),
+                    IntStream.range(0, IntCircuitIngredient.CIRCUIT_MAX - (shortenedRowLength * FIRST_SLOT_SCALE))
+                            .mapToObj(i -> new int[]{
+                                    SLOT_SIZE * (i % ROW_LENGTH),
+                                    SLOT_SIZE * FIRST_SLOT_SCALE + SLOT_SIZE * (i / ROW_LENGTH)
+                            })
+            )
+                    .toArray(int[][]::new);
 
     @Override
     public void setRecipe(IRecipeLayout recipeLayout, IntCircuitRecipeWrapper recipeWrapper, IIngredients ingredients) {
@@ -152,14 +152,14 @@ public void setRecipe(IRecipeLayout recipeLayout, IntCircuitRecipeWrapper recipe
         stacks.setBackground(0, scaledSlot);
         for (int i = 0; i < positions.length; i++) {
             stacks.init(i + 1,
-                recipeWrapper.input,
-                otherItemRenderer.get(),
-                positions[i][0],
-                positions[i][1],
-                SLOT_SIZE,
-                SLOT_SIZE,
-                1,
-                1
+                    recipeWrapper.input,
+                    otherItemRenderer.get(),
+                    positions[i][0],
+                    positions[i][1],
+                    SLOT_SIZE,
+                    SLOT_SIZE,
+                    1,
+                    1
             );
             stacks.setBackground(i + 1, slotBase);
         }
diff --git a/src/main/java/gregtech/integration/jei/recipe/IntCircuitRecipeWrapper.java b/src/main/java/gregtech/integration/jei/recipe/IntCircuitRecipeWrapper.java
index 5e529e7d6a9..7a5cb39df3d 100644
--- a/src/main/java/gregtech/integration/jei/recipe/IntCircuitRecipeWrapper.java
+++ b/src/main/java/gregtech/integration/jei/recipe/IntCircuitRecipeWrapper.java
@@ -24,16 +24,16 @@ private IntCircuitRecipeWrapper(boolean input) {
 
     public static Collection create() {
         return ImmutableList.of(
-            new IntCircuitRecipeWrapper(true),
-            new IntCircuitRecipeWrapper(false)
+                new IntCircuitRecipeWrapper(true),
+                new IntCircuitRecipeWrapper(false)
         );
     }
 
     @Override
     public void getIngredients(IIngredients ingredients) {
         List stacks = IntStream.range(0, IntCircuitIngredient.CIRCUIT_MAX + 1)
-            .mapToObj(IntCircuitIngredient::getIntegratedCircuit)
-            .collect(Collectors.toList());
+                .mapToObj(IntCircuitIngredient::getIntegratedCircuit)
+                .collect(Collectors.toList());
         if (input)
             ingredients.setInputs(VanillaTypes.ITEM, stacks);
         else
diff --git a/src/main/java/gregtech/integration/jei/recipe/RecipeMapCategory.java b/src/main/java/gregtech/integration/jei/recipe/RecipeMapCategory.java
index 1a7321140ca..a6b791da869 100644
--- a/src/main/java/gregtech/integration/jei/recipe/RecipeMapCategory.java
+++ b/src/main/java/gregtech/integration/jei/recipe/RecipeMapCategory.java
@@ -46,12 +46,12 @@ public RecipeMapCategory(RecipeMap recipeMap, IGuiHelper guiHelper) {
         for (int i = 0; i < exportFluidTanks.length; i++)
             exportFluidTanks[i] = new FluidTank(16000);
         this.modularUI = recipeMap.createJeiUITemplate(
-            (importItems = new ItemStackHandler(recipeMap.getMaxInputs())),
-            (exportItems = new ItemStackHandler(recipeMap.getMaxOutputs())),
-            (importFluids = new FluidTankList(false, importFluidTanks)),
-            (exportFluids = new FluidTankList(false, exportFluidTanks)),
-            (recipeMap.getMaxOutputs() >= 6 || recipeMap.getMaxInputs() >= 6 ||
-                    recipeMap.getMaxFluidOutputs() >= 6 || recipeMap.getMaxFluidInputs() >= 6) ? FONT_HEIGHT : 0
+                (importItems = new ItemStackHandler(recipeMap.getMaxInputs())),
+                (exportItems = new ItemStackHandler(recipeMap.getMaxOutputs())),
+                (importFluids = new FluidTankList(false, importFluidTanks)),
+                (exportFluids = new FluidTankList(false, exportFluidTanks)),
+                (recipeMap.getMaxOutputs() >= 6 || recipeMap.getMaxInputs() >= 6 ||
+                        recipeMap.getMaxFluidOutputs() >= 6 || recipeMap.getMaxFluidInputs() >= 6) ? FONT_HEIGHT : 0
         ).build(new BlankUIHolder(), Minecraft.getMinecraft().player);
         this.modularUI.initWidgets();
         this.backgroundDrawable = guiHelper.createBlankDrawable(modularUI.getWidth(), modularUI.getHeight() * 2 / 3);
@@ -96,13 +96,13 @@ public void setRecipe(IRecipeLayout recipeLayout, @Nonnull GTRecipeWrapper recip
                 if (handle.getItemHandler() == importItems) {
                     //this is input item stack slot widget, so add it to item group
                     itemStackGroup.init(handle.getSlotIndex(), true,
-                        slotWidget.getPosition().x,
-                        slotWidget.getPosition().y);
+                            slotWidget.getPosition().x,
+                            slotWidget.getPosition().y);
                 } else if (handle.getItemHandler() == exportItems) {
                     //this is output item stack slot widget, so add it to item group
                     itemStackGroup.init(importItems.getSlots() + handle.getSlotIndex(), false,
-                        slotWidget.getPosition().x,
-                        slotWidget.getPosition().y);
+                            slotWidget.getPosition().x,
+                            slotWidget.getPosition().y);
                 }
             } else if (uiWidget instanceof TankWidget) {
                 TankWidget tankWidget = (TankWidget) uiWidget;
@@ -114,11 +114,11 @@ public void setRecipe(IRecipeLayout recipeLayout, @Nonnull GTRecipeWrapper recip
                         fluidAmount = inputsList.get(importIndex).get(0).amount;
                     //this is input tank widget, so add it to fluid group
                     fluidStackGroup.init(importIndex, true,
-                        tankWidget.getPosition().x + tankWidget.fluidRenderOffset,
-                        tankWidget.getPosition().y + tankWidget.fluidRenderOffset,
-                        tankWidget.getSize().width - (2 * tankWidget.fluidRenderOffset),
-                        tankWidget.getSize().height - (2 * tankWidget.fluidRenderOffset),
-                        fluidAmount, false, null);
+                            tankWidget.getPosition().x + tankWidget.fluidRenderOffset,
+                            tankWidget.getPosition().y + tankWidget.fluidRenderOffset,
+                            tankWidget.getSize().width - (2 * tankWidget.fluidRenderOffset),
+                            tankWidget.getSize().height - (2 * tankWidget.fluidRenderOffset),
+                            fluidAmount, false, null);
 
                 } else if (exportFluids.getFluidTanks().contains(tankWidget.fluidTank)) {
                     int exportIndex = exportFluids.getFluidTanks().indexOf(tankWidget.fluidTank);
@@ -128,11 +128,11 @@ public void setRecipe(IRecipeLayout recipeLayout, @Nonnull GTRecipeWrapper recip
                         fluidAmount = inputsList.get(exportIndex).get(0).amount;
                     //this is output tank widget, so add it to fluid group
                     fluidStackGroup.init(importFluids.getFluidTanks().size() + exportIndex, false,
-                        tankWidget.getPosition().x + tankWidget.fluidRenderOffset,
-                        tankWidget.getPosition().y + tankWidget.fluidRenderOffset,
-                        tankWidget.getSize().width - (2 * tankWidget.fluidRenderOffset),
-                        tankWidget.getSize().height - (2 * tankWidget.fluidRenderOffset),
-                        fluidAmount, false, null);
+                            tankWidget.getPosition().x + tankWidget.fluidRenderOffset,
+                            tankWidget.getPosition().y + tankWidget.fluidRenderOffset,
+                            tankWidget.getSize().width - (2 * tankWidget.fluidRenderOffset),
+                            tankWidget.getSize().height - (2 * tankWidget.fluidRenderOffset),
+                            fluidAmount, false, null);
 
                 }
             }
diff --git a/src/main/java/gregtech/integration/jei/recipe/fuel/FuelRecipeMapCategory.java b/src/main/java/gregtech/integration/jei/recipe/fuel/FuelRecipeMapCategory.java
index 59ffc440081..679b46f7d84 100644
--- a/src/main/java/gregtech/integration/jei/recipe/fuel/FuelRecipeMapCategory.java
+++ b/src/main/java/gregtech/integration/jei/recipe/fuel/FuelRecipeMapCategory.java
@@ -49,7 +49,7 @@ public IDrawable getBackground() {
     @Override
     public void setRecipe(IRecipeLayout recipeLayout, GTFuelRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) {
         recipeLayout.getFluidStacks().init(0, true, 52, 24, 16, 16,
-            recipeWrapper.recipe.getRecipeFluid().amount, false, null);
+                recipeWrapper.recipe.getRecipeFluid().amount, false, null);
         recipeLayout.getFluidStacks().set(ingredients);
     }
 
diff --git a/src/main/java/gregtech/integration/jei/recipe/primitive/CokeOvenRecipeCategory.java b/src/main/java/gregtech/integration/jei/recipe/primitive/CokeOvenRecipeCategory.java
index 15df66a4bf1..9f9c23dea41 100644
--- a/src/main/java/gregtech/integration/jei/recipe/primitive/CokeOvenRecipeCategory.java
+++ b/src/main/java/gregtech/integration/jei/recipe/primitive/CokeOvenRecipeCategory.java
@@ -17,43 +17,43 @@ public class CokeOvenRecipeCategory extends PrimitiveRecipeCategory> matchingInputs = new ArrayList<>();
-	private final List outputs = new ArrayList<>();
-	private final List fluidOutputs = new ArrayList<>();
-
-	public CokeOvenRecipeWrapper(CokeOvenRecipe recipe) {
-		this.recipe = recipe;
-		CountableIngredient ingredient = recipe.getInput();
-
-		List ingredientValues = Arrays.stream(ingredient.getIngredient().getMatchingStacks())
-				.map(ItemStack::copy)
-				.sorted(OreDictUnifier.getItemStackComparator())
-				.collect(Collectors.toList());
-		ingredientValues.forEach(stack -> stack.setCount(ingredient.getCount()));
-        
-		this.matchingInputs.add(ingredientValues);
-		this.outputs.add(recipe.getOutput());
-		this.fluidOutputs.add(recipe.getFluidOutput());
-	}
-
-	@Override
-	public void getIngredients(IIngredients ingredients) {
-		ingredients.setInputLists(VanillaTypes.ITEM, this.matchingInputs);
-		ingredients.setOutputs(VanillaTypes.ITEM, this.outputs);
-		ingredients.setOutputs(VanillaTypes.FLUID, this.fluidOutputs);
-	}
-
-	@Override
-	public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
-		minecraft.fontRenderer.drawString(I18n.format("gregtech.recipe.duration", this.recipe.getDuration() / 20f), 0, 60, 0x111111);
-	}
+    private final CokeOvenRecipe recipe;
+    private final List> matchingInputs = new ArrayList<>();
+    private final List outputs = new ArrayList<>();
+    private final List fluidOutputs = new ArrayList<>();
+
+    public CokeOvenRecipeWrapper(CokeOvenRecipe recipe) {
+        this.recipe = recipe;
+        CountableIngredient ingredient = recipe.getInput();
+
+        List ingredientValues = Arrays.stream(ingredient.getIngredient().getMatchingStacks())
+                .map(ItemStack::copy)
+                .sorted(OreDictUnifier.getItemStackComparator())
+                .collect(Collectors.toList());
+        ingredientValues.forEach(stack -> stack.setCount(ingredient.getCount()));
+
+        this.matchingInputs.add(ingredientValues);
+        this.outputs.add(recipe.getOutput());
+        this.fluidOutputs.add(recipe.getFluidOutput());
+    }
+
+    @Override
+    public void getIngredients(IIngredients ingredients) {
+        ingredients.setInputLists(VanillaTypes.ITEM, this.matchingInputs);
+        ingredients.setOutputs(VanillaTypes.ITEM, this.outputs);
+        ingredients.setOutputs(VanillaTypes.FLUID, this.fluidOutputs);
+    }
+
+    @Override
+    public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
+        minecraft.fontRenderer.drawString(I18n.format("gregtech.recipe.duration", this.recipe.getDuration() / 20f), 0, 60, 0x111111);
+    }
 
 }
diff --git a/src/main/java/gregtech/integration/jei/recipe/primitive/OreByProduct.java b/src/main/java/gregtech/integration/jei/recipe/primitive/OreByProduct.java
index 91add869a2f..6f4143a9953 100755
--- a/src/main/java/gregtech/integration/jei/recipe/primitive/OreByProduct.java
+++ b/src/main/java/gregtech/integration/jei/recipe/primitive/OreByProduct.java
@@ -1,10 +1,6 @@
 package gregtech.integration.jei.recipe.primitive;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
-
 import gregtech.api.recipes.RecipeMaps;
 import gregtech.api.unification.OreDictUnifier;
 import gregtech.api.unification.material.Material;
@@ -18,141 +14,144 @@
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class OreByProduct implements IRecipeWrapper {
-	private final static ImmutableList ORES = ImmutableList.of(
-			OrePrefix.ore,
+    private final static ImmutableList ORES = ImmutableList.of(
+            OrePrefix.ore,
             OrePrefix.oreGranite,
             OrePrefix.oreDiorite,
             OrePrefix.oreAndesite,
-			OrePrefix.oreBasalt,
-			OrePrefix.oreBlackgranite, 
-			OrePrefix.oreEndstone, 
-			OrePrefix.oreGravel, 
-			OrePrefix.oreMarble,
-			OrePrefix.oreNetherrack, 
-			OrePrefix.oreRedgranite, 
-			OrePrefix.oreSand,
+            OrePrefix.oreBasalt,
+            OrePrefix.oreBlackgranite,
+            OrePrefix.oreEndstone,
+            OrePrefix.oreGravel,
+            OrePrefix.oreMarble,
+            OrePrefix.oreNetherrack,
+            OrePrefix.oreRedgranite,
+            OrePrefix.oreSand,
             OrePrefix.oreRedSand);
 
-	private final List> matchingInputs = new ArrayList<>();
-	private final List oreProcessingSteps = new ArrayList<>();
-	private final List outputs = new ArrayList<>();
-	private final Material material;
-	private final OreProperty property;
-	private final List oreIngredients;
+    private final List> matchingInputs = new ArrayList<>();
+    private final List oreProcessingSteps = new ArrayList<>();
+    private final List outputs = new ArrayList<>();
+    private final Material material;
+    private final OreProperty property;
+    private final List oreIngredients;
 
     public OreByProduct(Material material) {
-		this.material = material;
-		this.property = material.getProperty(PropertyKey.ORE);
-		this.oreIngredients = new ArrayList<>();
-		for (OrePrefix ore : ORES)
-			this.oreIngredients.add(OreDictUnifier.get(ore, material));
+        this.material = material;
+        this.property = material.getProperty(PropertyKey.ORE);
+        this.oreIngredients = new ArrayList<>();
+        for (OrePrefix ore : ORES)
+            this.oreIngredients.add(OreDictUnifier.get(ore, material));
         List byProductIngredients = new ArrayList<>();
 
-		for (Material mat : property.getOreByProducts())
-			byProductIngredients.add(OreDictUnifier.get(OrePrefix.dust, mat));
+        for (Material mat : property.getOreByProducts())
+            byProductIngredients.add(OreDictUnifier.get(OrePrefix.dust, mat));
 
-		this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.crushed, material));
-		this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.crushedPurified, material));
-		this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.crushedCentrifuged, material));
-		this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.dustImpure, material));
-		this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.dustPure, material));
-		this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.dust, material));
+        this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.crushed, material));
+        this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.crushedPurified, material));
+        this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.crushedCentrifuged, material));
+        this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.dustImpure, material));
+        this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.dustPure, material));
+        this.oreProcessingSteps.add(OreDictUnifier.get(OrePrefix.dust, material));
 
         List inputOres = new ArrayList<>(oreIngredients);
-		matchingInputs.add(inputOres);
-		for (ItemStack stack : oreProcessingSteps) {
-			List stepStack = new ArrayList<>();
-			stepStack.add(stack);
-			matchingInputs.add(stepStack);
-		}
-		outputs.addAll(byProductIngredients);
-	}
-
-	@Override
-	public void getIngredients(IIngredients ingredients) {
-		ingredients.setInputLists(VanillaTypes.ITEM, this.matchingInputs);
-		ingredients.setOutputs(VanillaTypes.ITEM, this.outputs);
-	}
-
-     public boolean hasByProducts() {
-         return !outputs.isEmpty();
-     }
-
-	public void addTooltip(int slotIndex, boolean input, Object ingredient, List tooltip) {
-		switch (slotIndex) {
-		case 0: // Ore
-			addOreTooltip(tooltip, 0, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), false);
-			break;
-		case 1: // Crushed
-			addOreTooltip(tooltip, 0, RecipeMaps.ORE_WASHER_RECIPES.getLocalizedName(), false);
-			addOreTooltip(tooltip, 0, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), false);
-			if (property.getWashedIn() != null)
-				addOreTooltip(tooltip, 3, RecipeMaps.CHEMICAL_BATH_RECIPES.getLocalizedName(), false);
-			addOreTooltip(tooltip, 0, RecipeMaps.THERMAL_CENTRIFUGE_RECIPES.getLocalizedName(), false);
-			break;
-		case 2: // Crushed Purified
-			addOreTooltip(tooltip, 1, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), false);
-			addOreTooltip(tooltip, 1, RecipeMaps.THERMAL_CENTRIFUGE_RECIPES.getLocalizedName(), false);
-			break;
-		case 3: // Crushed Centrifuged
-			addOreTooltip(tooltip, 2, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), false);
-			break;
-		case 4: // Dust impure
-			addOreTooltip(tooltip, 2, RecipeMaps.CENTRIFUGE_RECIPES.getLocalizedName(), false);
-			break;
-		case 5: // Dust Pure
-			addOreTooltip(tooltip, 1, RecipeMaps.CENTRIFUGE_RECIPES.getLocalizedName(), false);
-			break;
-		case 7: // 1st Byproduct
-			addOreTooltip(tooltip, 0, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), true);
-			addOreTooltip(tooltip, 1, RecipeMaps.ORE_WASHER_RECIPES.getLocalizedName(), true);
-			addOreTooltip(tooltip, 1, RecipeMaps.THERMAL_CENTRIFUGE_RECIPES.getLocalizedName(), true);
-            if (property.getWashedIn() != null && property.getOreByProducts().size() == 1)
-                addOreTooltip(tooltip, 1, RecipeMaps.CHEMICAL_BATH_RECIPES.getLocalizedName(), true);
-            break;
-		case 8: // 2nd Byproduct
-			addOreTooltip(tooltip, 2, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), true);
-			addOreTooltip(tooltip, 2, RecipeMaps.THERMAL_CENTRIFUGE_RECIPES.getLocalizedName(), true);
-			addOreTooltip(tooltip, 5, RecipeMaps.CENTRIFUGE_RECIPES.getLocalizedName(), true);
-			if (property.getWashedIn() != null && property.getOreByProducts().size() == 2)
-			    addOreTooltip(tooltip, 1, RecipeMaps.CHEMICAL_BATH_RECIPES.getLocalizedName(), true);
-			break;
-		case 9: // 3rd Byproduct
-			addOreTooltip(tooltip, 3, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), true);
-			addOreTooltip(tooltip, 4, RecipeMaps.CENTRIFUGE_RECIPES.getLocalizedName(), true);
-            if (property.getWashedIn() != null && property.getOreByProducts().size() == 3)
-                addOreTooltip(tooltip, 1, RecipeMaps.CHEMICAL_BATH_RECIPES.getLocalizedName(), true);
-			break;
-		case 10: // 4th Byproduct
-			if (property.getWashedIn() != null)
-				addOreTooltip(tooltip, 1, RecipeMaps.CHEMICAL_BATH_RECIPES.getLocalizedName(), true);
-			else
-				tooltip.add(I18n.format("gregtech.jei.ore_by_product_not_obtainable"));
-			break;
-		default:
-			break;
-		}
-	}
-
-	public int getOutputCount() {
-		return outputs.size();
-	}
-
-	public int getProcessingStepCount() {
-		return oreProcessingSteps.size();
-	}
-
-	public void addOreTooltip(List tooltip, int byproduct, String machine, boolean result) {
-		Material byProductMaterial = GTUtility.selectItemInList(byproduct, material, property.getOreByProducts(),
-				Material.class);
-		if (!result)
-			tooltip.add(I18n.format("gregtech.jei.ore_by_product_from_ore", machine, byProductMaterial.getLocalizedName()));
-		else {
-			String oreType = byproduct == 0 ? oreIngredients.get(0).getDisplayName()
-					: oreProcessingSteps.get(byproduct - 1).getDisplayName();
-			tooltip.add(I18n.format("gregtech.jei.ore_by_product_from_machine", oreType, machine));
-		}
-	}
+        matchingInputs.add(inputOres);
+        for (ItemStack stack : oreProcessingSteps) {
+            List stepStack = new ArrayList<>();
+            stepStack.add(stack);
+            matchingInputs.add(stepStack);
+        }
+        outputs.addAll(byProductIngredients);
+    }
+
+    @Override
+    public void getIngredients(IIngredients ingredients) {
+        ingredients.setInputLists(VanillaTypes.ITEM, this.matchingInputs);
+        ingredients.setOutputs(VanillaTypes.ITEM, this.outputs);
+    }
+
+    public boolean hasByProducts() {
+        return !outputs.isEmpty();
+    }
+
+    public void addTooltip(int slotIndex, boolean input, Object ingredient, List tooltip) {
+        switch (slotIndex) {
+            case 0: // Ore
+                addOreTooltip(tooltip, 0, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), false);
+                break;
+            case 1: // Crushed
+                addOreTooltip(tooltip, 0, RecipeMaps.ORE_WASHER_RECIPES.getLocalizedName(), false);
+                addOreTooltip(tooltip, 0, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), false);
+                if (property.getWashedIn() != null)
+                    addOreTooltip(tooltip, 3, RecipeMaps.CHEMICAL_BATH_RECIPES.getLocalizedName(), false);
+                addOreTooltip(tooltip, 0, RecipeMaps.THERMAL_CENTRIFUGE_RECIPES.getLocalizedName(), false);
+                break;
+            case 2: // Crushed Purified
+                addOreTooltip(tooltip, 1, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), false);
+                addOreTooltip(tooltip, 1, RecipeMaps.THERMAL_CENTRIFUGE_RECIPES.getLocalizedName(), false);
+                break;
+            case 3: // Crushed Centrifuged
+                addOreTooltip(tooltip, 2, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), false);
+                break;
+            case 4: // Dust impure
+                addOreTooltip(tooltip, 2, RecipeMaps.CENTRIFUGE_RECIPES.getLocalizedName(), false);
+                break;
+            case 5: // Dust Pure
+                addOreTooltip(tooltip, 1, RecipeMaps.CENTRIFUGE_RECIPES.getLocalizedName(), false);
+                break;
+            case 7: // 1st Byproduct
+                addOreTooltip(tooltip, 0, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), true);
+                addOreTooltip(tooltip, 1, RecipeMaps.ORE_WASHER_RECIPES.getLocalizedName(), true);
+                addOreTooltip(tooltip, 1, RecipeMaps.THERMAL_CENTRIFUGE_RECIPES.getLocalizedName(), true);
+                if (property.getWashedIn() != null && property.getOreByProducts().size() == 1)
+                    addOreTooltip(tooltip, 1, RecipeMaps.CHEMICAL_BATH_RECIPES.getLocalizedName(), true);
+                break;
+            case 8: // 2nd Byproduct
+                addOreTooltip(tooltip, 2, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), true);
+                addOreTooltip(tooltip, 2, RecipeMaps.THERMAL_CENTRIFUGE_RECIPES.getLocalizedName(), true);
+                addOreTooltip(tooltip, 5, RecipeMaps.CENTRIFUGE_RECIPES.getLocalizedName(), true);
+                if (property.getWashedIn() != null && property.getOreByProducts().size() == 2)
+                    addOreTooltip(tooltip, 1, RecipeMaps.CHEMICAL_BATH_RECIPES.getLocalizedName(), true);
+                break;
+            case 9: // 3rd Byproduct
+                addOreTooltip(tooltip, 3, RecipeMaps.MACERATOR_RECIPES.getLocalizedName(), true);
+                addOreTooltip(tooltip, 4, RecipeMaps.CENTRIFUGE_RECIPES.getLocalizedName(), true);
+                if (property.getWashedIn() != null && property.getOreByProducts().size() == 3)
+                    addOreTooltip(tooltip, 1, RecipeMaps.CHEMICAL_BATH_RECIPES.getLocalizedName(), true);
+                break;
+            case 10: // 4th Byproduct
+                if (property.getWashedIn() != null)
+                    addOreTooltip(tooltip, 1, RecipeMaps.CHEMICAL_BATH_RECIPES.getLocalizedName(), true);
+                else
+                    tooltip.add(I18n.format("gregtech.jei.ore_by_product_not_obtainable"));
+                break;
+            default:
+                break;
+        }
+    }
+
+    public int getOutputCount() {
+        return outputs.size();
+    }
+
+    public int getProcessingStepCount() {
+        return oreProcessingSteps.size();
+    }
+
+    public void addOreTooltip(List tooltip, int byproduct, String machine, boolean result) {
+        Material byProductMaterial = GTUtility.selectItemInList(byproduct, material, property.getOreByProducts(),
+                Material.class);
+        if (!result)
+            tooltip.add(I18n.format("gregtech.jei.ore_by_product_from_ore", machine, byProductMaterial.getLocalizedName()));
+        else {
+            String oreType = byproduct == 0 ? oreIngredients.get(0).getDisplayName()
+                    : oreProcessingSteps.get(byproduct - 1).getDisplayName();
+            tooltip.add(I18n.format("gregtech.jei.ore_by_product_from_machine", oreType, machine));
+        }
+    }
 
 }
diff --git a/src/main/java/gregtech/integration/jei/recipe/primitive/OreByProductCategory.java b/src/main/java/gregtech/integration/jei/recipe/primitive/OreByProductCategory.java
index 2d2fe41dc65..e66d6761fa8 100644
--- a/src/main/java/gregtech/integration/jei/recipe/primitive/OreByProductCategory.java
+++ b/src/main/java/gregtech/integration/jei/recipe/primitive/OreByProductCategory.java
@@ -2,76 +2,72 @@
 
 import gregtech.api.gui.GuiTextures;
 import mezz.jei.api.IGuiHelper;
-import mezz.jei.api.gui.IDrawable;
-import mezz.jei.api.gui.IDrawableAnimated;
-import mezz.jei.api.gui.IGuiItemStackGroup;
-import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.gui.*;
 import mezz.jei.api.gui.IDrawableAnimated.StartDirection;
-import mezz.jei.api.gui.IDrawableStatic;
 import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 
 import javax.annotation.Nonnull;
 
-public class OreByProductCategory extends PrimitiveRecipeCategory{
+public class OreByProductCategory extends PrimitiveRecipeCategory {
 
-	protected final IDrawable slot;
-	protected final IDrawable arrowBackground;
-	protected final IDrawableStatic arrowForeground;
-	protected final IDrawableAnimated arrowAnimation;
-	
-	public OreByProductCategory(IGuiHelper guiHelper) {
-		super("ore_by_product", 
-				"recipemap.byproductlist.name", 
-				guiHelper.createBlankDrawable(176, 166), 
-				guiHelper);
+    protected final IDrawable slot;
+    protected final IDrawable arrowBackground;
+    protected final IDrawableStatic arrowForeground;
+    protected final IDrawableAnimated arrowAnimation;
 
-		this.slot = guiHelper.drawableBuilder(GuiTextures.SLOT.imageLocation, 0, 0, 18, 18).setTextureSize(18, 18).build();
-		this.arrowBackground = guiHelper.drawableBuilder(GuiTextures.PROGRESS_BAR_ARROW.imageLocation, 0, 0, 20, 20).setTextureSize(20, 40).build();
-		this.arrowForeground = guiHelper.drawableBuilder(GuiTextures.PROGRESS_BAR_ARROW.imageLocation, 0, 20, 20, 20).setTextureSize(20, 40).build();
-		this.arrowAnimation = guiHelper.createAnimatedDrawable(arrowForeground, 30, StartDirection.LEFT, false);
-	}
+    public OreByProductCategory(IGuiHelper guiHelper) {
+        super("ore_by_product",
+                "recipemap.byproductlist.name",
+                guiHelper.createBlankDrawable(176, 166),
+                guiHelper);
 
-	@Override
-	public void setRecipe(IRecipeLayout recipeLayout, OreByProduct recipeWrapper, @Nonnull IIngredients ingredients) {
-		IGuiItemStackGroup itemStackGroup = recipeLayout.getItemStacks();
-		itemStackGroup.init(0, true,  22,  29); //Ore
-		itemStackGroup.init(1, true,  70,  19); //Crushed
-		itemStackGroup.init(2, true,  88,  19); //Crushed Purified
-		itemStackGroup.init(3, true, 106,  19); //Crushed Centrifuged
-		itemStackGroup.init(4, true,  70,  37); //Dust Impure
-		itemStackGroup.init(5, true,  88,  37); //Dust Purified
-		itemStackGroup.init(6, true, 106,  37); //Dust
-		
-		for(int i = 0; i < recipeWrapper.getOutputCount();i++)
-			itemStackGroup.init(i + 7, false, 70 + (i * 18), 59);
-		
-		itemStackGroup.addTooltipCallback(recipeWrapper::addTooltip);
-		itemStackGroup.set(ingredients);
-	}
+        this.slot = guiHelper.drawableBuilder(GuiTextures.SLOT.imageLocation, 0, 0, 18, 18).setTextureSize(18, 18).build();
+        this.arrowBackground = guiHelper.drawableBuilder(GuiTextures.PROGRESS_BAR_ARROW.imageLocation, 0, 0, 20, 20).setTextureSize(20, 40).build();
+        this.arrowForeground = guiHelper.drawableBuilder(GuiTextures.PROGRESS_BAR_ARROW.imageLocation, 0, 20, 20, 20).setTextureSize(20, 40).build();
+        this.arrowAnimation = guiHelper.createAnimatedDrawable(arrowForeground, 30, StartDirection.LEFT, false);
+    }
 
-	@Nonnull
     @Override
-	public IRecipeWrapper getRecipeWrapper(@Nonnull OreByProduct recipe) {
-		return recipe;
-	}
+    public void setRecipe(IRecipeLayout recipeLayout, OreByProduct recipeWrapper, @Nonnull IIngredients ingredients) {
+        IGuiItemStackGroup itemStackGroup = recipeLayout.getItemStacks();
+        itemStackGroup.init(0, true, 22, 29); //Ore
+        itemStackGroup.init(1, true, 70, 19); //Crushed
+        itemStackGroup.init(2, true, 88, 19); //Crushed Purified
+        itemStackGroup.init(3, true, 106, 19); //Crushed Centrifuged
+        itemStackGroup.init(4, true, 70, 37); //Dust Impure
+        itemStackGroup.init(5, true, 88, 37); //Dust Purified
+        itemStackGroup.init(6, true, 106, 37); //Dust
 
-	@Override
-	public void drawExtras(Minecraft minecraft) {
-		this.slot.draw(minecraft,  22, 29);
-		this.arrowBackground.draw(minecraft, 44, 28);
-		this.arrowAnimation.draw(minecraft, 44, 28);
-		
-		this.slot.draw(minecraft,  70, 19);
-		this.slot.draw(minecraft,  88, 19);
-		this.slot.draw(minecraft, 106, 19);
-		this.slot.draw(minecraft,  70, 37);
-		this.slot.draw(minecraft,  88, 37);
-		this.slot.draw(minecraft, 106, 37);
-		
-		for(int i = 0; i < 4; i++)
-			this.slot.draw(minecraft, 70 + (i * 18), 59);
-	}
+        for (int i = 0; i < recipeWrapper.getOutputCount(); i++)
+            itemStackGroup.init(i + 7, false, 70 + (i * 18), 59);
+
+        itemStackGroup.addTooltipCallback(recipeWrapper::addTooltip);
+        itemStackGroup.set(ingredients);
+    }
+
+    @Nonnull
+    @Override
+    public IRecipeWrapper getRecipeWrapper(@Nonnull OreByProduct recipe) {
+        return recipe;
+    }
+
+    @Override
+    public void drawExtras(Minecraft minecraft) {
+        this.slot.draw(minecraft, 22, 29);
+        this.arrowBackground.draw(minecraft, 44, 28);
+        this.arrowAnimation.draw(minecraft, 44, 28);
+
+        this.slot.draw(minecraft, 70, 19);
+        this.slot.draw(minecraft, 88, 19);
+        this.slot.draw(minecraft, 106, 19);
+        this.slot.draw(minecraft, 70, 37);
+        this.slot.draw(minecraft, 88, 37);
+        this.slot.draw(minecraft, 106, 37);
+
+        for (int i = 0; i < 4; i++)
+            this.slot.draw(minecraft, 70 + (i * 18), 59);
+    }
 
 }
diff --git a/src/main/java/gregtech/integration/jei/recipe/primitive/PrimitiveBlastRecipeCategory.java b/src/main/java/gregtech/integration/jei/recipe/primitive/PrimitiveBlastRecipeCategory.java
index f6646876301..b6156b9bb55 100644
--- a/src/main/java/gregtech/integration/jei/recipe/primitive/PrimitiveBlastRecipeCategory.java
+++ b/src/main/java/gregtech/integration/jei/recipe/primitive/PrimitiveBlastRecipeCategory.java
@@ -17,39 +17,39 @@ public class PrimitiveBlastRecipeCategory extends PrimitiveRecipeCategory> matchingInputs = new ArrayList<>();
-	private final List> outputs = new ArrayList<>();
+    private final PrimitiveBlastFurnaceRecipe recipe;
+    private final List> matchingInputs = new ArrayList<>();
+    private final List> outputs = new ArrayList<>();
 
-	public PrimitiveBlastRecipeWrapper(PrimitiveBlastFurnaceRecipe recipe) {
-		this.recipe = recipe;
-		CountableIngredient ingredient = recipe.getInput();
+    public PrimitiveBlastRecipeWrapper(PrimitiveBlastFurnaceRecipe recipe) {
+        this.recipe = recipe;
+        CountableIngredient ingredient = recipe.getInput();
 
-		List ingredientValues = Arrays.stream(ingredient.getIngredient().getMatchingStacks())
-				.map(ItemStack::copy)
-				.sorted(OreDictUnifier.getItemStackComparator())
-				.collect(Collectors.toList());
-		ingredientValues.forEach(stack -> stack.setCount(ingredient.getCount()));
+        List ingredientValues = Arrays.stream(ingredient.getIngredient().getMatchingStacks())
+                .map(ItemStack::copy)
+                .sorted(OreDictUnifier.getItemStackComparator())
+                .collect(Collectors.toList());
+        ingredientValues.forEach(stack -> stack.setCount(ingredient.getCount()));
 
-		this.matchingInputs.add(ingredientValues);
+        this.matchingInputs.add(ingredientValues);
 
         List displayFuelStacks = MetaTileEntityPrimitiveBlastFurnace.getDisplayFuelsForRecipe(recipe.getFuelAmount());
-		this.matchingInputs.add(displayFuelStacks);
-
-		ItemStack ashesItemStack = MetaTileEntityPrimitiveBlastFurnace.getAshForRecipeFuelConsumption(recipe.getFuelAmount());
-		this.outputs.add(ImmutableList.of(recipe.getOutput()));
-		this.outputs.add(ImmutableList.of(ashesItemStack));
-	}
-
-	@Override
-	public void getIngredients(IIngredients ingredients) {
-		ingredients.setInputLists(VanillaTypes.ITEM, this.matchingInputs);
-		ingredients.setOutputLists(VanillaTypes.ITEM, this.outputs);
-	}
-
-	@Override
-	public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
-		minecraft.fontRenderer.drawString(I18n.format("gregtech.recipe.duration", this.recipe.getDuration() / 20f), 0, 55, 0x111111);
-	}
+        this.matchingInputs.add(displayFuelStacks);
+
+        ItemStack ashesItemStack = MetaTileEntityPrimitiveBlastFurnace.getAshForRecipeFuelConsumption(recipe.getFuelAmount());
+        this.outputs.add(ImmutableList.of(recipe.getOutput()));
+        this.outputs.add(ImmutableList.of(ashesItemStack));
+    }
+
+    @Override
+    public void getIngredients(IIngredients ingredients) {
+        ingredients.setInputLists(VanillaTypes.ITEM, this.matchingInputs);
+        ingredients.setOutputLists(VanillaTypes.ITEM, this.outputs);
+    }
+
+    @Override
+    public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
+        minecraft.fontRenderer.drawString(I18n.format("gregtech.recipe.duration", this.recipe.getDuration() / 20f), 0, 55, 0x111111);
+    }
 
 }
diff --git a/src/main/java/gregtech/integration/jei/recipe/primitive/PrimitiveRecipeCategory.java b/src/main/java/gregtech/integration/jei/recipe/primitive/PrimitiveRecipeCategory.java
index 4876437775c..3ecd7654e0b 100644
--- a/src/main/java/gregtech/integration/jei/recipe/primitive/PrimitiveRecipeCategory.java
+++ b/src/main/java/gregtech/integration/jei/recipe/primitive/PrimitiveRecipeCategory.java
@@ -16,53 +16,53 @@
 
 public abstract class PrimitiveRecipeCategory implements IRecipeCategory, IRecipeWrapperFactory {
 
-	public final String uniqueName;
-	public final String localizedName;
-	protected final IDrawable background;
+    public final String uniqueName;
+    public final String localizedName;
+    protected final IDrawable background;
 
-	public PrimitiveRecipeCategory(String uniqueName, String localKey, IDrawable background, IGuiHelper guiHelper) {
-		this.uniqueName = uniqueName;
-		this.localizedName = I18n.format(localKey);
-		this.background = background;
-	}
+    public PrimitiveRecipeCategory(String uniqueName, String localKey, IDrawable background, IGuiHelper guiHelper) {
+        this.uniqueName = uniqueName;
+        this.localizedName = I18n.format(localKey);
+        this.background = background;
+    }
 
-	@Nullable
-	@Override
-	public IDrawable getIcon() {
-		return null;
-	}
+    @Nullable
+    @Override
+    public IDrawable getIcon() {
+        return null;
+    }
 
-	@Nonnull
+    @Nonnull
     @Override
-	public String getUid() {
-		return getModName() + ":" + uniqueName;
-	}
+    public String getUid() {
+        return getModName() + ":" + uniqueName;
+    }
 
-	@Nonnull
+    @Nonnull
     @Override
-	public String getTitle() {
-		return localizedName;
-	}
+    public String getTitle() {
+        return localizedName;
+    }
 
-	@Nonnull
+    @Nonnull
     @Override
-	public IDrawable getBackground() {
-		return background;
-	}
+    public IDrawable getBackground() {
+        return background;
+    }
 
-	@Override
-	public void drawExtras(@Nonnull Minecraft minecraft) {
-	}
+    @Override
+    public void drawExtras(@Nonnull Minecraft minecraft) {
+    }
 
-	@Nonnull
+    @Nonnull
     @Override
-	public List getTooltipStrings(int mouseX, int mouseY) {
-		return Collections.emptyList();
-	}
+    public List getTooltipStrings(int mouseX, int mouseY) {
+        return Collections.emptyList();
+    }
 
-	@Nonnull
+    @Nonnull
     @Override
-	public String getModName() {
-		return GTValues.MODID;
-	}
+    public String getModName() {
+        return GTValues.MODID;
+    }
 }
diff --git a/src/main/java/gregtech/integration/jei/utils/render/CompositeRenderer.java b/src/main/java/gregtech/integration/jei/utils/render/CompositeRenderer.java
index 467b46e248f..1b927a1d2b2 100644
--- a/src/main/java/gregtech/integration/jei/utils/render/CompositeRenderer.java
+++ b/src/main/java/gregtech/integration/jei/utils/render/CompositeRenderer.java
@@ -33,7 +33,7 @@ public static  Builder startBuilder(TooltipSupplier tooltipSupplier,
 
     public static  Builder startBuilder(IIngredientRenderer ingredientRenderer) {
         return startBuilder(ingredientRenderer::getTooltip,
-            ingredientRenderer::getFontRenderer);
+                ingredientRenderer::getFontRenderer);
     }
 
     @Override
diff --git a/src/main/java/gregtech/integration/theoneprobe/provider/DebugPipeNetInfoProvider.java b/src/main/java/gregtech/integration/theoneprobe/provider/DebugPipeNetInfoProvider.java
index 52d1eb5a838..6624bcc8cac 100644
--- a/src/main/java/gregtech/integration/theoneprobe/provider/DebugPipeNetInfoProvider.java
+++ b/src/main/java/gregtech/integration/theoneprobe/provider/DebugPipeNetInfoProvider.java
@@ -53,8 +53,8 @@ public void addProbeInfo(ProbeMode mode, IProbeInfo probeInfo, EntityPlayer play
                     Map> nodeMap = pipeNet.getAllNodes();
                     Node node = nodeMap.get(data.getPos());
                     builder.append("{").append("active: ").append(node.isActive)
-                        .append(", mark: ").append(node.mark)
-                        .append(", open: ").append(node.openConnections).append("}");
+                            .append(", mark: ").append(node.mark)
+                            .append(", open: ").append(node.openConnections).append("}");
                     probeInfo.text(builder.toString());
                 }
                 probeInfo.text("tile open: " + pipeTile.getOpenConnections());
diff --git a/src/main/java/gregtech/integration/theoneprobe/provider/ElectricContainerInfoProvider.java b/src/main/java/gregtech/integration/theoneprobe/provider/ElectricContainerInfoProvider.java
index 54e3cc77ddd..ce97fdda6b2 100644
--- a/src/main/java/gregtech/integration/theoneprobe/provider/ElectricContainerInfoProvider.java
+++ b/src/main/java/gregtech/integration/theoneprobe/provider/ElectricContainerInfoProvider.java
@@ -36,11 +36,11 @@ protected void addProbeInfo(IEnergyContainer capability, IProbeInfo probeInfo, T
         String additionalSpacing = tileEntity.hasCapability(GregtechTileCapabilities.CAPABILITY_WORKABLE, sideHit) ? "   " : "";
         horizontalPane.text(TextStyleClass.INFO + "{*gregtech.top.energy_stored*} " + additionalSpacing);
         horizontalPane.progress(energyStored, maxStorage, probeInfo.defaultProgressStyle()
-            .suffix("/" + maxStorage + " EU")
-            .borderColor(0x00000000)
-            .backgroundColor(0x00000000)
-            .filledColor(0xFFFFE000)
-            .alternateFilledColor(0xFFEED000));
+                .suffix("/" + maxStorage + " EU")
+                .borderColor(0x00000000)
+                .backgroundColor(0x00000000)
+                .filledColor(0xFFFFE000)
+                .alternateFilledColor(0xFFEED000));
     }
 
 }
diff --git a/src/main/java/gregtech/integration/theoneprobe/provider/FuelableInfoProvider.java b/src/main/java/gregtech/integration/theoneprobe/provider/FuelableInfoProvider.java
index 6ed94cd87f6..7a24268a55d 100755
--- a/src/main/java/gregtech/integration/theoneprobe/provider/FuelableInfoProvider.java
+++ b/src/main/java/gregtech/integration/theoneprobe/provider/FuelableInfoProvider.java
@@ -53,11 +53,11 @@ protected void addProbeInfo(IFuelable capability, IProbeInfo probeInfo, TileEnti
 
             horizontalPane = probeInfo.horizontal(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER));
             horizontalPane.progress(fuelRemaining, fuelCapacity, probeInfo.defaultProgressStyle()
-                .suffix("/" + fuelCapacity + " ")
-                .borderColor(0x00000000)
-                .backgroundColor(0x00000000)
-                .filledColor(0xFFFFE000)
-                .alternateFilledColor(0xFFEED000));
+                    .suffix("/" + fuelCapacity + " ")
+                    .borderColor(0x00000000)
+                    .backgroundColor(0x00000000)
+                    .filledColor(0xFFFFE000)
+                    .alternateFilledColor(0xFFEED000));
             if (fuelRemaining < fuelMinConsumed)
                 horizontalPane.text("{*gregtech.top.fuel_min_consume*} " + fuelMinConsumed);
             else
diff --git a/src/main/java/gregtech/integration/theoneprobe/provider/TransformerInfoProvider.java b/src/main/java/gregtech/integration/theoneprobe/provider/TransformerInfoProvider.java
index ca5630efc02..dfc3648c9a5 100644
--- a/src/main/java/gregtech/integration/theoneprobe/provider/TransformerInfoProvider.java
+++ b/src/main/java/gregtech/integration/theoneprobe/provider/TransformerInfoProvider.java
@@ -24,7 +24,7 @@ protected void addProbeInfo(IEnergyContainer capability, IProbeInfo probeInfo, T
         if (tileEntity instanceof MetaTileEntityHolder) {
             MetaTileEntity metaTileEntity = ((MetaTileEntityHolder) tileEntity).getMetaTileEntity();
             if (metaTileEntity instanceof MetaTileEntityTransformer) {
-                MetaTileEntityTransformer mteTransformer = (MetaTileEntityTransformer)metaTileEntity;
+                MetaTileEntityTransformer mteTransformer = (MetaTileEntityTransformer) metaTileEntity;
                 String inputVoltageN = GTValues.VN[GTUtility.getTierByVoltage(capability.getInputVoltage())];
                 String outputVoltageN = GTValues.VN[GTUtility.getTierByVoltage(capability.getOutputVoltage())];
                 long inputAmperage = capability.getInputAmperage();
@@ -39,7 +39,7 @@ protected void addProbeInfo(IEnergyContainer capability, IProbeInfo probeInfo, T
                     transformInfo = "{*gregtech.top.transform_down*} ";
                 }
                 transformInfo += inputVoltageN + " (" + inputAmperage + "A) -> "
-                               + outputVoltageN + " (" + outputAmperage + "A)";
+                        + outputVoltageN + " (" + outputAmperage + "A)";
                 horizontalPane.text(TextStyleClass.INFO + transformInfo);
 
                 // Input/Output side line
@@ -49,7 +49,7 @@ protected void addProbeInfo(IEnergyContainer capability, IProbeInfo probeInfo, T
                             + inputVoltageN + " (" + inputAmperage + "A)";
                     horizontalPane.text(TextStyleClass.INFO + transformInfo);
 
-                } else if(capability.outputsEnergy(sideHit)) {
+                } else if (capability.outputsEnergy(sideHit)) {
                     transformInfo = "{*gregtech.top.transform_output*} "
                             + outputVoltageN + " (" + outputAmperage + "A)";
                     horizontalPane.text(TextStyleClass.INFO + transformInfo);
diff --git a/src/main/java/gregtech/integration/theoneprobe/provider/WorkableInfoProvider.java b/src/main/java/gregtech/integration/theoneprobe/provider/WorkableInfoProvider.java
index 9f8decad859..70aeffc4273 100644
--- a/src/main/java/gregtech/integration/theoneprobe/provider/WorkableInfoProvider.java
+++ b/src/main/java/gregtech/integration/theoneprobe/provider/WorkableInfoProvider.java
@@ -41,11 +41,11 @@ protected void addProbeInfo(IWorkable capability, IProbeInfo probeInfo, TileEnti
             IProbeInfo horizontalPane = probeInfo.horizontal(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER));
             horizontalPane.text(TextStyleClass.INFO + "{*gregtech.top.progress*} ");
             horizontalPane.progress(currentProgress, maxProgress, probeInfo.defaultProgressStyle()
-                .suffix(suffix)
-                .borderColor(0x00000000)
-                .backgroundColor(0x00000000)
-                .filledColor(0xFF000099)
-                .alternateFilledColor(0xFF000077));
+                    .suffix(suffix)
+                    .borderColor(0x00000000)
+                    .backgroundColor(0x00000000)
+                    .filledColor(0xFF000099)
+                    .alternateFilledColor(0xFF000077));
         }
     }
 }
diff --git a/src/main/java/gregtech/loaders/MaterialInfoLoader.java b/src/main/java/gregtech/loaders/MaterialInfoLoader.java
index 1362d720a9e..74cf9737548 100644
--- a/src/main/java/gregtech/loaders/MaterialInfoLoader.java
+++ b/src/main/java/gregtech/loaders/MaterialInfoLoader.java
@@ -19,7 +19,7 @@
 public class MaterialInfoLoader {
 
     public static void init() {
-        if (ConfigHolder.U.GT5u.harderHeatingCoils){
+        if (ConfigHolder.U.GT5u.harderHeatingCoils) {
             OreDictUnifier.registerOre(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.CUPRONICKEL),
                     new ItemMaterialInfo(new MaterialStack(Materials.Cupronickel, OrePrefix.wireGtDouble.materialAmount * 8),
                             new MaterialStack(Materials.Bronze, OrePrefix.foil.materialAmount * 8),
diff --git a/src/main/java/gregtech/loaders/OreDictionaryLoader.java b/src/main/java/gregtech/loaders/OreDictionaryLoader.java
index 7b362a2a716..0d14af9ab97 100644
--- a/src/main/java/gregtech/loaders/OreDictionaryLoader.java
+++ b/src/main/java/gregtech/loaders/OreDictionaryLoader.java
@@ -2,8 +2,8 @@
 
 import gregtech.api.unification.OreDictUnifier;
 import gregtech.api.unification.material.MarkerMaterials.Color;
-import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.stack.ItemMaterialInfo;
 import gregtech.api.unification.stack.MaterialStack;
@@ -40,7 +40,7 @@ public static void init() {
             OreDictUnifier.registerOre(woodPlateStack, OrePrefix.plank, Materials.Wood);
         }
 
-        for(Material material : new Material[] {Materials.Lapis, Materials.Lazurite, Materials.Sodalite}) {
+        for (Material material : new Material[]{Materials.Lapis, Materials.Lazurite, Materials.Sodalite}) {
             OreDictUnifier.registerOre(OreDictUnifier.get(OrePrefix.gem, material), OrePrefix.dye, Color.Blue);
             OreDictUnifier.registerOre(OreDictUnifier.get(OrePrefix.dust, material), OrePrefix.dye, Color.Blue);
         }
diff --git a/src/main/java/gregtech/loaders/dungeon/ChestGenHooks.java b/src/main/java/gregtech/loaders/dungeon/ChestGenHooks.java
index 47fdb9d88b2..707fe35198c 100644
--- a/src/main/java/gregtech/loaders/dungeon/ChestGenHooks.java
+++ b/src/main/java/gregtech/loaders/dungeon/ChestGenHooks.java
@@ -59,16 +59,16 @@ public void onWorldLoad(LootTableLoadEvent event) {
 
     public static void addItem(ResourceLocation lootTable, ItemStack item, int minAmount, int additionalAmount, int weight) {
         LootEntryItem itemEntry = new LootEntryItem(item.getItem(), weight, 1, new LootFunction[]{
-            new LootFunction(NO_CONDITIONS) {
-                @Nonnull
-                @Override
-                public ItemStack apply(@Nonnull ItemStack stack, @Nonnull Random rand, @Nonnull LootContext context) {
-                    stack.setItemDamage(item.getItemDamage());
-                    stack.setTagCompound(item.getTagCompound());
-                    stack.setCount(minAmount + rand.nextInt(additionalAmount));
-                    return stack;
+                new LootFunction(NO_CONDITIONS) {
+                    @Nonnull
+                    @Override
+                    public ItemStack apply(@Nonnull ItemStack stack, @Nonnull Random rand, @Nonnull LootContext context) {
+                        stack.setItemDamage(item.getItemDamage());
+                        stack.setTagCompound(item.getTagCompound());
+                        stack.setCount(minAmount + rand.nextInt(additionalAmount));
+                        return stack;
+                    }
                 }
-            }
         }, NO_CONDITIONS, "#gregtech:loot_" + item.toString());
         if (lootEntryItems.containsKey(lootTable)) {
             lootEntryItems.get(lootTable).add(itemEntry);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/DecompositionRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/DecompositionRecipeHandler.java
index d46dc3c3d7b..5c0d16d5986 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/DecompositionRecipeHandler.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/DecompositionRecipeHandler.java
@@ -3,9 +3,9 @@
 import gregtech.api.recipes.RecipeBuilder;
 import gregtech.api.recipes.RecipeMaps;
 import gregtech.api.unification.OreDictUnifier;
+import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.MaterialRegistry;
 import gregtech.api.unification.material.Materials;
-import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.properties.PropertyKey;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.stack.MaterialStack;
@@ -29,10 +29,10 @@ public static void runRecipeGeneration() {
 
     private static void processDecomposition(OrePrefix decomposePrefix, Material material) {
         if (material.getMaterialComponents().isEmpty() ||
-            (!material.hasFlag(DECOMPOSITION_BY_ELECTROLYZING) &&
-                !material.hasFlag(DECOMPOSITION_BY_CENTRIFUGING)) ||
-            //disable decomposition if explicitly disabled for this material or for one of it's components
-            material.hasFlag(DISABLE_DECOMPOSITION)) return;
+                (!material.hasFlag(DECOMPOSITION_BY_ELECTROLYZING) &&
+                        !material.hasFlag(DECOMPOSITION_BY_CENTRIFUGING)) ||
+                //disable decomposition if explicitly disabled for this material or for one of it's components
+                material.hasFlag(DISABLE_DECOMPOSITION)) return;
 
         ArrayList outputs = new ArrayList<>();
         ArrayList fluidOutputs = new ArrayList<>();
@@ -93,13 +93,13 @@ private static void processDecomposition(OrePrefix decomposePrefix, Material mat
         RecipeBuilder builder;
         if (material.hasFlag(DECOMPOSITION_BY_ELECTROLYZING)) {
             builder = RecipeMaps.ELECTROLYZER_RECIPES.recipeBuilder()
-                .duration(((int) material.getAverageProtons() * totalInputAmount * 2))
-                .EUt(getElectrolyzingVoltage(material.getMaterialComponents().stream()
-                    .map(s -> s.material).collect(Collectors.toList())));
+                    .duration(((int) material.getAverageProtons() * totalInputAmount * 2))
+                    .EUt(getElectrolyzingVoltage(material.getMaterialComponents().stream()
+                            .map(s -> s.material).collect(Collectors.toList())));
         } else {
             builder = RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder()
-                .duration((int) Math.ceil(material.getAverageMass() * totalInputAmount * 1.5))
-                .EUt(30);
+                    .duration((int) Math.ceil(material.getAverageMass() * totalInputAmount * 1.5))
+                    .EUt(30);
         }
         builder.outputs(outputs);
         builder.fluidOutputs(fluidOutputs);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/MaterialRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/MaterialRecipeHandler.java
index 4f5968e531a..e07e0f9e698 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/MaterialRecipeHandler.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/MaterialRecipeHandler.java
@@ -30,7 +30,7 @@
 public class MaterialRecipeHandler {
 
     private static final List GEM_ORDER = Arrays.asList(
-        OrePrefix.gemChipped, OrePrefix.gemFlawed, OrePrefix.gem, OrePrefix.gemFlawless, OrePrefix.gemExquisite);
+            OrePrefix.gemChipped, OrePrefix.gemFlawed, OrePrefix.gem, OrePrefix.gemFlawless, OrePrefix.gemExquisite);
 
     private static final Set circuitRequiringMaterials = new HashSet<>();
 
@@ -64,25 +64,25 @@ public static void processDust(OrePrefix dustPrefix, Material mat, DustProperty
             if (mat.hasFlag(CRYSTALLIZABLE)) {
 
                 RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder()
-                    .input(dustPrefix, mat)
-                    .fluidInputs(Materials.Water.getFluid(200))
-                    .chancedOutput(gemStack, 7000, 1000)
-                    .duration(1500).EUt(24)
-                    .buildAndRegister();
+                        .input(dustPrefix, mat)
+                        .fluidInputs(Materials.Water.getFluid(200))
+                        .chancedOutput(gemStack, 7000, 1000)
+                        .duration(1500).EUt(24)
+                        .buildAndRegister();
 
                 RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder()
-                    .input(dustPrefix, mat)
-                    .fluidInputs(Materials.DistilledWater.getFluid(36))
-                    .chancedOutput(gemStack, 9000, 1000)
-                    .duration(1200).EUt(24)
-                    .buildAndRegister();
+                        .input(dustPrefix, mat)
+                        .fluidInputs(Materials.DistilledWater.getFluid(36))
+                        .chancedOutput(gemStack, 9000, 1000)
+                        .duration(1200).EUt(24)
+                        .buildAndRegister();
 
             } else if (!mat.hasFlag(EXPLOSIVE) && !mat.hasFlag(FLAMMABLE)) {
                 RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
-                    .input(dustPrefix, mat, 4)
-                    .outputs(GTUtility.copyAmount(3, gemStack), GTUtility.copyAmount(2, tinyDarkAshStack))
-                    .explosivesAmount(4)
-                    .buildAndRegister();
+                        .input(dustPrefix, mat, 4)
+                        .outputs(GTUtility.copyAmount(3, gemStack), GTUtility.copyAmount(2, tinyDarkAshStack))
+                        .explosivesAmount(4)
+                        .buildAndRegister();
             }
 
         } else if (mat.hasProperty(PropertyKey.INGOT)) {
@@ -132,19 +132,19 @@ public static void processSmallDust(OrePrefix orePrefix, Material material, Dust
         ItemStack dustStack = OreDictUnifier.get(OrePrefix.dust, material);
 
         ModHandler.addShapedRecipe(String.format("small_dust_disassembling_%s", material.toString()),
-            GTUtility.copyAmount(4, smallDustStack), " X", "  ", 'X', new UnificationEntry(OrePrefix.dust, material));
+                GTUtility.copyAmount(4, smallDustStack), " X", "  ", 'X', new UnificationEntry(OrePrefix.dust, material));
         ModHandler.addShapedRecipe(String.format("small_dust_assembling_%s", material.toString()),
-            dustStack, "XX", "XX", 'X', new UnificationEntry(orePrefix, material));
+                dustStack, "XX", "XX", 'X', new UnificationEntry(orePrefix, material));
 
         RecipeMaps.PACKER_RECIPES.recipeBuilder().input(orePrefix, material, 4)
-            .inputs(new CountableIngredient(new IntCircuitIngredient(2), 0))
-            .outputs(dustStack)
-            .buildAndRegister();
+                .inputs(new CountableIngredient(new IntCircuitIngredient(2), 0))
+                .outputs(dustStack)
+                .buildAndRegister();
 
         RecipeMaps.UNPACKER_RECIPES.recipeBuilder().input(OrePrefix.dust, material)
-            .inputs(new CountableIngredient(new IntCircuitIngredient(2), 0))
-            .outputs(GTUtility.copyAmount(4, smallDustStack))
-            .buildAndRegister();
+                .inputs(new CountableIngredient(new IntCircuitIngredient(2), 0))
+                .outputs(GTUtility.copyAmount(4, smallDustStack))
+                .buildAndRegister();
     }
 
     public static void processTinyDust(OrePrefix orePrefix, Material material, DustProperty property) {
@@ -152,25 +152,25 @@ public static void processTinyDust(OrePrefix orePrefix, Material material, DustP
         ItemStack dustStack = OreDictUnifier.get(OrePrefix.dust, material);
 
         ModHandler.addShapedRecipe(String.format("tiny_dust_disassembling_%s", material.toString()),
-            GTUtility.copyAmount(9, tinyDustStack), "X ", "  ", 'X', new UnificationEntry(OrePrefix.dust, material));
+                GTUtility.copyAmount(9, tinyDustStack), "X ", "  ", 'X', new UnificationEntry(OrePrefix.dust, material));
         ModHandler.addShapedRecipe(String.format("tiny_dust_assembling_%s", material.toString()),
-            dustStack, "XXX", "XXX", "XXX", 'X', new UnificationEntry(orePrefix, material));
+                dustStack, "XXX", "XXX", "XXX", 'X', new UnificationEntry(orePrefix, material));
 
         RecipeMaps.PACKER_RECIPES.recipeBuilder().input(orePrefix, material, 9)
-            .inputs(new CountableIngredient(new IntCircuitIngredient(1), 0))
-            .outputs(dustStack)
-            .buildAndRegister();
+                .inputs(new CountableIngredient(new IntCircuitIngredient(1), 0))
+                .outputs(dustStack)
+                .buildAndRegister();
 
         RecipeMaps.UNPACKER_RECIPES.recipeBuilder().input(OrePrefix.dust, material)
-            .inputs(new CountableIngredient(new IntCircuitIngredient(1), 0))
-            .outputs(GTUtility.copyAmount(9, tinyDustStack))
-            .buildAndRegister();
+                .inputs(new CountableIngredient(new IntCircuitIngredient(1), 0))
+                .outputs(GTUtility.copyAmount(9, tinyDustStack))
+                .buildAndRegister();
     }
 
     public static void processIngot(OrePrefix ingotPrefix, Material material, IngotProperty property) {
         if (material.hasFlag(MORTAR_GRINDABLE)) {
             ModHandler.addShapedRecipe(String.format("mortar_grind_%s", material.toString()),
-                OreDictUnifier.get(OrePrefix.dust, material), "X", "m", 'X', new UnificationEntry(ingotPrefix, material));
+                    OreDictUnifier.get(OrePrefix.dust, material), "X", "m", 'X', new UnificationEntry(ingotPrefix, material));
         }
 
         if (!material.hasFlag(NO_SMASHING) && material.hasProperty(PropertyKey.TOOL)) {
@@ -187,37 +187,37 @@ public static void processIngot(OrePrefix ingotPrefix, Material material, IngotP
 
         if (material.hasFlag(GENERATE_ROD)) {
             ModHandler.addShapedRecipe(String.format("stick_%s", material.toString()),
-                OreDictUnifier.get(OrePrefix.stick, material, 1),
-                "f ", " X",
-                'X', new UnificationEntry(ingotPrefix, material));
+                    OreDictUnifier.get(OrePrefix.stick, material, 1),
+                    "f ", " X",
+                    'X', new UnificationEntry(ingotPrefix, material));
             if (!material.hasFlag(NO_WORKING)) {
                 RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-                    .input(ingotPrefix, material)
-                    .notConsumable(MetaItems.SHAPE_EXTRUDER_ROD)
-                    .outputs(OreDictUnifier.get(OrePrefix.stick, material, 2))
-                    .duration((int) material.getAverageMass() * 2)
-                    .EUt(6 * getVoltageMultiplier(material))
-                    .buildAndRegister();
+                        .input(ingotPrefix, material)
+                        .notConsumable(MetaItems.SHAPE_EXTRUDER_ROD)
+                        .outputs(OreDictUnifier.get(OrePrefix.stick, material, 2))
+                        .duration((int) material.getAverageMass() * 2)
+                        .EUt(6 * getVoltageMultiplier(material))
+                        .buildAndRegister();
             }
         }
 
         if (material.hasFluid()) {
             RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
-                .notConsumable(MetaItems.SHAPE_MOLD_INGOT)
-                .fluidInputs(material.getFluid(L))
-                .outputs(OreDictUnifier.get(ingotPrefix, material))
-                .duration(20).EUt(8)
-                .buildAndRegister();
+                    .notConsumable(MetaItems.SHAPE_MOLD_INGOT)
+                    .fluidInputs(material.getFluid(L))
+                    .outputs(OreDictUnifier.get(ingotPrefix, material))
+                    .duration(20).EUt(8)
+                    .buildAndRegister();
         }
 
         if (material.hasFlag(NO_SMASHING)) {
             RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-                .input(OrePrefix.dust, material)
-                .notConsumable(MetaItems.SHAPE_EXTRUDER_INGOT)
-                .outputs(OreDictUnifier.get(OrePrefix.ingot, material))
-                .duration(10)
-                .EUt(4 * getVoltageMultiplier(material))
-                .buildAndRegister();
+                    .input(OrePrefix.dust, material)
+                    .notConsumable(MetaItems.SHAPE_EXTRUDER_INGOT)
+                    .outputs(OreDictUnifier.get(OrePrefix.ingot, material))
+                    .duration(10)
+                    .EUt(4 * getVoltageMultiplier(material))
+                    .buildAndRegister();
         }
 
         ALLOY_SMELTER_RECIPES.recipeBuilder().EUt(8).duration((int) material.getAverageMass())
@@ -277,19 +277,19 @@ public static void processGem(OrePrefix gemPrefix, Material material, GemPropert
 
         if (material.hasFlag(MORTAR_GRINDABLE)) {
             ModHandler.addShapedRecipe(String.format("gem_to_dust_%s_%s", material, gemPrefix), crushedStack,
-                "X", "m", 'X', new UnificationEntry(gemPrefix, material));
+                    "X", "m", 'X', new UnificationEntry(gemPrefix, material));
         }
 
         OrePrefix prevPrefix = GTUtility.getItem(GEM_ORDER, GEM_ORDER.indexOf(gemPrefix) - 1, null);
         ItemStack prevStack = prevPrefix == null ? ItemStack.EMPTY : OreDictUnifier.get(prevPrefix, material, 2);
         if (!prevStack.isEmpty()) {
             ModHandler.addShapelessRecipe(String.format("gem_to_gem_%s_%s", prevPrefix, material), prevStack,
-                "h", new UnificationEntry(gemPrefix, material));
+                    "h", new UnificationEntry(gemPrefix, material));
             RecipeMaps.FORGE_HAMMER_RECIPES.recipeBuilder()
-                .input(gemPrefix, material)
-                .outputs(prevStack)
-                .duration(20).EUt(16)
-                .buildAndRegister();
+                    .input(gemPrefix, material)
+                    .outputs(prevStack)
+                    .duration(20).EUt(16)
+                    .buildAndRegister();
         }
     }
 
@@ -299,19 +299,19 @@ public static void processNugget(OrePrefix orePrefix, Material material, DustPro
             ItemStack ingotStack = OreDictUnifier.get(OrePrefix.ingot, material);
 
             ModHandler.addShapelessRecipe(String.format("nugget_disassembling_%s", material.toString()),
-                GTUtility.copyAmount(9, nuggetStack), new UnificationEntry(OrePrefix.ingot, material));
+                    GTUtility.copyAmount(9, nuggetStack), new UnificationEntry(OrePrefix.ingot, material));
             ModHandler.addShapedRecipe(String.format("nugget_assembling_%s", material.toString()),
-                ingotStack, "XXX", "XXX", "XXX", 'X', new UnificationEntry(orePrefix, material));
+                    ingotStack, "XXX", "XXX", "XXX", 'X', new UnificationEntry(orePrefix, material));
 
             RecipeMaps.UNPACKER_RECIPES.recipeBuilder().input(OrePrefix.ingot, material)
-                .inputs(new CountableIngredient(new IntCircuitIngredient(1), 0))
-                .outputs(GTUtility.copyAmount(9, nuggetStack))
-                .buildAndRegister();
+                    .inputs(new CountableIngredient(new IntCircuitIngredient(1), 0))
+                    .outputs(GTUtility.copyAmount(9, nuggetStack))
+                    .buildAndRegister();
 
             RecipeMaps.PACKER_RECIPES.recipeBuilder().input(orePrefix, material, 9)
-                .inputs(new CountableIngredient(new IntCircuitIngredient(1), 0))
-                .outputs(ingotStack)
-                .buildAndRegister();
+                    .inputs(new CountableIngredient(new IntCircuitIngredient(1), 0))
+                    .outputs(ingotStack)
+                    .buildAndRegister();
 
             ALLOY_SMELTER_RECIPES.recipeBuilder().EUt(8).duration((int) material.getAverageMass())
                     .input(nugget, material, 9)
@@ -321,20 +321,20 @@ public static void processNugget(OrePrefix orePrefix, Material material, DustPro
 
             if (material.hasFluid()) {
                 RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
-                    .notConsumable(MetaItems.SHAPE_MOLD_NUGGET)
-                    .fluidInputs(material.getFluid(L))
-                    .outputs(OreDictUnifier.get(orePrefix, material, 9))
-                    .duration((int) material.getAverageMass())
-                    .EUt(8)
-                    .buildAndRegister();
+                        .notConsumable(MetaItems.SHAPE_MOLD_NUGGET)
+                        .fluidInputs(material.getFluid(L))
+                        .outputs(OreDictUnifier.get(orePrefix, material, 9))
+                        .duration((int) material.getAverageMass())
+                        .EUt(8)
+                        .buildAndRegister();
             }
         } else if (material.hasProperty(PropertyKey.GEM)) {
             ItemStack gemStack = OreDictUnifier.get(OrePrefix.gem, material);
 
             ModHandler.addShapelessRecipe(String.format("nugget_disassembling_%s", material.toString()),
-                GTUtility.copyAmount(9, nuggetStack), new UnificationEntry(OrePrefix.gem, material));
+                    GTUtility.copyAmount(9, nuggetStack), new UnificationEntry(OrePrefix.gem, material));
             ModHandler.addShapedRecipe(String.format("nugget_assembling_%s", material.toString()),
-                gemStack, "XXX", "XXX", "XXX", 'X', new UnificationEntry(orePrefix, material));
+                    gemStack, "XXX", "XXX", "XXX", 'X', new UnificationEntry(orePrefix, material));
         }
     }
 
@@ -343,15 +343,15 @@ public static void processFrame(OrePrefix framePrefix, Material material, DustPr
             boolean isWoodenFrame = ModHandler.isMaterialWood(material);
             ModHandler.addShapedRecipe(String.format("frame_%s", material),
                     OreDictUnifier.get(framePrefix, material, 2),
-                "SSS", isWoodenFrame ? "SsS" : "SwS", "SSS",
-                'S', new UnificationEntry(OrePrefix.stick, material));
+                    "SSS", isWoodenFrame ? "SsS" : "SwS", "SSS",
+                    'S', new UnificationEntry(OrePrefix.stick, material));
 
             RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
-                .input(OrePrefix.stick, material, 4)
-                .circuitMeta(4)
-                .outputs(OreDictUnifier.get(framePrefix, material, 1))
-                .EUt(8).duration(64)
-                .buildAndRegister();
+                    .input(OrePrefix.stick, material, 4)
+                    .circuitMeta(4)
+                    .outputs(OreDictUnifier.get(framePrefix, material, 1))
+                    .EUt(8).duration(64)
+                    .buildAndRegister();
         }
     }
 
@@ -360,11 +360,11 @@ public static void processBlock(OrePrefix blockPrefix, Material material, DustPr
         long materialAmount = blockPrefix.getMaterialAmount(material);
         if (material.hasFluid()) {
             RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
-                .notConsumable(MetaItems.SHAPE_MOLD_BLOCK)
-                .fluidInputs(material.getFluid((int) (materialAmount * L / M)))
-                .outputs(blockStack)
-                .duration((int) material.getAverageMass()).EUt(8)
-                .buildAndRegister();
+                    .notConsumable(MetaItems.SHAPE_MOLD_BLOCK)
+                    .fluidInputs(material.getFluid((int) (materialAmount * L / M)))
+                    .outputs(blockStack)
+                    .duration((int) material.getAverageMass()).EUt(8)
+                    .buildAndRegister();
         }
 
         if (material.hasFlag(GENERATE_PLATE)) {
@@ -400,25 +400,25 @@ public static void processBlock(OrePrefix blockPrefix, Material material, DustPr
                 ModHandler.addShapelessRecipe(String.format("block_compress_%s", material.toString()), blockStack, result.toArray());
 
                 ModHandler.addShapelessRecipe(String.format("block_decompress_%s", material.toString()),
-                    GTUtility.copyAmount((int) (materialAmount / M), OreDictUnifier.get(blockEntry)),
-                    new UnificationEntry(blockPrefix, material));
+                        GTUtility.copyAmount((int) (materialAmount / M), OreDictUnifier.get(blockEntry)),
+                        new UnificationEntry(blockPrefix, material));
             }
 
             if (material.hasProperty(PropertyKey.INGOT)) {
                 int voltageMultiplier = getVoltageMultiplier(material);
                 RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-                    .input(OrePrefix.ingot, material, (int) (materialAmount / M))
-                    .notConsumable(MetaItems.SHAPE_EXTRUDER_BLOCK)
-                    .outputs(blockStack)
-                    .duration(10).EUt(8 * voltageMultiplier)
-                    .buildAndRegister();
+                        .input(OrePrefix.ingot, material, (int) (materialAmount / M))
+                        .notConsumable(MetaItems.SHAPE_EXTRUDER_BLOCK)
+                        .outputs(blockStack)
+                        .duration(10).EUt(8 * voltageMultiplier)
+                        .buildAndRegister();
 
                 RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder()
-                    .input(OrePrefix.ingot, material, (int) (materialAmount / M))
-                    .notConsumable(MetaItems.SHAPE_MOLD_BLOCK)
-                    .outputs(blockStack)
-                    .duration(5).EUt(4 * voltageMultiplier)
-                    .buildAndRegister();
+                        .input(OrePrefix.ingot, material, (int) (materialAmount / M))
+                        .notConsumable(MetaItems.SHAPE_MOLD_BLOCK)
+                        .outputs(blockStack)
+                        .duration(5).EUt(4 * voltageMultiplier)
+                        .buildAndRegister();
             }
         }
     }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/OreRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/OreRecipeHandler.java
index 7217996fee5..1f028dc49ea 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/OreRecipeHandler.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/OreRecipeHandler.java
@@ -76,16 +76,16 @@ public static void processOre(OrePrefix orePrefix, Material material, OrePropert
 
         if (!crushedStack.isEmpty()) {
             RecipeMaps.FORGE_HAMMER_RECIPES.recipeBuilder()
-                .input(orePrefix, material)
-                .outputs(GTUtility.copyAmount((int) Math.ceil(amountOfCrushedOre), crushedStack))
-                .duration(100).EUt(6)
-                .buildAndRegister();
+                    .input(orePrefix, material)
+                    .outputs(GTUtility.copyAmount((int) Math.ceil(amountOfCrushedOre), crushedStack))
+                    .duration(100).EUt(6)
+                    .buildAndRegister();
 
             RecipeBuilder builder = RecipeMaps.MACERATOR_RECIPES.recipeBuilder()
-                .input(orePrefix, material)
-                .outputs(GTUtility.copyAmount((int) Math.round(amountOfCrushedOre) * 2, crushedStack))
-                .chancedOutput(byproductStack, 1400, 850)
-                .duration(400).EUt(12);
+                    .input(orePrefix, material)
+                    .outputs(GTUtility.copyAmount((int) Math.round(amountOfCrushedOre) * 2, crushedStack))
+                    .chancedOutput(byproductStack, 1400, 850)
+                    .duration(400).EUt(12);
             for (MaterialStack secondaryMaterial : orePrefix.secondaryMaterials) {
                 if (secondaryMaterial.material.hasProperty(PropertyKey.DUST)) {
                     ItemStack dustStack = OreDictUnifier.getDust(secondaryMaterial);
@@ -109,71 +109,71 @@ public static void processCrushedOre(OrePrefix crushedPrefix, Material material,
         //fallback for dirtyGravel, shard & clump
         if (impureDustStack.isEmpty()) {
             impureDustStack = GTUtility.copy(
-                OreDictUnifier.get(OrePrefix.dirtyGravel, material),
-                OreDictUnifier.get(OrePrefix.shard, material),
-                OreDictUnifier.get(OrePrefix.clump, material),
-                OreDictUnifier.get(OrePrefix.dust, material));
+                    OreDictUnifier.get(OrePrefix.dirtyGravel, material),
+                    OreDictUnifier.get(OrePrefix.shard, material),
+                    OreDictUnifier.get(OrePrefix.clump, material),
+                    OreDictUnifier.get(OrePrefix.dust, material));
         }
 
         RecipeMaps.FORGE_HAMMER_RECIPES.recipeBuilder()
-            .input(crushedPrefix, material)
-            .outputs(impureDustStack)
-            .duration(60).EUt(8)
-            .buildAndRegister();
+                .input(crushedPrefix, material)
+                .outputs(impureDustStack)
+                .duration(60).EUt(8)
+                .buildAndRegister();
 
         RecipeMaps.MACERATOR_RECIPES.recipeBuilder()
-            .input(crushedPrefix, material)
-            .outputs(impureDustStack)
-            .duration(200).EUt(12)
-            .chancedOutput(OreDictUnifier.get(OrePrefix.dust, byproductMaterial, property.getByProductMultiplier()), 1400, 850)
-            .buildAndRegister();
+                .input(crushedPrefix, material)
+                .outputs(impureDustStack)
+                .duration(200).EUt(12)
+                .chancedOutput(OreDictUnifier.get(OrePrefix.dust, byproductMaterial, property.getByProductMultiplier()), 1400, 850)
+                .buildAndRegister();
 
         ItemStack crushedPurifiedOre = GTUtility.copy(
-            OreDictUnifier.get(OrePrefix.crushedPurified, material),
-            OreDictUnifier.get(OrePrefix.dust, material));
+                OreDictUnifier.get(OrePrefix.crushedPurified, material),
+                OreDictUnifier.get(OrePrefix.dust, material));
         ItemStack crushedCentrifugedOre = GTUtility.copy(
-            OreDictUnifier.get(OrePrefix.crushedCentrifuged, material),
-            OreDictUnifier.get(OrePrefix.dust, material));
+                OreDictUnifier.get(OrePrefix.crushedCentrifuged, material),
+                OreDictUnifier.get(OrePrefix.dust, material));
 
         RecipeMaps.ORE_WASHER_RECIPES.recipeBuilder()
-            .input(crushedPrefix, material)
-            .fluidInputs(Materials.Water.getFluid(1000))
-            .outputs(crushedPurifiedOre,
-                OreDictUnifier.get(OrePrefix.dustTiny, byproductMaterial, 3),
-                OreDictUnifier.get(OrePrefix.dust, Materials.Stone))
-            .buildAndRegister();
+                .input(crushedPrefix, material)
+                .fluidInputs(Materials.Water.getFluid(1000))
+                .outputs(crushedPurifiedOre,
+                        OreDictUnifier.get(OrePrefix.dustTiny, byproductMaterial, 3),
+                        OreDictUnifier.get(OrePrefix.dust, Materials.Stone))
+                .buildAndRegister();
 
         RecipeMaps.ORE_WASHER_RECIPES.recipeBuilder()
-            .input(crushedPrefix, material)
-            .fluidInputs(Materials.DistilledWater.getFluid(1000))
-            .outputs(crushedPurifiedOre,
-                OreDictUnifier.get(OrePrefix.dustTiny, byproductMaterial, 3),
-                OreDictUnifier.get(OrePrefix.dust, Materials.Stone))
-            .duration(300)
-            .buildAndRegister();
+                .input(crushedPrefix, material)
+                .fluidInputs(Materials.DistilledWater.getFluid(1000))
+                .outputs(crushedPurifiedOre,
+                        OreDictUnifier.get(OrePrefix.dustTiny, byproductMaterial, 3),
+                        OreDictUnifier.get(OrePrefix.dust, Materials.Stone))
+                .duration(300)
+                .buildAndRegister();
 
         RecipeMaps.THERMAL_CENTRIFUGE_RECIPES.recipeBuilder()
-            .input(crushedPrefix, material)
-            .duration((int) material.getAverageMass() * 20)
-            .outputs(crushedCentrifugedOre,
-                OreDictUnifier.get(OrePrefix.dustTiny, byproductMaterial, property.getByProductMultiplier() * 3),
-                OreDictUnifier.get(OrePrefix.dust, Materials.Stone))
-            .buildAndRegister();
+                .input(crushedPrefix, material)
+                .duration((int) material.getAverageMass() * 20)
+                .outputs(crushedCentrifugedOre,
+                        OreDictUnifier.get(OrePrefix.dustTiny, byproductMaterial, property.getByProductMultiplier() * 3),
+                        OreDictUnifier.get(OrePrefix.dust, Materials.Stone))
+                .buildAndRegister();
 
         if (property.getWashedIn() != null) {
             Material washingByproduct = GTUtility.selectItemInList(3, material, property.getOreByProducts(), Material.class);
             RecipeMaps.CHEMICAL_BATH_RECIPES.recipeBuilder()
-                .input(crushedPrefix, material)
-                .fluidInputs(property.getWashedIn().getFluid(property.getWashedIn() == Materials.SodiumPersulfate ? 100 : 1000))
-                .outputs(crushedPurifiedOre)
-                .chancedOutput(OreDictUnifier.get(OrePrefix.dust, washingByproduct, property.getByProductMultiplier()), 7000, 580)
-                .chancedOutput(OreDictUnifier.get(OrePrefix.dust, Materials.Stone), 4000, 650)
-                .duration(800).EUt(8)
-                .buildAndRegister();
+                    .input(crushedPrefix, material)
+                    .fluidInputs(property.getWashedIn().getFluid(property.getWashedIn() == Materials.SodiumPersulfate ? 100 : 1000))
+                    .outputs(crushedPurifiedOre)
+                    .chancedOutput(OreDictUnifier.get(OrePrefix.dust, washingByproduct, property.getByProductMultiplier()), 7000, 580)
+                    .chancedOutput(OreDictUnifier.get(OrePrefix.dust, Materials.Stone), 4000, 650)
+                    .duration(800).EUt(8)
+                    .buildAndRegister();
         }
 
         ModHandler.addShapelessRecipe(String.format("crushed_ore_to_dust_%s", material),
-            impureDustStack, 'h', new UnificationEntry(crushedPrefix, material));
+                impureDustStack, 'h', new UnificationEntry(crushedPrefix, material));
 
         processMetalSmelting(crushedPrefix, material, property);
     }
@@ -181,23 +181,23 @@ public static void processCrushedOre(OrePrefix crushedPrefix, Material material,
     public static void processCrushedCentrifuged(OrePrefix centrifugedPrefix, Material material, OreProperty property) {
         ItemStack dustStack = OreDictUnifier.get(OrePrefix.dust, material);
         ItemStack byproductStack = OreDictUnifier.get(OrePrefix.dust, GTUtility.selectItemInList(2,
-            material, property.getOreByProducts(), Material.class), 1);
+                material, property.getOreByProducts(), Material.class), 1);
 
         RecipeMaps.FORGE_HAMMER_RECIPES.recipeBuilder()
-            .input(centrifugedPrefix, material)
-            .outputs(dustStack)
-            .duration(60).EUt(8)
-            .buildAndRegister();
+                .input(centrifugedPrefix, material)
+                .outputs(dustStack)
+                .duration(60).EUt(8)
+                .buildAndRegister();
 
         RecipeMaps.MACERATOR_RECIPES.recipeBuilder()
-            .input(centrifugedPrefix, material)
-            .outputs(dustStack)
-            .chancedOutput(byproductStack, 1400, 850)
-            .duration(200).EUt(12)
-            .buildAndRegister();
+                .input(centrifugedPrefix, material)
+                .outputs(dustStack)
+                .chancedOutput(byproductStack, 1400, 850)
+                .duration(200).EUt(12)
+                .buildAndRegister();
 
         ModHandler.addShapelessRecipe(String.format("centrifuged_ore_to_dust_%s", material), dustStack,
-            'h', new UnificationEntry(centrifugedPrefix, material));
+                'h', new UnificationEntry(centrifugedPrefix, material));
 
         processMetalSmelting(centrifugedPrefix, material, property);
     }
@@ -210,30 +210,30 @@ public static void processCrushedPurified(OrePrefix purifiedPrefix, Material mat
         ItemStack byproductStack = OreDictUnifier.get(OrePrefix.dust, byproductMaterial);
 
         RecipeMaps.FORGE_HAMMER_RECIPES.recipeBuilder()
-            .input(purifiedPrefix, material)
-            .outputs(dustStack)
-            .duration(60)
-            .EUt(8)
-            .buildAndRegister();
+                .input(purifiedPrefix, material)
+                .outputs(dustStack)
+                .duration(60)
+                .EUt(8)
+                .buildAndRegister();
 
         RecipeMaps.MACERATOR_RECIPES.recipeBuilder()
-            .input(purifiedPrefix, material)
-            .outputs(dustStack)
-            .chancedOutput(byproductStack, 1400, 850)
-            .duration(200)
-            .EUt(12)
-            .buildAndRegister();
+                .input(purifiedPrefix, material)
+                .outputs(dustStack)
+                .chancedOutput(byproductStack, 1400, 850)
+                .duration(200)
+                .EUt(12)
+                .buildAndRegister();
 
         ModHandler.addShapelessRecipe(String.format("purified_ore_to_dust_%s", material), dustStack,
-            'h', new UnificationEntry(purifiedPrefix, material));
+                'h', new UnificationEntry(purifiedPrefix, material));
 
         if (!crushedCentrifugedStack.isEmpty()) {
             RecipeMaps.THERMAL_CENTRIFUGE_RECIPES.recipeBuilder()
-                .input(purifiedPrefix, material)
-                .outputs(crushedCentrifugedStack, OreDictUnifier.get(OrePrefix.dustTiny, byproductMaterial, 3))
-                .duration((int) (material.getAverageMass() * 20))
-                .EUt(60)
-                .buildAndRegister();
+                    .input(purifiedPrefix, material)
+                    .outputs(crushedCentrifugedStack, OreDictUnifier.get(OrePrefix.dustTiny, byproductMaterial, 3))
+                    .duration((int) (material.getAverageMass() * 20))
+                    .EUt(60)
+                    .buildAndRegister();
         }
 
         if (material.hasProperty(PropertyKey.GEM)) {
@@ -245,26 +245,26 @@ public static void processCrushedPurified(OrePrefix purifiedPrefix, Material mat
 
             if (material.hasFlag(HIGH_SIFTER_OUTPUT)) {
                 RecipeMaps.SIFTER_RECIPES.recipeBuilder()
-                    .input(purifiedPrefix, material)
-                    .chancedOutput(exquisiteStack, 300, 60)
-                    .chancedOutput(flawlessStack, 1200, 180)
-                    .chancedOutput(gemStack, 4500, 540)
-                    .chancedOutput(flawedStack, 1400, 240)
-                    .chancedOutput(chippedStack, 2800, 320)
-                    .chancedOutput(dustStack, 3500, 500)
-                    .duration(800).EUt(16)
-                    .buildAndRegister();
+                        .input(purifiedPrefix, material)
+                        .chancedOutput(exquisiteStack, 300, 60)
+                        .chancedOutput(flawlessStack, 1200, 180)
+                        .chancedOutput(gemStack, 4500, 540)
+                        .chancedOutput(flawedStack, 1400, 240)
+                        .chancedOutput(chippedStack, 2800, 320)
+                        .chancedOutput(dustStack, 3500, 500)
+                        .duration(800).EUt(16)
+                        .buildAndRegister();
             } else {
                 RecipeMaps.SIFTER_RECIPES.recipeBuilder()
-                    .input(purifiedPrefix, material)
-                    .chancedOutput(exquisiteStack, 100, 30)
-                    .chancedOutput(flawlessStack, 400, 70)
-                    .chancedOutput(gemStack, 1500, 300)
-                    .chancedOutput(flawedStack, 2000, 240)
-                    .chancedOutput(chippedStack, 4000, 320)
-                    .chancedOutput(dustStack, 5000, 600)
-                    .duration(800).EUt(16)
-                    .buildAndRegister();
+                        .input(purifiedPrefix, material)
+                        .chancedOutput(exquisiteStack, 100, 30)
+                        .chancedOutput(flawlessStack, 400, 70)
+                        .chancedOutput(gemStack, 1500, 300)
+                        .chancedOutput(flawedStack, 2000, 240)
+                        .chancedOutput(chippedStack, 4000, 320)
+                        .chancedOutput(dustStack, 5000, 600)
+                        .duration(800).EUt(16)
+                        .buildAndRegister();
             }
         }
         processMetalSmelting(purifiedPrefix, material, property);
@@ -277,9 +277,9 @@ public static void processDirtyDust(OrePrefix dustPrefix, Material material, Ore
                 2, material, property.getOreByProducts(), Material.class);
 
         RecipeBuilder builder = RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder()
-            .input(dustPrefix, material)
-            .outputs(dustStack)
-            .duration((int) (material.getAverageMass() * 4)).EUt(24);
+                .input(dustPrefix, material)
+                .outputs(dustStack)
+                .duration((int) (material.getAverageMass() * 4)).EUt(24);
 
         if (byproduct.hasProperty(PropertyKey.DUST)) {
             builder.outputs(OreDictUnifier.get(OrePrefix.dustTiny, byproduct, 3));
@@ -318,16 +318,16 @@ public static void processPureDust(OrePrefix purePrefix, Material material, OreP
         if (dustStack.isEmpty()) {
             //fallback for reduced & cleanGravel
             dustStack = GTUtility.copy(
-                OreDictUnifier.get(OrePrefix.reduced, material),
-                OreDictUnifier.get(OrePrefix.cleanGravel, material));
+                    OreDictUnifier.get(OrePrefix.reduced, material),
+                    OreDictUnifier.get(OrePrefix.cleanGravel, material));
         }
 
         RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder()
-            .input(purePrefix, material)
-            .outputs(dustStack, OreDictUnifier.get(OrePrefix.dustTiny, byproductMaterial, 3))
-            .duration((int) (material.getAverageMass() * 4))
-            .EUt(5)
-            .buildAndRegister();
+                .input(purePrefix, material)
+                .outputs(dustStack, OreDictUnifier.get(OrePrefix.dustTiny, byproductMaterial, 3))
+                .duration((int) (material.getAverageMass() * 4))
+                .EUt(5)
+                .buildAndRegister();
 
         processMetalSmelting(purePrefix, material, property);
     }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java
index 05cd1edb010..79d1badc881 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java
@@ -61,24 +61,24 @@ public static void processBolt(OrePrefix boltPrefix, Material material, DustProp
         ItemStack ingotStack = OreDictUnifier.get(OrePrefix.ingot, material);
 
         ModHandler.addShapedRecipe(String.format("bolt_file_%s", material.toString()),
-            boltStack, "fS", "S ",
-            'S', new UnificationEntry(OrePrefix.screw, material));
+                boltStack, "fS", "S ",
+                'S', new UnificationEntry(OrePrefix.screw, material));
 
         RecipeMaps.CUTTER_RECIPES.recipeBuilder()
-            .input(OrePrefix.screw, material)
-            .outputs(boltStack)
-            .duration(20)
-            .EUt(24)
-            .buildAndRegister();
+                .input(OrePrefix.screw, material)
+                .outputs(boltStack)
+                .duration(20)
+                .EUt(24)
+                .buildAndRegister();
 
         if (!boltStack.isEmpty() && !ingotStack.isEmpty()) {
             RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-                .notConsumable(MetaItems.SHAPE_EXTRUDER_BOLT)
-                .input(OrePrefix.ingot, material)
-                .outputs(GTUtility.copyAmount(8, boltStack))
-                .duration(15)
-                .EUt(120)
-                .buildAndRegister();
+                    .notConsumable(MetaItems.SHAPE_EXTRUDER_BOLT)
+                    .input(OrePrefix.ingot, material)
+                    .outputs(GTUtility.copyAmount(8, boltStack))
+                    .duration(15)
+                    .EUt(120)
+                    .buildAndRegister();
         }
     }
 
@@ -86,15 +86,15 @@ public static void processScrew(OrePrefix screwPrefix, Material material, DustPr
         ItemStack screwStack = OreDictUnifier.get(screwPrefix, material);
 
         RecipeMaps.LATHE_RECIPES.recipeBuilder()
-            .input(OrePrefix.bolt, material)
-            .outputs(screwStack)
-            .duration((int) Math.max(1, material.getAverageMass() / 8L))
-            .EUt(4)
-            .buildAndRegister();
+                .input(OrePrefix.bolt, material)
+                .outputs(screwStack)
+                .duration((int) Math.max(1, material.getAverageMass() / 8L))
+                .EUt(4)
+                .buildAndRegister();
 
         ModHandler.addShapedRecipe(String.format("screw_%s", material.toString()),
-            screwStack, "fX", "X ",
-            'X', new UnificationEntry(OrePrefix.bolt, material));
+                screwStack, "fX", "X ",
+                'X', new UnificationEntry(OrePrefix.bolt, material));
     }
 
     public static void processFoil(OrePrefix foilPrefix, Material material, IngotProperty property) {
@@ -113,12 +113,12 @@ public static void processFoil(OrePrefix foilPrefix, Material material, IngotPro
 
         if (material.hasFlag(NO_SMASHING))
             RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-                .input(ingot, material)
-                .notConsumable(MetaItems.SHAPE_EXTRUDER_FOIL)
-                .output(foilPrefix, material, 4)
-                .duration((int) material.getAverageMass())
-                .EUt(24)
-                .buildAndRegister();
+                    .input(ingot, material)
+                    .notConsumable(MetaItems.SHAPE_EXTRUDER_FOIL)
+                    .output(foilPrefix, material, 4)
+                    .duration((int) material.getAverageMass())
+                    .EUt(24)
+                    .buildAndRegister();
     }
 
     public static void processFineWire(OrePrefix fineWirePrefix, Material material, IngotProperty property) {
@@ -126,22 +126,22 @@ public static void processFineWire(OrePrefix fineWirePrefix, Material material,
 
         if (!OreDictUnifier.get(foil, material).isEmpty())
             ModHandler.addShapelessRecipe(String.format("fine_wire_%s", material.toString()),
-                fineWireStack, 'x', new UnificationEntry(OrePrefix.foil, material));
+                    fineWireStack, 'x', new UnificationEntry(OrePrefix.foil, material));
 
         if (material.hasProperty(PropertyKey.WIRE)) {
             RecipeMaps.WIREMILL_RECIPES.recipeBuilder()
-                .input(OrePrefix.wireGtSingle, material)
-                .outputs(OreDictUnifier.get(OrePrefix.wireFine, material, 4))
-                .duration(200)
-                .EUt(8)
-                .buildAndRegister();
+                    .input(OrePrefix.wireGtSingle, material)
+                    .outputs(OreDictUnifier.get(OrePrefix.wireFine, material, 4))
+                    .duration(200)
+                    .EUt(8)
+                    .buildAndRegister();
         } else {
             RecipeMaps.WIREMILL_RECIPES.recipeBuilder()
-                .input(OrePrefix.ingot, material)
-                .outputs(OreDictUnifier.get(OrePrefix.wireFine, material, 8))
-                .duration(400)
-                .EUt(8)
-                .buildAndRegister();
+                    .input(OrePrefix.ingot, material)
+                    .outputs(OreDictUnifier.get(OrePrefix.wireFine, material, 8))
+                    .duration(400)
+                    .EUt(8)
+                    .buildAndRegister();
         }
     }
 
@@ -150,31 +150,31 @@ public static void processGear(OrePrefix gearPrefix, Material material, DustProp
         if (gearPrefix == OrePrefix.gear && material.hasProperty(PropertyKey.INGOT)) {
             int voltageMultiplier = getVoltageMultiplier(material);
             RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-                .input(OrePrefix.ingot, material, 4)
-                .notConsumable(MetaItems.SHAPE_EXTRUDER_GEAR)
-                .outputs(OreDictUnifier.get(gearPrefix, material))
-                .duration((int) material.getAverageMass() * 5)
-                .EUt(8 * voltageMultiplier)
-                .buildAndRegister();
+                    .input(OrePrefix.ingot, material, 4)
+                    .notConsumable(MetaItems.SHAPE_EXTRUDER_GEAR)
+                    .outputs(OreDictUnifier.get(gearPrefix, material))
+                    .duration((int) material.getAverageMass() * 5)
+                    .EUt(8 * voltageMultiplier)
+                    .buildAndRegister();
 
             RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder()
-                .input(OrePrefix.ingot, material, 8)
-                .notConsumable(MetaItems.SHAPE_MOLD_GEAR)
-                .outputs(OreDictUnifier.get(gearPrefix, material))
-                .duration((int) material.getAverageMass() * 10)
-                .EUt(2 * voltageMultiplier)
-                .buildAndRegister();
+                    .input(OrePrefix.ingot, material, 8)
+                    .notConsumable(MetaItems.SHAPE_MOLD_GEAR)
+                    .outputs(OreDictUnifier.get(gearPrefix, material))
+                    .duration((int) material.getAverageMass() * 10)
+                    .EUt(2 * voltageMultiplier)
+                    .buildAndRegister();
         }
 
         if (material.hasFluid()) {
             boolean isSmall = gearPrefix == OrePrefix.gearSmall;
             RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
-                .notConsumable(isSmall ? MetaItems.SHAPE_MOLD_GEAR_SMALL : MetaItems.SHAPE_MOLD_GEAR)
-                .fluidInputs(material.getFluid(L * (isSmall ? 1 : 4)))
-                .outputs(stack)
-                .duration(isSmall ? 20 : 100)
-                .EUt(8)
-                .buildAndRegister();
+                    .notConsumable(isSmall ? MetaItems.SHAPE_MOLD_GEAR_SMALL : MetaItems.SHAPE_MOLD_GEAR)
+                    .fluidInputs(material.getFluid(L * (isSmall ? 1 : 4)))
+                    .outputs(stack)
+                    .duration(isSmall ? 20 : 100)
+                    .EUt(8)
+                    .buildAndRegister();
         }
 
         if (material.hasFlag(GENERATE_PLATE) && material.hasFlag(GENERATE_ROD)) {
@@ -183,17 +183,17 @@ public static void processGear(OrePrefix gearPrefix, Material material, DustProp
                         " R ", "hPx", " R ", 'R', new UnificationEntry(stick, material), 'P', new UnificationEntry(plate, material));
 
                 RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-                    .input(OrePrefix.ingot, material)
-                    .notConsumable(MetaItems.SHAPE_EXTRUDER_GEAR_SMALL)
-                    .outputs(stack)
-                    .duration((int) material.getAverageMass())
-                    .EUt(material.getBlastTemperature() >= 2800 ? 256 : 64)
-                    .buildAndRegister();
+                        .input(OrePrefix.ingot, material)
+                        .notConsumable(MetaItems.SHAPE_EXTRUDER_GEAR_SMALL)
+                        .outputs(stack)
+                        .duration((int) material.getAverageMass())
+                        .EUt(material.getBlastTemperature() >= 2800 ? 256 : 64)
+                        .buildAndRegister();
             } else {
                 ModHandler.addShapedRecipe(String.format("gear_%s", material), stack,
-                    "RPR", "PwP", "RPR",
-                    'P', new UnificationEntry(OrePrefix.plate, material),
-                    'R', new UnificationEntry(OrePrefix.stick, material));
+                        "RPR", "PwP", "RPR",
+                        'P', new UnificationEntry(OrePrefix.plate, material),
+                        'R', new UnificationEntry(OrePrefix.stick, material));
             }
         }
     }
@@ -202,11 +202,11 @@ public static void processLens(OrePrefix lensPrefix, Material material, GemPrope
         ItemStack stack = OreDictUnifier.get(lensPrefix, material);
 
         RecipeMaps.LATHE_RECIPES.recipeBuilder()
-            .input(OrePrefix.plate, material)
-            .outputs(stack, OreDictUnifier.get(OrePrefix.dustSmall, material))
-            .duration((int) (material.getAverageMass() / 2L))
-            .EUt(16)
-            .buildAndRegister();
+                .input(OrePrefix.plate, material)
+                .outputs(stack, OreDictUnifier.get(OrePrefix.dustSmall, material))
+                .duration((int) (material.getAverageMass() / 2L))
+                .EUt(16)
+                .buildAndRegister();
 
         EnumDyeColor dyeColor = determineDyeColor(material.getMaterialRGB());
         MarkerMaterial colorMaterial = MarkerMaterials.Color.COLORS.get(dyeColor);
@@ -216,19 +216,19 @@ public static void processLens(OrePrefix lensPrefix, Material material, GemPrope
     public static void processPlate(OrePrefix platePrefix, Material material, DustProperty property) {
         if (material.hasFluid()) {
             RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
-                .notConsumable(MetaItems.SHAPE_MOLD_PLATE)
-                .fluidInputs(material.getFluid(L))
-                .outputs(OreDictUnifier.get(platePrefix, material))
-                .duration(40)
-                .EUt(8)
-                .buildAndRegister();
+                    .notConsumable(MetaItems.SHAPE_MOLD_PLATE)
+                    .fluidInputs(material.getFluid(L))
+                    .outputs(OreDictUnifier.get(platePrefix, material))
+                    .duration(40)
+                    .EUt(8)
+                    .buildAndRegister();
         }
 
         if (material.hasFlag(MORTAR_GRINDABLE)) {
             ItemStack dustStack = OreDictUnifier.get(OrePrefix.dust, material);
             ModHandler.addShapedRecipe(String.format("plate_to_dust_%s", material),
-                dustStack, "X", "m",
-                'X', new UnificationEntry(OrePrefix.plate, material));
+                    dustStack, "X", "m",
+                    'X', new UnificationEntry(OrePrefix.plate, material));
         }
     }
 
@@ -250,12 +250,12 @@ public static void processPlateDouble(OrePrefix doublePrefix, Material material,
 
     public static void processPlateDense(OrePrefix orePrefix, Material material, IngotProperty property) {
         RecipeMaps.BENDER_RECIPES.recipeBuilder()
-            .input(OrePrefix.plate, material, 9)
-            .circuitMeta(9)
-            .output(orePrefix, material)
-            .duration((int) Math.max(material.getAverageMass() * 9L, 1L))
-            .EUt(96)
-            .buildAndRegister();
+                .input(OrePrefix.plate, material, 9)
+                .circuitMeta(9)
+                .output(orePrefix, material)
+                .duration((int) Math.max(material.getAverageMass() * 9L, 1L))
+                .EUt(96)
+                .buildAndRegister();
 
         RecipeMaps.BENDER_RECIPES.recipeBuilder()
                 .input(OrePrefix.ingot, material, 9)
@@ -268,18 +268,18 @@ public static void processPlateDense(OrePrefix orePrefix, Material material, Ing
 
     public static void processRing(OrePrefix ringPrefix, Material material, IngotProperty property) {
         RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-            .input(OrePrefix.ingot, material)
-            .notConsumable(MetaItems.SHAPE_EXTRUDER_RING)
-            .outputs(OreDictUnifier.get(ringPrefix, material, 4))
-            .duration((int) material.getAverageMass() * 2)
-            .EUt(6 * getVoltageMultiplier(material))
-            .buildAndRegister();
+                .input(OrePrefix.ingot, material)
+                .notConsumable(MetaItems.SHAPE_EXTRUDER_RING)
+                .outputs(OreDictUnifier.get(ringPrefix, material, 4))
+                .duration((int) material.getAverageMass() * 2)
+                .EUt(6 * getVoltageMultiplier(material))
+                .buildAndRegister();
 
         if (!material.hasFlag(NO_SMASHING)) {
             ModHandler.addShapedRecipe(String.format("ring_%s", material),
-                OreDictUnifier.get(ringPrefix, material),
-                "h ", " X",
-                'X', new UnificationEntry(OrePrefix.stick, material));
+                    OreDictUnifier.get(ringPrefix, material),
+                    "h ", " X",
+                    'X', new UnificationEntry(OrePrefix.stick, material));
         }
     }
 
@@ -312,28 +312,28 @@ public static void processSpring(OrePrefix springPrefix, Material material, Ingo
     public static void processRotor(OrePrefix rotorPrefix, Material material, IngotProperty property) {
         ItemStack stack = OreDictUnifier.get(rotorPrefix, material);
         ModHandler.addShapedRecipe(String.format("rotor_%s", material.toString()), stack,
-            "PdP", " R ", "PSP",
-            'P', new UnificationEntry(OrePrefix.plate, material),
-            'R', new UnificationEntry(OrePrefix.ring, material),
-            'S', new UnificationEntry(OrePrefix.screw, material));
+                "PdP", " R ", "PSP",
+                'P', new UnificationEntry(OrePrefix.plate, material),
+                'R', new UnificationEntry(OrePrefix.ring, material),
+                'S', new UnificationEntry(OrePrefix.screw, material));
 
         if (material.hasFluid()) {
             RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
-                .notConsumable(MetaItems.SHAPE_MOLD_ROTOR)
-                .fluidInputs(material.getFluid(L * 4))
-                .outputs(OreDictUnifier.get(rotorPrefix, material))
-                .duration(120)
-                .EUt(20)
-                .buildAndRegister();
+                    .notConsumable(MetaItems.SHAPE_MOLD_ROTOR)
+                    .fluidInputs(material.getFluid(L * 4))
+                    .outputs(OreDictUnifier.get(rotorPrefix, material))
+                    .duration(120)
+                    .EUt(20)
+                    .buildAndRegister();
         }
     }
 
     public static void processStick(OrePrefix stickPrefix, Material material, DustProperty property) {
         if (material.hasProperty(PropertyKey.GEM) || material.hasProperty(PropertyKey.INGOT)) {
             RecipeBuilder builder = RecipeMaps.LATHE_RECIPES.recipeBuilder()
-                .input(material.hasProperty(PropertyKey.GEM) ? OrePrefix.gem : OrePrefix.ingot, material)
-                .duration((int) Math.max(material.getAverageMass() * 2, 1))
-                .EUt(16);
+                    .input(material.hasProperty(PropertyKey.GEM) ? OrePrefix.gem : OrePrefix.ingot, material)
+                    .duration((int) Math.max(material.getAverageMass() * 2, 1))
+                    .EUt(16);
 
             if (ConfigHolder.U.GT5u.harderRods) {
                 builder.output(OrePrefix.stick, material);
@@ -347,16 +347,16 @@ public static void processStick(OrePrefix stickPrefix, Material material, DustPr
         if (material.hasFlag(GENERATE_BOLT_SCREW)) {
             ItemStack boltStack = OreDictUnifier.get(OrePrefix.bolt, material);
             RecipeMaps.CUTTER_RECIPES.recipeBuilder()
-                .input(stickPrefix, material)
-                .outputs(GTUtility.copyAmount(4, boltStack))
-                .duration((int) Math.max(material.getAverageMass() * 2L, 1L))
-                .EUt(4)
-                .buildAndRegister();
+                    .input(stickPrefix, material)
+                    .outputs(GTUtility.copyAmount(4, boltStack))
+                    .duration((int) Math.max(material.getAverageMass() * 2L, 1L))
+                    .EUt(4)
+                    .buildAndRegister();
 
             ModHandler.addShapedRecipe(String.format("bolt_saw_%s", material.toString()),
-                GTUtility.copyAmount(2, boltStack),
-                "s ", " X",
-                'X', new UnificationEntry(OrePrefix.stick, material));
+                    GTUtility.copyAmount(2, boltStack),
+                    "s ", " X",
+                    'X', new UnificationEntry(OrePrefix.stick, material));
         }
     }
 
@@ -365,45 +365,45 @@ public static void processLongStick(OrePrefix longStickPrefix, Material material
         ItemStack stickStack = OreDictUnifier.get(OrePrefix.stick, material);
 
         RecipeMaps.CUTTER_RECIPES.recipeBuilder()
-            .input(longStickPrefix, material)
-            .outputs(GTUtility.copyAmount(2, stickStack))
-            .duration((int) Math.max(material.getAverageMass(), 1L)).EUt(4)
-            .buildAndRegister();
+                .input(longStickPrefix, material)
+                .outputs(GTUtility.copyAmount(2, stickStack))
+                .duration((int) Math.max(material.getAverageMass(), 1L)).EUt(4)
+                .buildAndRegister();
 
         ModHandler.addShapedRecipe(String.format("stick_long_%s", material.toString()),
-            GTUtility.copyAmount(2, stickStack),
-            "s", "X", 'X', new UnificationEntry(OrePrefix.stickLong, material));
+                GTUtility.copyAmount(2, stickStack),
+                "s", "X", 'X', new UnificationEntry(OrePrefix.stickLong, material));
 
         ModHandler.addShapedRecipe(String.format("stick_long_gem_flawless_%s", material.toString()),
-            stickStack,
-            "sf",
-            "G ",
-            'G', new UnificationEntry(OrePrefix.gemFlawless, material));
+                stickStack,
+                "sf",
+                "G ",
+                'G', new UnificationEntry(OrePrefix.gemFlawless, material));
 
         ModHandler.addShapedRecipe(String.format("stick_long_gem_exquisite_%s", material.toString()),
-            GTUtility.copyAmount(2, stickStack),
-            "sf", "G ",
-            'G', new UnificationEntry(OrePrefix.gemExquisite, material));
+                GTUtility.copyAmount(2, stickStack),
+                "sf", "G ",
+                'G', new UnificationEntry(OrePrefix.gemExquisite, material));
 
         ModHandler.addShapedRecipe(String.format("stick_long_stick_%s", material.toString()), stack,
-            "ShS",
-            'S', new UnificationEntry(OrePrefix.stick, material));
+                "ShS",
+                'S', new UnificationEntry(OrePrefix.stick, material));
 
         RecipeMaps.FORGE_HAMMER_RECIPES.recipeBuilder()
-            .input(OrePrefix.stick, material, 2)
-            .outputs(stack)
-            .duration((int) Math.max(material.getAverageMass(), 1L))
-            .EUt(16)
-            .buildAndRegister();
-
-        if (material.getProperties().hasProperty(PropertyKey.INGOT))
-            RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-                .input(OrePrefix.ingot, material)
-                .notConsumable(MetaItems.SHAPE_EXTRUDER_ROD_LONG)
+                .input(OrePrefix.stick, material, 2)
                 .outputs(stack)
                 .duration((int) Math.max(material.getAverageMass(), 1L))
-                .EUt(64)
+                .EUt(16)
                 .buildAndRegister();
+
+        if (material.getProperties().hasProperty(PropertyKey.INGOT))
+            RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
+                    .input(OrePrefix.ingot, material)
+                    .notConsumable(MetaItems.SHAPE_EXTRUDER_ROD_LONG)
+                    .outputs(stack)
+                    .duration((int) Math.max(material.getAverageMass(), 1L))
+                    .EUt(64)
+                    .buildAndRegister();
     }
 
     public static void processTurbine(OrePrefix toolPrefix, Material material, IngotProperty property) {
@@ -412,12 +412,12 @@ public static void processTurbine(OrePrefix toolPrefix, Material material, Ingot
         TurbineRotorBehavior.getInstanceFor(rotorStack).setPartMaterial(rotorStack, material);
 
         RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
-            .input(OrePrefix.turbineBlade, material, 8)
-            .input(OrePrefix.stickLong, Materials.Magnalium)
-            .outputs(rotorStack)
-            .duration(200)
-            .EUt(400)
-            .buildAndRegister();
+                .input(OrePrefix.turbineBlade, material, 8)
+                .input(OrePrefix.stickLong, Materials.Magnalium)
+                .outputs(rotorStack)
+                .duration(200)
+                .EUt(400)
+                .buildAndRegister();
 
         RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder()
                 .input(OrePrefix.plateDouble, material, 5)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/PipeRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/PipeRecipeHandler.java
index e347ec33e19..6a622eed513 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/PipeRecipeHandler.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/PipeRecipeHandler.java
@@ -4,9 +4,11 @@
 import gregtech.api.recipes.ModHandler;
 import gregtech.api.recipes.RecipeMaps;
 import gregtech.api.unification.OreDictUnifier;
-import gregtech.api.unification.material.Materials;
-import gregtech.api.unification.material.properties.*;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.Materials;
+import gregtech.api.unification.material.properties.IMaterialProperty;
+import gregtech.api.unification.material.properties.ItemPipeProperties;
+import gregtech.api.unification.material.properties.PropertyKey;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.stack.UnificationEntry;
 import gregtech.api.util.GTUtility;
@@ -41,12 +43,12 @@ private static void processRestrictivePipe(OrePrefix pipePrefix, Material materi
         else return;
 
         RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
-            .input(unrestrictive, material)
-            .input(OrePrefix.ring, Materials.Iron, 2)
-            .output(pipePrefix, material)
-            .duration(20)
-            .EUt(8)
-            .buildAndRegister();
+                .input(unrestrictive, material)
+                .input(OrePrefix.ring, Materials.Iron, 2)
+                .output(pipePrefix, material)
+                .duration(20)
+                .EUt(8)
+                .buildAndRegister();
 
         ModHandler.addShapedRecipe(CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, pipePrefix.toString()) + "_" + material.toCamelCaseString(),
                 OreDictUnifier.get(pipePrefix, material), "PR", "Rh",
@@ -56,12 +58,12 @@ private static void processRestrictivePipe(OrePrefix pipePrefix, Material materi
     private static void processPipeTiny(OrePrefix pipePrefix, Material material, IMaterialProperty property) {
         ItemStack pipeStack = OreDictUnifier.get(pipePrefix, material);
         RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-            .input(OrePrefix.ingot, material, 1)
-            .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_TINY)
-            .outputs(GTUtility.copyAmount(2, pipeStack))
-            .duration((int) (material.getAverageMass()))
-            .EUt(6 * getVoltageMultiplier(material))
-            .buildAndRegister();
+                .input(OrePrefix.ingot, material, 1)
+                .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_TINY)
+                .outputs(GTUtility.copyAmount(2, pipeStack))
+                .duration((int) (material.getAverageMass()))
+                .EUt(6 * getVoltageMultiplier(material))
+                .buildAndRegister();
 
         ModHandler.addShapedRecipe(String.format("tiny_%s_pipe", material.toString()),
                 GTUtility.copyAmount(8, pipeStack), "XXX", "h w", "XXX",
@@ -71,42 +73,42 @@ private static void processPipeTiny(OrePrefix pipePrefix, Material material, IMa
     private static void processPipeSmall(OrePrefix pipePrefix, Material material, IMaterialProperty property) {
         ItemStack pipeStack = OreDictUnifier.get(pipePrefix, material);
         RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-            .input(OrePrefix.ingot, material, 1)
-            .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_SMALL)
-            .outputs(pipeStack)
-            .duration((int) (material.getAverageMass()))
-            .EUt(6 * getVoltageMultiplier(material))
-            .buildAndRegister();
+                .input(OrePrefix.ingot, material, 1)
+                .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_SMALL)
+                .outputs(pipeStack)
+                .duration((int) (material.getAverageMass()))
+                .EUt(6 * getVoltageMultiplier(material))
+                .buildAndRegister();
 
         ModHandler.addShapedRecipe(String.format("small_%s_pipe", material.toString()),
-            GTUtility.copyAmount(6, pipeStack), "XwX", "X X", "XhX",
-            'X', new UnificationEntry(OrePrefix.plate, material));
+                GTUtility.copyAmount(6, pipeStack), "XwX", "X X", "XhX",
+                'X', new UnificationEntry(OrePrefix.plate, material));
     }
 
     private static void processPipeNormal(OrePrefix pipePrefix, Material material, IMaterialProperty property) {
         ItemStack pipeStack = OreDictUnifier.get(pipePrefix, material);
         RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-            .input(OrePrefix.ingot, material, 3)
-            .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_MEDIUM)
-            .outputs(pipeStack)
-            .duration((int) material.getAverageMass() * 3)
-            .EUt(6 * getVoltageMultiplier(material))
-            .buildAndRegister();
+                .input(OrePrefix.ingot, material, 3)
+                .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_MEDIUM)
+                .outputs(pipeStack)
+                .duration((int) material.getAverageMass() * 3)
+                .EUt(6 * getVoltageMultiplier(material))
+                .buildAndRegister();
 
         ModHandler.addShapedRecipe(String.format("medium_%s_pipe", material.toString()),
-            GTUtility.copyAmount(2, pipeStack), "XXX", "w h", "XXX",
-            'X', new UnificationEntry(OrePrefix.plate, material));
+                GTUtility.copyAmount(2, pipeStack), "XXX", "w h", "XXX",
+                'X', new UnificationEntry(OrePrefix.plate, material));
     }
 
     private static void processPipeLarge(OrePrefix pipePrefix, Material material, IMaterialProperty property) {
         ItemStack pipeStack = OreDictUnifier.get(pipePrefix, material);
         RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-            .input(OrePrefix.ingot, material, 6)
-            .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_LARGE)
-            .outputs(pipeStack)
-            .duration((int) material.getAverageMass() * 6)
-            .EUt(6 * getVoltageMultiplier(material))
-            .buildAndRegister();
+                .input(OrePrefix.ingot, material, 6)
+                .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_LARGE)
+                .outputs(pipeStack)
+                .duration((int) material.getAverageMass() * 6)
+                .EUt(6 * getVoltageMultiplier(material))
+                .buildAndRegister();
 
         ModHandler.addShapedRecipe(String.format("large_%s_pipe", material.toString()),
                 pipeStack, "XhX", "X X", "XwX",
diff --git a/src/main/java/gregtech/loaders/oreprocessing/PolarizingRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/PolarizingRecipeHandler.java
index bf4e95449be..bb52a4d1c9e 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/PolarizingRecipeHandler.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/PolarizingRecipeHandler.java
@@ -14,8 +14,8 @@
 public class PolarizingRecipeHandler {
 
     private static final OrePrefix[] POLARIZING_PREFIXES = new OrePrefix[]{
-        OrePrefix.stick, OrePrefix.stickLong, OrePrefix.plate, OrePrefix.ingot, OrePrefix.plateDense, OrePrefix.rotor,
-        OrePrefix.bolt, OrePrefix.screw, OrePrefix.wireFine, OrePrefix.foil, OrePrefix.dust, OrePrefix.ring};
+            OrePrefix.stick, OrePrefix.stickLong, OrePrefix.plate, OrePrefix.ingot, OrePrefix.plateDense, OrePrefix.rotor,
+            OrePrefix.bolt, OrePrefix.screw, OrePrefix.wireFine, OrePrefix.foil, OrePrefix.dust, OrePrefix.ring};
 
     public static void register() {
         for (OrePrefix orePrefix : POLARIZING_PREFIXES) {
@@ -29,14 +29,14 @@ public static void processPolarizing(OrePrefix polarizingPrefix, Material materi
         if (magneticMaterial != null && polarizingPrefix.doGenerateItem(magneticMaterial)) {
             ItemStack magneticStack = OreDictUnifier.get(polarizingPrefix, magneticMaterial);
             RecipeMaps.POLARIZER_RECIPES.recipeBuilder() //polarizing
-                .input(polarizingPrefix, material)
-                .outputs(magneticStack)
-                .duration((int) ((int) material.getAverageMass() * polarizingPrefix.materialAmount / GTValues.M))
-                .EUt(8 * getVoltageMultiplier(material))
-                .buildAndRegister();
+                    .input(polarizingPrefix, material)
+                    .outputs(magneticStack)
+                    .duration((int) ((int) material.getAverageMass() * polarizingPrefix.materialAmount / GTValues.M))
+                    .EUt(8 * getVoltageMultiplier(material))
+                    .buildAndRegister();
 
             ModHandler.addSmeltingRecipe(new UnificationEntry(polarizingPrefix, magneticMaterial),
-                OreDictUnifier.get(polarizingPrefix, material)); //de-magnetizing
+                    OreDictUnifier.get(polarizingPrefix, material)); //de-magnetizing
         }
     }
 
diff --git a/src/main/java/gregtech/loaders/oreprocessing/RecyclingRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/RecyclingRecipeHandler.java
index 08d8b0c8a6f..52b3a882297 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/RecyclingRecipeHandler.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/RecyclingRecipeHandler.java
@@ -15,21 +15,21 @@
 public class RecyclingRecipeHandler {
 
     private static final List CRUSHING_PREFIXES = Arrays.asList(
-        OrePrefix.ingot, OrePrefix.gem, OrePrefix.stick, OrePrefix.plate, OrePrefix.plank,
-        OrePrefix.ring, OrePrefix.stickLong, OrePrefix.foil, OrePrefix.bolt,
-        OrePrefix.screw, OrePrefix.nugget, OrePrefix.gearSmall, OrePrefix.gear,
-        OrePrefix.frameGt, OrePrefix.plateDense, OrePrefix.spring,
-        OrePrefix.springSmall, OrePrefix.block, OrePrefix.wireFine,
-        OrePrefix.rotor, OrePrefix.lens, OrePrefix.turbineBlade,
-        (Predicate) orePrefix -> orePrefix.name().startsWith("toolHead"),
-        (Predicate) orePrefix -> orePrefix.name().startsWith("gem"),
-        (Predicate) orePrefix -> orePrefix.name().startsWith("cableGt"),
-        (Predicate) orePrefix -> orePrefix.name().startsWith("wireGt"),
-        (Predicate) orePrefix -> orePrefix.name().startsWith("pipe")
+            OrePrefix.ingot, OrePrefix.gem, OrePrefix.stick, OrePrefix.plate, OrePrefix.plank,
+            OrePrefix.ring, OrePrefix.stickLong, OrePrefix.foil, OrePrefix.bolt,
+            OrePrefix.screw, OrePrefix.nugget, OrePrefix.gearSmall, OrePrefix.gear,
+            OrePrefix.frameGt, OrePrefix.plateDense, OrePrefix.spring,
+            OrePrefix.springSmall, OrePrefix.block, OrePrefix.wireFine,
+            OrePrefix.rotor, OrePrefix.lens, OrePrefix.turbineBlade,
+            (Predicate) orePrefix -> orePrefix.name().startsWith("toolHead"),
+            (Predicate) orePrefix -> orePrefix.name().startsWith("gem"),
+            (Predicate) orePrefix -> orePrefix.name().startsWith("cableGt"),
+            (Predicate) orePrefix -> orePrefix.name().startsWith("wireGt"),
+            (Predicate) orePrefix -> orePrefix.name().startsWith("pipe")
     );
 
     private static final List IGNORE_ARC_SMELTING = Arrays.asList(
-        OrePrefix.ingot, OrePrefix.gem, OrePrefix.nugget, OrePrefix.block);
+            OrePrefix.ingot, OrePrefix.gem, OrePrefix.nugget, OrePrefix.block);
 
     public static void register() {
         //registers universal maceration recipes for specified ore prefixes
@@ -51,8 +51,8 @@ public static void processCrushing(OrePrefix thingPrefix, Material material, Dus
         //only ignore arc smelting for blacklisted prefixes if yielded material is the same as input material
         //if arc smelting gives different material, allow it
         boolean ignoreArcSmelting = IGNORE_ARC_SMELTING.contains(thingPrefix) && !(
-            material.hasProperty(PropertyKey.INGOT)
-                    && material.getProperty(PropertyKey.INGOT).getArcSmeltInto() != material);
+                material.hasProperty(PropertyKey.INGOT)
+                        && material.getProperty(PropertyKey.INGOT).getArcSmeltInto() != material);
         RecyclingRecipes.registerArcRecyclingRecipe(builder -> builder.input(thingPrefix, material), materialStacks, ignoreArcSmelting);
     }
 
diff --git a/src/main/java/gregtech/loaders/oreprocessing/WireRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/WireRecipeHandler.java
index bade5e7c1a4..281c7933bbe 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/WireRecipeHandler.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/WireRecipeHandler.java
@@ -5,8 +5,8 @@
 import gregtech.api.recipes.RecipeMaps;
 import gregtech.api.recipes.ingredients.IntCircuitIngredient;
 import gregtech.api.unification.OreDictUnifier;
-import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.properties.PropertyKey;
 import gregtech.api.unification.material.properties.WireProperties;
 import gregtech.api.unification.ore.OrePrefix;
@@ -48,33 +48,33 @@ public static void register() {
     }
 
     private static final OrePrefix[] WIRE_DOUBLING_ORDER = new OrePrefix[]{
-        OrePrefix.wireGtSingle, OrePrefix.wireGtDouble, OrePrefix.wireGtQuadruple, OrePrefix.wireGtOctal, OrePrefix.wireGtHex
+            OrePrefix.wireGtSingle, OrePrefix.wireGtDouble, OrePrefix.wireGtQuadruple, OrePrefix.wireGtOctal, OrePrefix.wireGtHex
     };
 
     private static final OrePrefix[] CABLE_DOUBLING_ORDER = new OrePrefix[]{
-        OrePrefix.cableGtSingle, OrePrefix.cableGtDouble, OrePrefix.cableGtQuadruple, OrePrefix.cableGtOctal, OrePrefix.cableGtHex
+            OrePrefix.cableGtSingle, OrePrefix.cableGtDouble, OrePrefix.cableGtQuadruple, OrePrefix.cableGtOctal, OrePrefix.cableGtHex
     };
 
     public static void processWireSingle(OrePrefix wirePrefix, Material material, WireProperties property) {
         RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
-            .input(OrePrefix.ingot, material)
-            .notConsumable(MetaItems.SHAPE_EXTRUDER_WIRE)
-            .outputs(OreDictUnifier.get(OrePrefix.wireGtSingle, material, 2))
-            .duration((int) material.getAverageMass() * 2)
-            .EUt(6 * getVoltageMultiplier(material))
-            .buildAndRegister();
+                .input(OrePrefix.ingot, material)
+                .notConsumable(MetaItems.SHAPE_EXTRUDER_WIRE)
+                .outputs(OreDictUnifier.get(OrePrefix.wireGtSingle, material, 2))
+                .duration((int) material.getAverageMass() * 2)
+                .EUt(6 * getVoltageMultiplier(material))
+                .buildAndRegister();
 
         RecipeMaps.WIREMILL_RECIPES.recipeBuilder()
-            .input(OrePrefix.ingot, material)
-            .outputs(OreDictUnifier.get(OrePrefix.wireGtSingle, material, 2))
-            .duration((int) material.getAverageMass())
-            .EUt(getVoltageMultiplier(material))
-            .buildAndRegister();
+                .input(OrePrefix.ingot, material)
+                .outputs(OreDictUnifier.get(OrePrefix.wireGtSingle, material, 2))
+                .duration((int) material.getAverageMass())
+                .EUt(getVoltageMultiplier(material))
+                .buildAndRegister();
 
         if (!material.hasFlag(NO_WORKING)) {
             ModHandler.addShapedRecipe(String.format("%s_wire_single", material),
-                OreDictUnifier.get(OrePrefix.wireGtSingle, material), "Xx",
-                'X', new UnificationEntry(OrePrefix.plate, material));
+                    OreDictUnifier.get(OrePrefix.wireGtSingle, material), "Xx",
+                    'X', new UnificationEntry(OrePrefix.plate, material));
         }
     }
 
@@ -97,32 +97,32 @@ public static void generateWireRecipe(OrePrefix wirePrefix, Material material, W
         if (isManualInsulatedCable(property)) {
             ItemStack rubberStack = OreDictUnifier.get(OrePrefix.plate, Materials.Rubber, cableAmount);
             RecipeMaps.PACKER_RECIPES.recipeBuilder()
-                .input(wirePrefix, material)
-                .inputs(rubberStack)
-                .outputs(cableStack)
-                .duration(100).EUt(8)
-                .buildAndRegister();
+                    .input(wirePrefix, material)
+                    .inputs(rubberStack)
+                    .outputs(cableStack)
+                    .duration(100).EUt(8)
+                    .buildAndRegister();
         }
 
-        for(Material insulationMaterial : INSULATION_MATERIALS.keySet()) {
+        for (Material insulationMaterial : INSULATION_MATERIALS.keySet()) {
             int cableTier = GTUtility.getTierByVoltage(property.voltage);
             int materialAmount = getMaterialAmount(cableTier, INSULATION_MATERIALS.get(insulationMaterial));
             if (materialAmount == -1) continue;
 
             if (wirePrefix != OrePrefix.wireGtSingle) {
                 RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
-                    .input(OrePrefix.wireGtSingle, material, cableAmount).circuitMeta(24 + ArrayUtils.indexOf(WIRE_DOUBLING_ORDER, wirePrefix))
+                        .input(OrePrefix.wireGtSingle, material, cableAmount).circuitMeta(24 + ArrayUtils.indexOf(WIRE_DOUBLING_ORDER, wirePrefix))
+                        .fluidInputs(insulationMaterial.getFluid(materialAmount * cableAmount))
+                        .outputs(cableStack)
+                        .duration(150).EUt(8)
+                        .buildAndRegister();
+            }
+            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
+                    .input(wirePrefix, material).circuitMeta(24)
                     .fluidInputs(insulationMaterial.getFluid(materialAmount * cableAmount))
                     .outputs(cableStack)
                     .duration(150).EUt(8)
                     .buildAndRegister();
-            }
-            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
-                .input(wirePrefix, material).circuitMeta(24)
-                .fluidInputs(insulationMaterial.getFluid(materialAmount * cableAmount))
-                .outputs(cableStack)
-                .duration(150).EUt(8)
-                .buildAndRegister();
         }
     }
 
@@ -132,24 +132,24 @@ public static void generateWireCombiningRecipe(OrePrefix wirePrefix, Material ma
 
         if (wireIndex < WIRE_DOUBLING_ORDER.length - 1) {
             ModHandler.addShapelessRecipe(String.format("%s_wire_%s_doubling", material, wirePrefix),
-                OreDictUnifier.get(WIRE_DOUBLING_ORDER[wireIndex + 1], material),
-                new UnificationEntry(wirePrefix, material),
-                new UnificationEntry(wirePrefix, material));
+                    OreDictUnifier.get(WIRE_DOUBLING_ORDER[wireIndex + 1], material),
+                    new UnificationEntry(wirePrefix, material),
+                    new UnificationEntry(wirePrefix, material));
         }
 
         if (wireIndex > 0) {
             ModHandler.addShapelessRecipe(String.format("%s_wire_%s_splitting", material, wirePrefix),
-                OreDictUnifier.get(WIRE_DOUBLING_ORDER[wireIndex - 1], material, 2),
-                new UnificationEntry(wirePrefix, material));
+                    OreDictUnifier.get(WIRE_DOUBLING_ORDER[wireIndex - 1], material, 2),
+                    new UnificationEntry(wirePrefix, material));
         }
 
         if (wireIndex < 3) {
             ModHandler.addShapelessRecipe(String.format("%s_wire_%s_quadrupling", material, wirePrefix),
-                OreDictUnifier.get(WIRE_DOUBLING_ORDER[wireIndex + 2], material),
-                new UnificationEntry(wirePrefix, material),
-                new UnificationEntry(wirePrefix, material),
-                new UnificationEntry(wirePrefix, material),
-                new UnificationEntry(wirePrefix, material));
+                    OreDictUnifier.get(WIRE_DOUBLING_ORDER[wireIndex + 2], material),
+                    new UnificationEntry(wirePrefix, material),
+                    new UnificationEntry(wirePrefix, material),
+                    new UnificationEntry(wirePrefix, material),
+                    new UnificationEntry(wirePrefix, material));
         }
     }
 
@@ -158,24 +158,24 @@ public static void generateCableCombiningRecipe(OrePrefix cablePrefix, Material
 
         if (cableIndex < CABLE_DOUBLING_ORDER.length - 1) {
             ModHandler.addShapelessRecipe(String.format("%s_cable_%s_doubling", material, cablePrefix),
-                OreDictUnifier.get(CABLE_DOUBLING_ORDER[cableIndex + 1], material),
-                new UnificationEntry(cablePrefix, material),
-                new UnificationEntry(cablePrefix, material));
+                    OreDictUnifier.get(CABLE_DOUBLING_ORDER[cableIndex + 1], material),
+                    new UnificationEntry(cablePrefix, material),
+                    new UnificationEntry(cablePrefix, material));
         }
 
         if (cableIndex > 0) {
             ModHandler.addShapelessRecipe(String.format("%s_cable_%s_splitting", material, cablePrefix),
-                OreDictUnifier.get(CABLE_DOUBLING_ORDER[cableIndex - 1], material, 2),
-                new UnificationEntry(cablePrefix, material));
+                    OreDictUnifier.get(CABLE_DOUBLING_ORDER[cableIndex - 1], material, 2),
+                    new UnificationEntry(cablePrefix, material));
         }
 
         if (cableIndex < 3) {
             ModHandler.addShapelessRecipe(String.format("%s_cable_%s_quadrupling", material, cablePrefix),
-                OreDictUnifier.get(CABLE_DOUBLING_ORDER[cableIndex + 2], material),
-                new UnificationEntry(cablePrefix, material),
-                new UnificationEntry(cablePrefix, material),
-                new UnificationEntry(cablePrefix, material),
-                new UnificationEntry(cablePrefix, material));
+                    OreDictUnifier.get(CABLE_DOUBLING_ORDER[cableIndex + 2], material),
+                    new UnificationEntry(cablePrefix, material),
+                    new UnificationEntry(cablePrefix, material),
+                    new UnificationEntry(cablePrefix, material),
+                    new UnificationEntry(cablePrefix, material));
         }
     }
 
@@ -183,7 +183,7 @@ public static void generateCableCombiningRecipe(OrePrefix cablePrefix, Material
      * Wire compression Material Handler
      */
     private static void processWireCompression(OrePrefix prefix, Material material, WireProperties property) {
-        for(int startTier = 0; startTier < 4; startTier++) {
+        for (int startTier = 0; startTier < 4; startTier++) {
             for (int i = 1; i < 5 - startTier; i++) {
                 PACKER_RECIPES.recipeBuilder()
                         .inputs(OreDictUnifier.get(WIRE_DOUBLING_ORDER[startTier], material, 1 << i))
diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java
index ccf1dcfe5c5..8644b33876f 100644
--- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java
+++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java
@@ -62,55 +62,55 @@ private static void waferRecipes() {
                 .buildAndRegister();
 
         // Boule cutting
-        CUTTER_RECIPES.recipeBuilder().duration(400).EUt(16)   .input(SILICON_BOULE)   .output(SILICON_WAFER, 16).buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(800).EUt(120)  .input(GLOWSTONE_BOULE) .output(GLOWSTONE_WAFER, 32).buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(1600).EUt(480) .input(NAQUADAH_BOULE)  .output(NAQUADAH_WAFER, 64).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(400).EUt(16).input(SILICON_BOULE).output(SILICON_WAFER, 16).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(800).EUt(120).input(GLOWSTONE_BOULE).output(GLOWSTONE_WAFER, 32).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(1600).EUt(480).input(NAQUADAH_BOULE).output(NAQUADAH_WAFER, 64).buildAndRegister();
         CUTTER_RECIPES.recipeBuilder().duration(2400).EUt(1920).input(NEUTRONIUM_BOULE).output(NEUTRONIUM_WAFER, 64).output(NEUTRONIUM_WAFER, 32).buildAndRegister();
 
         // Wafer engraving
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER)   .notConsumable(craftingLens, Color.Red)      .output(INTEGRATED_LOGIC_CIRCUIT_WAFER)          .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Red)      .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 4) .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER)  .notConsumable(craftingLens, Color.Red)      .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 8) .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50).EUt(7680).input(NEUTRONIUM_WAFER) .notConsumable(craftingLens, Color.Red)      .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 16).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120).input(SILICON_WAFER).notConsumable(craftingLens, Color.Red).output(INTEGRATED_LOGIC_CIRCUIT_WAFER).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Red).output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 4).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.Red).output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 8).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Red).output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 16).buildAndRegister();
 
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER)   .notConsumable(craftingLens, Color.Silver)   .output(RANDOM_ACCESS_MEMORY_WAFER)              .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Silver)   .output(RANDOM_ACCESS_MEMORY_WAFER, 4)     .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER)  .notConsumable(craftingLens, Color.Silver)   .output(RANDOM_ACCESS_MEMORY_WAFER, 8)     .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50) .EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Silver)   .output(RANDOM_ACCESS_MEMORY_WAFER, 16)    .buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120).input(SILICON_WAFER).notConsumable(craftingLens, Color.Silver).output(RANDOM_ACCESS_MEMORY_WAFER).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Silver).output(RANDOM_ACCESS_MEMORY_WAFER, 4).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.Silver).output(RANDOM_ACCESS_MEMORY_WAFER, 8).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Silver).output(RANDOM_ACCESS_MEMORY_WAFER, 16).buildAndRegister();
 
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER)                  .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER)  .notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER, 4)         .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER, 8)         .buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER, 4).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER, 8).buildAndRegister();
 
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Lime)     .output(NOR_MEMORY_CHIP_WAFER)                   .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER)  .notConsumable(craftingLens, Color.Lime)     .output(NOR_MEMORY_CHIP_WAFER, 4)          .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Lime)     .output(NOR_MEMORY_CHIP_WAFER, 8)          .buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Lime).output(NOR_MEMORY_CHIP_WAFER).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.Lime).output(NOR_MEMORY_CHIP_WAFER, 4).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Lime).output(NOR_MEMORY_CHIP_WAFER, 8).buildAndRegister();
 
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER)   .notConsumable(craftingLens, Color.White)    .output(CENTRAL_PROCESSING_UNIT_WAFER)           .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.White)    .output(CENTRAL_PROCESSING_UNIT_WAFER, 4)  .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER)  .notConsumable(craftingLens, Color.White)    .output(CENTRAL_PROCESSING_UNIT_WAFER, 8)  .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50) .EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.White)    .output(CENTRAL_PROCESSING_UNIT_WAFER, 16) .buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120).input(SILICON_WAFER).notConsumable(craftingLens, Color.White).output(CENTRAL_PROCESSING_UNIT_WAFER).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.White).output(CENTRAL_PROCESSING_UNIT_WAFER, 4).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.White).output(CENTRAL_PROCESSING_UNIT_WAFER, 8).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.White).output(CENTRAL_PROCESSING_UNIT_WAFER, 16).buildAndRegister();
 
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Blue)     .output(POWER_INTEGRATED_CIRCUIT_WAFER)          .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER)  .notConsumable(craftingLens, Color.Blue)     .output(POWER_INTEGRATED_CIRCUIT_WAFER, 4) .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Blue)     .output(POWER_INTEGRATED_CIRCUIT_WAFER, 8) .buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Blue).output(POWER_INTEGRATED_CIRCUIT_WAFER).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.Blue).output(POWER_INTEGRATED_CIRCUIT_WAFER, 4).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Blue).output(POWER_INTEGRATED_CIRCUIT_WAFER, 8).buildAndRegister();
 
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER)   .notConsumable(craftingLens, Color.Magenta)  .output(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER).buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Magenta)  .output(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER, 4).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120).input(SILICON_WAFER).notConsumable(craftingLens, Color.Magenta).output(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Magenta).output(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER, 4).buildAndRegister();
 
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER)   .notConsumable(craftingLens, Color.Orange)  .output(LOW_POWER_INTEGRATED_CIRCUIT_WAFER)       .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Orange)  .output(LOW_POWER_INTEGRATED_CIRCUIT_WAFER, 4).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120).input(SILICON_WAFER).notConsumable(craftingLens, Color.Orange).output(LOW_POWER_INTEGRATED_CIRCUIT_WAFER).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Orange).output(LOW_POWER_INTEGRATED_CIRCUIT_WAFER, 4).buildAndRegister();
 
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(300).EUt(120) .input(SILICON_WAFER)   .notConsumable(craftingLens, Color.Orange)   .output(SIMPLE_SYSTEM_ON_CHIP_WAFER)             .buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(300).EUt(120).input(SILICON_WAFER).notConsumable(craftingLens, Color.Orange).output(SIMPLE_SYSTEM_ON_CHIP_WAFER).buildAndRegister();
 
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Yellow)   .output(SYSTEM_ON_CHIP_WAFER)                    .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER)  .notConsumable(craftingLens, Color.Yellow)   .output(SYSTEM_ON_CHIP_WAFER, 4)           .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Yellow)   .output(SYSTEM_ON_CHIP_WAFER, 8)           .buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Yellow).output(SYSTEM_ON_CHIP_WAFER).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.Yellow).output(SYSTEM_ON_CHIP_WAFER, 4).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Yellow).output(SYSTEM_ON_CHIP_WAFER, 8).buildAndRegister();
 
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(NAQUADAH_WAFER)  .notConsumable(craftingLens, Color.Orange)   .output(ADVANCED_SYSTEM_ON_CHIP_WAFER)           .buildAndRegister();
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Orange)   .output(ADVANCED_SYSTEM_ON_CHIP_WAFER, 2)  .buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.Orange).output(ADVANCED_SYSTEM_ON_CHIP_WAFER).buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Orange).output(ADVANCED_SYSTEM_ON_CHIP_WAFER, 2).buildAndRegister();
 
-        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Magenta)  .output(HIGHLY_ADVANCED_SOC_WAFER)               .buildAndRegister();
+        LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Magenta).output(HIGHLY_ADVANCED_SOC_WAFER).buildAndRegister();
 
         // Wafer chemical refining recipes
         CHEMICAL_RECIPES.recipeBuilder().duration(1200).EUt(7680)
@@ -142,21 +142,21 @@ private static void waferRecipes() {
                 .buildAndRegister();
 
         // Wafer cutting
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGHLY_ADVANCED_SOC_WAFER)               .output(HIGHLY_ADVANCED_SOC, 6)               .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(ADVANCED_SYSTEM_ON_CHIP_WAFER)           .output(ADVANCED_SYSTEM_ON_CHIP, 6)           .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(SYSTEM_ON_CHIP_WAFER)                    .output(SYSTEM_ON_CHIP, 6)                    .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64)  .input(SIMPLE_SYSTEM_ON_CHIP_WAFER)             .output(SIMPLE_SYSTEM_ON_CHIP, 6)             .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(96)  .input(RANDOM_ACCESS_MEMORY_WAFER)              .output(RANDOM_ACCESS_MEMORY, 32)             .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(QUBIT_CENTRAL_PROCESSING_UNIT_WAFER)      .output(QUBIT_CENTRAL_PROCESSING_UNIT, 4)      .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER).output(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT, 6).buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(LOW_POWER_INTEGRATED_CIRCUIT_WAFER)      .output(LOW_POWER_INTEGRATED_CIRCUIT, 4)      .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(POWER_INTEGRATED_CIRCUIT_WAFER)          .output(POWER_INTEGRATED_CIRCUIT, 4)          .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGH_POWER_INTEGRATED_CIRCUIT_WAFER)     .output(HIGH_POWER_INTEGRATED_CIRCUIT, 2)     .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NOR_MEMORY_CHIP_WAFER)                   .output(NOR_MEMORY_CHIP, 16)                  .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NAND_MEMORY_CHIP_WAFER)                  .output(NAND_MEMORY_CHIP, 32)                 .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(CENTRAL_PROCESSING_UNIT_WAFER)           .output(CENTRAL_PROCESSING_UNIT, 8)           .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64)  .input(INTEGRATED_LOGIC_CIRCUIT_WAFER)          .output(INTEGRATED_LOGIC_CIRCUIT, 8)          .buildAndRegister();
-        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480). input(NANO_CENTRAL_PROCESSING_UNIT_WAFER)      .output(NANO_CENTRAL_PROCESSING_UNIT, 8)      .buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGHLY_ADVANCED_SOC_WAFER).output(HIGHLY_ADVANCED_SOC, 6).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(ADVANCED_SYSTEM_ON_CHIP_WAFER).output(ADVANCED_SYSTEM_ON_CHIP, 6).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480).input(SYSTEM_ON_CHIP_WAFER).output(SYSTEM_ON_CHIP, 6).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64).input(SIMPLE_SYSTEM_ON_CHIP_WAFER).output(SIMPLE_SYSTEM_ON_CHIP, 6).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(96).input(RANDOM_ACCESS_MEMORY_WAFER).output(RANDOM_ACCESS_MEMORY, 32).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(QUBIT_CENTRAL_PROCESSING_UNIT_WAFER).output(QUBIT_CENTRAL_PROCESSING_UNIT, 4).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(120).input(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER).output(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT, 6).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480).input(LOW_POWER_INTEGRATED_CIRCUIT_WAFER).output(LOW_POWER_INTEGRATED_CIRCUIT, 4).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(POWER_INTEGRATED_CIRCUIT_WAFER).output(POWER_INTEGRATED_CIRCUIT, 4).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGH_POWER_INTEGRATED_CIRCUIT_WAFER).output(HIGH_POWER_INTEGRATED_CIRCUIT, 2).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192).input(NOR_MEMORY_CHIP_WAFER).output(NOR_MEMORY_CHIP, 16).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192).input(NAND_MEMORY_CHIP_WAFER).output(NAND_MEMORY_CHIP, 32).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(120).input(CENTRAL_PROCESSING_UNIT_WAFER).output(CENTRAL_PROCESSING_UNIT, 8).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64).input(INTEGRATED_LOGIC_CIRCUIT_WAFER).output(INTEGRATED_LOGIC_CIRCUIT, 8).buildAndRegister();
+        CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480).input(NANO_CENTRAL_PROCESSING_UNIT_WAFER).output(NANO_CENTRAL_PROCESSING_UNIT, 8).buildAndRegister();
     }
 
     private static void componentRecipes() {
diff --git a/src/main/java/gregtech/loaders/recipe/ComponentRecipes.java b/src/main/java/gregtech/loaders/recipe/ComponentRecipes.java
index 8ecbd1ee8a5..4c5ffe9b105 100644
--- a/src/main/java/gregtech/loaders/recipe/ComponentRecipes.java
+++ b/src/main/java/gregtech/loaders/recipe/ComponentRecipes.java
@@ -4,8 +4,8 @@
 import gregtech.api.recipes.ModHandler;
 import gregtech.api.recipes.RecipeMaps;
 import gregtech.api.unification.material.MarkerMaterials;
-import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.stack.UnificationEntry;
 import gregtech.common.items.MetaItems;
@@ -20,7 +20,7 @@
 
 public class ComponentRecipes {
 
-    private static final FluidStack[] pumpFluids = {Materials.Rubber.getFluid(L), Materials.StyreneButadieneRubber.getFluid((L * 3)/4), Materials.SiliconeRubber.getFluid(L/2) };
+    private static final FluidStack[] pumpFluids = {Materials.Rubber.getFluid(L), Materials.StyreneButadieneRubber.getFluid((L * 3) / 4), Materials.SiliconeRubber.getFluid(L / 2)};
 
     public static void register() {
 
@@ -388,7 +388,7 @@ public static void register() {
                         .duration(100).EUt(30).buildAndRegister();
 
 
-        //Pumps Start---------------------------------------------------------------------------------------------------
+            //Pumps Start---------------------------------------------------------------------------------------------------
             ModHandler.addShapedRecipe(String.format("electric_pump/%s/electric_pump_lv", materialEntry.getKey()), MetaItems.ELECTRIC_PUMP_LV.getStackForm(), "SXR", "dPw", "RMC", 'S', new UnificationEntry(OrePrefix.screw, Materials.Tin), 'X', new UnificationEntry(OrePrefix.rotor, Materials.Tin), 'P', new UnificationEntry(OrePrefix.pipeNormalFluid, Materials.Bronze), 'R', new UnificationEntry(OrePrefix.ring, materialEntry.getValue()), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tin), 'M', MetaItems.ELECTRIC_MOTOR_LV.getStackForm());
             ModHandler.addShapedRecipe(String.format("electric_pump/%s/electric_pump_mv", materialEntry.getKey()), MetaItems.ELECTRIC_PUMP_MV.getStackForm(), "SXR", "dPw", "RMC", 'S', new UnificationEntry(OrePrefix.screw, Materials.Bronze), 'X', new UnificationEntry(OrePrefix.rotor, Materials.Bronze), 'P', new UnificationEntry(OrePrefix.pipeNormalFluid, Materials.Steel), 'R', new UnificationEntry(OrePrefix.ring, materialEntry.getValue()), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper), 'M', MetaItems.ELECTRIC_MOTOR_MV.getStackForm());
             ModHandler.addShapedRecipe(String.format("electric_pump/%s/electric_pump_hv", materialEntry.getKey()), MetaItems.ELECTRIC_PUMP_HV.getStackForm(), "SXR", "dPw", "RMC", 'S', new UnificationEntry(OrePrefix.screw, Materials.Steel), 'X', new UnificationEntry(OrePrefix.rotor, Materials.Steel), 'P', new UnificationEntry(OrePrefix.pipeNormalFluid, Materials.StainlessSteel), 'R', new UnificationEntry(OrePrefix.ring, materialEntry.getValue()), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'M', MetaItems.ELECTRIC_MOTOR_HV.getStackForm());
@@ -437,18 +437,18 @@ public static void register() {
                     .duration(100).EUt(30).buildAndRegister();
 
             if (!materialEntry.getValue().equals(Materials.Rubber))
-            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
-                    .input(OrePrefix.cableGtSingle, Materials.Tungsten)
-                    .input(OrePrefix.pipeNormalFluid, Materials.TungstenSteel)
-                    .input(OrePrefix.screw, Materials.TungstenSteel)
-                    .input(OrePrefix.rotor, Materials.TungstenSteel)
-                    .input(OrePrefix.ring, materialEntry.getValue(), 2)
-                    .inputs(MetaItems.ELECTRIC_MOTOR_IV.getStackForm())
-                    .outputs(MetaItems.ELECTRIC_PUMP_IV.getStackForm())
-                    .duration(100).EUt(30).buildAndRegister();
+                RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
+                        .input(OrePrefix.cableGtSingle, Materials.Tungsten)
+                        .input(OrePrefix.pipeNormalFluid, Materials.TungstenSteel)
+                        .input(OrePrefix.screw, Materials.TungstenSteel)
+                        .input(OrePrefix.rotor, Materials.TungstenSteel)
+                        .input(OrePrefix.ring, materialEntry.getValue(), 2)
+                        .inputs(MetaItems.ELECTRIC_MOTOR_IV.getStackForm())
+                        .outputs(MetaItems.ELECTRIC_PUMP_IV.getStackForm())
+                        .duration(100).EUt(30).buildAndRegister();
         }
 
-        Material[] circuitTiers = new Material[] {MarkerMaterials.Tier.Basic, MarkerMaterials.Tier.Good, MarkerMaterials.Tier.Advanced, MarkerMaterials.Tier.Extreme,
+        Material[] circuitTiers = new Material[]{MarkerMaterials.Tier.Basic, MarkerMaterials.Tier.Good, MarkerMaterials.Tier.Advanced, MarkerMaterials.Tier.Extreme,
                 MarkerMaterials.Tier.Elite, MarkerMaterials.Tier.Master, MarkerMaterials.Tier.Ultimate, MarkerMaterials.Tier.Superconductor};
 
         for (int i = 0; i < FLUID_REGULATORS.length; i++) {
diff --git a/src/main/java/gregtech/loaders/recipe/CraftingComponent.java b/src/main/java/gregtech/loaders/recipe/CraftingComponent.java
index 89bc9291afa..c4f02a998e7 100644
--- a/src/main/java/gregtech/loaders/recipe/CraftingComponent.java
+++ b/src/main/java/gregtech/loaders/recipe/CraftingComponent.java
@@ -158,7 +158,7 @@ public static void initializeComponents() {
         }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1])));
 
         if (GTValues.HT) {
-            HULL.appendIngredients(Stream.of(new Object[][] {
+            HULL.appendIngredients(Stream.of(new Object[][]{
                     {9, MetaTileEntities.HULL[9].getStackForm()},
                     {10, MetaTileEntities.HULL[10].getStackForm()},
                     {11, MetaTileEntities.HULL[11].getStackForm()},
@@ -472,7 +472,6 @@ public static void initializeComponents() {
     }
 
 
-
     public static class Component {
 
         private final Map ingredients;
diff --git a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java
index 5ec958cfc32..68c5ba7d4b1 100644
--- a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java
@@ -66,24 +66,24 @@ private static void loadCraftingRecipes() {
 
         for (MetaValueItem batteryItem : ToolRecipeHandler.batteryItems[0]) {
             ModHandler.addShapedEnergyTransferRecipe("scanner_" + batteryItem.unlocalizedName, MetaItems.SCANNER.getStackForm(),
-                batteryItem::isItemEqual, true,
-                "DGD", "CGC", "SBS",
-                'D', new UnificationEntry(OrePrefix.plate, Materials.Diamond),
-                'G', new UnificationEntry(OrePrefix.paneGlass),
-                'C', new UnificationEntry(OrePrefix.circuit, Tier.Basic),
-                'S', new UnificationEntry(OrePrefix.plate, Materials.Steel),
-                'B', batteryItem.getStackForm());
+                    batteryItem::isItemEqual, true,
+                    "DGD", "CGC", "SBS",
+                    'D', new UnificationEntry(OrePrefix.plate, Materials.Diamond),
+                    'G', new UnificationEntry(OrePrefix.paneGlass),
+                    'C', new UnificationEntry(OrePrefix.circuit, Tier.Basic),
+                    'S', new UnificationEntry(OrePrefix.plate, Materials.Steel),
+                    'B', batteryItem.getStackForm());
         }
 
-        for(Material material : new Material[] {Materials.Lapis, Materials.Lazurite, Materials.Sodalite}) {
+        for (Material material : new Material[]{Materials.Lapis, Materials.Lazurite, Materials.Sodalite}) {
             String recipeName = "lapotron_crystal_" + material.toString();
             ModHandler.addShapedEnergyTransferRecipeWithOverride(recipeName, MetaItems.LAPOTRON_CRYSTAL.getStackForm(),
-                Ingredient.fromStacks(MetaItems.ENERGY_CRYSTAL.getStackForm()), false, false,
-                "XCX", "RER", "XCX",
-                'X', new UnificationEntry(OrePrefix.plate, material),
-                'R', new UnificationEntry(OrePrefix.stick, material),
-                'C', new UnificationEntry(OrePrefix.circuit, Tier.Extreme),
-                'E', MetaItems.ENERGY_CRYSTAL.getStackForm());
+                    Ingredient.fromStacks(MetaItems.ENERGY_CRYSTAL.getStackForm()), false, false,
+                    "XCX", "RER", "XCX",
+                    'X', new UnificationEntry(OrePrefix.plate, material),
+                    'R', new UnificationEntry(OrePrefix.stick, material),
+                    'C', new UnificationEntry(OrePrefix.circuit, Tier.Extreme),
+                    'E', MetaItems.ENERGY_CRYSTAL.getStackForm());
 
             ModHandler.addShapelessRecipe(recipeName + "_alt", MetaItems.LAPOTRON_CRYSTAL.getStackForm(),
                     new UnificationEntry(OrePrefix.gemExquisite, Materials.Sapphire),
@@ -136,46 +136,46 @@ private static void loadCraftingRecipes() {
         ///////////////////////////////////////////////////
         ModHandler.addShapedRecipe("shape/shape_empty", MetaItems.SHAPE_EMPTY.getStackForm(), "hf", "PP", "PP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel));
 
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_bottle", MetaItems.SHAPE_EXTRUDER_BOTTLE.getStackForm(),           "  x", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_RING.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_gear", MetaItems.SHAPE_EXTRUDER_GEAR.getStackForm(),               "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_RING.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_saw", MetaItems.SHAPE_EXTRUDER_SAW.getStackForm(),                 "   ", " S ", "  x", 'S', MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_file", MetaItems.SHAPE_EXTRUDER_FILE.getStackForm(),               "  x", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_hammer", MetaItems.SHAPE_EXTRUDER_HAMMER.getStackForm(),           "  x", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_INGOT.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_hoe", MetaItems.SHAPE_EXTRUDER_HOE.getStackForm(),                 "   ", " Sx", "   ", 'S', MetaItems.SHAPE_EXTRUDER_INGOT.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_axe", MetaItems.SHAPE_EXTRUDER_AXE.getStackForm(),                 "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_shovel", MetaItems.SHAPE_EXTRUDER_SHOVEL.getStackForm(),           " x ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_pickaxe", MetaItems.SHAPE_EXTRUDER_PICKAXE.getStackForm(),         " x ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_INGOT.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_sword", MetaItems.SHAPE_EXTRUDER_SWORD.getStackForm(),             "   ", " Sx", "   ", 'S', MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_block", MetaItems.SHAPE_EXTRUDER_BLOCK.getStackForm(),             "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_INGOT.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_pipe_huge", MetaItems.SHAPE_EXTRUDER_PIPE_HUGE.getStackForm(),     "   ", " S ", "  x", 'S', MetaItems.SHAPE_EXTRUDER_BOLT.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_pipe_large", MetaItems.SHAPE_EXTRUDER_PIPE_LARGE.getStackForm(),   "   ", " Sx", "   ", 'S', MetaItems.SHAPE_EXTRUDER_BOLT.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_bottle", MetaItems.SHAPE_EXTRUDER_BOTTLE.getStackForm(), "  x", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_RING.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_gear", MetaItems.SHAPE_EXTRUDER_GEAR.getStackForm(), "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_RING.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_saw", MetaItems.SHAPE_EXTRUDER_SAW.getStackForm(), "   ", " S ", "  x", 'S', MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_file", MetaItems.SHAPE_EXTRUDER_FILE.getStackForm(), "  x", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_hammer", MetaItems.SHAPE_EXTRUDER_HAMMER.getStackForm(), "  x", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_INGOT.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_hoe", MetaItems.SHAPE_EXTRUDER_HOE.getStackForm(), "   ", " Sx", "   ", 'S', MetaItems.SHAPE_EXTRUDER_INGOT.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_axe", MetaItems.SHAPE_EXTRUDER_AXE.getStackForm(), "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_shovel", MetaItems.SHAPE_EXTRUDER_SHOVEL.getStackForm(), " x ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_pickaxe", MetaItems.SHAPE_EXTRUDER_PICKAXE.getStackForm(), " x ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_INGOT.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_sword", MetaItems.SHAPE_EXTRUDER_SWORD.getStackForm(), "   ", " Sx", "   ", 'S', MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_block", MetaItems.SHAPE_EXTRUDER_BLOCK.getStackForm(), "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_INGOT.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_pipe_huge", MetaItems.SHAPE_EXTRUDER_PIPE_HUGE.getStackForm(), "   ", " S ", "  x", 'S', MetaItems.SHAPE_EXTRUDER_BOLT.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_pipe_large", MetaItems.SHAPE_EXTRUDER_PIPE_LARGE.getStackForm(), "   ", " Sx", "   ", 'S', MetaItems.SHAPE_EXTRUDER_BOLT.getStackForm());
         ModHandler.addShapedRecipe("shape/extruder/shape_extruder_pipe_medium", MetaItems.SHAPE_EXTRUDER_PIPE_MEDIUM.getStackForm(), "  x", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_BOLT.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_pipe_small", MetaItems.SHAPE_EXTRUDER_PIPE_SMALL.getStackForm(),   " x ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_BOLT.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_pipe_tiny", MetaItems.SHAPE_EXTRUDER_PIPE_TINY.getStackForm(),     "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_BOLT.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_wire", MetaItems.SHAPE_EXTRUDER_WIRE.getStackForm(),               " x ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_ROD.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_ingot", MetaItems.SHAPE_EXTRUDER_INGOT.getStackForm(),             "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_cell", MetaItems.SHAPE_EXTRUDER_CELL.getStackForm(),               "   ", " Sx", "   ", 'S', MetaItems.SHAPE_EXTRUDER_RING.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_ring", MetaItems.SHAPE_EXTRUDER_RING.getStackForm(),               "   ", " S ", " x ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_bolt", MetaItems.SHAPE_EXTRUDER_BOLT.getStackForm(),               "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_ROD.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_rod", MetaItems.SHAPE_EXTRUDER_ROD.getStackForm(),                 "   ", " Sx", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_rod_long", MetaItems.SHAPE_EXTRUDER_ROD_LONG.getStackForm(),       "  x", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_ROD.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_plate", MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm(),             "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_FOIL.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_gear_small", MetaItems.SHAPE_EXTRUDER_GEAR_SMALL.getStackForm(),   " x ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_RING.getStackForm());
-        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_foil", MetaItems.SHAPE_EXTRUDER_FOIL.getStackForm(),               "   ", " S ", "  x", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_rotor", MetaItems.SHAPE_MOLD_ROTOR.getStackForm(),           "  h", " S ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_pipe_small", MetaItems.SHAPE_EXTRUDER_PIPE_SMALL.getStackForm(), " x ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_BOLT.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_pipe_tiny", MetaItems.SHAPE_EXTRUDER_PIPE_TINY.getStackForm(), "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_BOLT.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_wire", MetaItems.SHAPE_EXTRUDER_WIRE.getStackForm(), " x ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_ROD.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_ingot", MetaItems.SHAPE_EXTRUDER_INGOT.getStackForm(), "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_cell", MetaItems.SHAPE_EXTRUDER_CELL.getStackForm(), "   ", " Sx", "   ", 'S', MetaItems.SHAPE_EXTRUDER_RING.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_ring", MetaItems.SHAPE_EXTRUDER_RING.getStackForm(), "   ", " S ", " x ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_bolt", MetaItems.SHAPE_EXTRUDER_BOLT.getStackForm(), "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_ROD.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_rod", MetaItems.SHAPE_EXTRUDER_ROD.getStackForm(), "   ", " Sx", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_rod_long", MetaItems.SHAPE_EXTRUDER_ROD_LONG.getStackForm(), "  x", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_ROD.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_plate", MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm(), "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_FOIL.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_gear_small", MetaItems.SHAPE_EXTRUDER_GEAR_SMALL.getStackForm(), " x ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_RING.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_foil", MetaItems.SHAPE_EXTRUDER_FOIL.getStackForm(), "   ", " S ", "  x", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_rotor", MetaItems.SHAPE_MOLD_ROTOR.getStackForm(), "  h", " S ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
         ModHandler.addShapedRecipe("shape/mold/shape_mold_gear_small", MetaItems.SHAPE_MOLD_GEAR_SMALL.getStackForm(), "   ", "   ", "h S", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_name", MetaItems.SHAPE_MOLD_NAME.getStackForm(),             "  S", "   ", "h  ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_anvil", MetaItems.SHAPE_MOLD_ANVIL.getStackForm(),           "  S", "   ", " h ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_cylinder", MetaItems.SHAPE_MOLD_CYLINDER.getStackForm(),     "  S", "   ", "  h", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_nugget", MetaItems.SHAPE_MOLD_NUGGET.getStackForm(),         "S h", "   ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_block", MetaItems.SHAPE_MOLD_BLOCK.getStackForm(),           "   ", "hS ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_ball", MetaItems.SHAPE_MOLD_BALL.getStackForm(),             "   ", " S ", "h  ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_ingot", MetaItems.SHAPE_MOLD_INGOT.getStackForm(),           "   ", " S ", " h ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_bottle", MetaItems.SHAPE_MOLD_BOTTLE.getStackForm(),         "   ", " S ", "  h", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_credit", MetaItems.SHAPE_MOLD_CREDIT.getStackForm(),         "h  ", " S ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_gear", MetaItems.SHAPE_MOLD_GEAR.getStackForm(),             "   ", " Sh", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
-        ModHandler.addShapedRecipe("shape/mold/shape_mold_plate", MetaItems.SHAPE_MOLD_PLATE.getStackForm(),           " h ", " S ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_name", MetaItems.SHAPE_MOLD_NAME.getStackForm(), "  S", "   ", "h  ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_anvil", MetaItems.SHAPE_MOLD_ANVIL.getStackForm(), "  S", "   ", " h ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_cylinder", MetaItems.SHAPE_MOLD_CYLINDER.getStackForm(), "  S", "   ", "  h", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_nugget", MetaItems.SHAPE_MOLD_NUGGET.getStackForm(), "S h", "   ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_block", MetaItems.SHAPE_MOLD_BLOCK.getStackForm(), "   ", "hS ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_ball", MetaItems.SHAPE_MOLD_BALL.getStackForm(), "   ", " S ", "h  ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_ingot", MetaItems.SHAPE_MOLD_INGOT.getStackForm(), "   ", " S ", " h ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_bottle", MetaItems.SHAPE_MOLD_BOTTLE.getStackForm(), "   ", " S ", "  h", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_credit", MetaItems.SHAPE_MOLD_CREDIT.getStackForm(), "h  ", " S ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_gear", MetaItems.SHAPE_MOLD_GEAR.getStackForm(), "   ", " Sh", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/mold/shape_mold_plate", MetaItems.SHAPE_MOLD_PLATE.getStackForm(), " h ", " S ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
 
         ///////////////////////////////////////////////////
         //                   Credits                     //
@@ -185,7 +185,7 @@ private static void loadCraftingRecipes() {
         ModHandler.addShapelessRecipe("credit/credit_copper", MetaItems.CREDIT_COPPER.getStackForm(8), MetaItems.CREDIT_CUPRONICKEL.getStackForm());
         ModHandler.addShapelessRecipe("credit/credit_cupronickel_alt", MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_COPPER.getStackForm(), MetaItems.CREDIT_COPPER.getStackForm(), MetaItems.CREDIT_COPPER.getStackForm(), MetaItems.CREDIT_COPPER.getStackForm(), MetaItems.CREDIT_COPPER.getStackForm(), MetaItems.CREDIT_COPPER.getStackForm(), MetaItems.CREDIT_COPPER.getStackForm(), MetaItems.CREDIT_COPPER.getStackForm());
         ModHandler.addShapelessRecipe("credit/credit_cupronickel", MetaItems.CREDIT_CUPRONICKEL.getStackForm(8), MetaItems.CREDIT_SILVER.getStackForm());
-        ModHandler.addShapelessRecipe("credit/credit_silver_alt", MetaItems.CREDIT_SILVER.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(),  MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm());
+        ModHandler.addShapelessRecipe("credit/credit_silver_alt", MetaItems.CREDIT_SILVER.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm(), MetaItems.CREDIT_CUPRONICKEL.getStackForm());
         ModHandler.addShapelessRecipe("credit/credit_silver", MetaItems.CREDIT_SILVER.getStackForm(8), MetaItems.CREDIT_GOLD.getStackForm());
         ModHandler.addShapelessRecipe("credit/credit_gold_alt", MetaItems.CREDIT_GOLD.getStackForm(), MetaItems.CREDIT_SILVER.getStackForm(), MetaItems.CREDIT_SILVER.getStackForm(), MetaItems.CREDIT_SILVER.getStackForm(), MetaItems.CREDIT_SILVER.getStackForm(), MetaItems.CREDIT_SILVER.getStackForm(), MetaItems.CREDIT_SILVER.getStackForm(), MetaItems.CREDIT_SILVER.getStackForm(), MetaItems.CREDIT_SILVER.getStackForm());
         ModHandler.addShapelessRecipe("credit/credit_gold", MetaItems.CREDIT_GOLD.getStackForm(8), MetaItems.CREDIT_PLATINUM.getStackForm());
diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java
index bf03e66a981..9af147b3bcc 100644
--- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java
@@ -83,110 +83,110 @@ public static void init() {
     private static void registerBendingCompressingRecipes() {
 
         COMPRESSOR_RECIPES.recipeBuilder()
-            .input(OrePrefix.dust, Materials.Fireclay)
-            .outputs(MetaItems.COMPRESSED_FIRECLAY.getStackForm())
-            .duration(100).EUt(2)
-            .buildAndRegister();
+                .input(OrePrefix.dust, Materials.Fireclay)
+                .outputs(MetaItems.COMPRESSED_FIRECLAY.getStackForm())
+                .duration(100).EUt(2)
+                .buildAndRegister();
 
         FORMING_PRESS_RECIPES.recipeBuilder()
-            .duration(100).EUt(16)
-            .notConsumable(MetaItems.SHAPE_MOLD_CREDIT.getStackForm())
-            .input(OrePrefix.plate, Materials.Cupronickel, 1)
-            .outputs(MetaItems.CREDIT_CUPRONICKEL.getStackForm(4))
-            .buildAndRegister();
+                .duration(100).EUt(16)
+                .notConsumable(MetaItems.SHAPE_MOLD_CREDIT.getStackForm())
+                .input(OrePrefix.plate, Materials.Cupronickel, 1)
+                .outputs(MetaItems.CREDIT_CUPRONICKEL.getStackForm(4))
+                .buildAndRegister();
 
         FORMING_PRESS_RECIPES.recipeBuilder()
-            .duration(100).EUt(16)
-            .notConsumable(MetaItems.SHAPE_MOLD_CREDIT.getStackForm())
-            .input(OrePrefix.plate, Materials.Brass, 1)
-            .outputs(MetaItems.COIN_DOGE.getStackForm(4))
-            .buildAndRegister();
+                .duration(100).EUt(16)
+                .notConsumable(MetaItems.SHAPE_MOLD_CREDIT.getStackForm())
+                .input(OrePrefix.plate, Materials.Brass, 1)
+                .outputs(MetaItems.COIN_DOGE.getStackForm(4))
+                .buildAndRegister();
 
         for (MetaItem.MetaValueItem shapeMold : SHAPE_MOLDS) {
             FORMING_PRESS_RECIPES.recipeBuilder()
-                .duration(120).EUt(22)
-                .notConsumable(shapeMold.getStackForm())
-                .inputs(MetaItems.SHAPE_EMPTY.getStackForm())
-                .outputs(shapeMold.getStackForm())
-                .buildAndRegister();
+                    .duration(120).EUt(22)
+                    .notConsumable(shapeMold.getStackForm())
+                    .inputs(MetaItems.SHAPE_EMPTY.getStackForm())
+                    .outputs(shapeMold.getStackForm())
+                    .buildAndRegister();
         }
 
         for (MetaItem.MetaValueItem shapeExtruder : SHAPE_EXTRUDERS) {
             FORMING_PRESS_RECIPES.recipeBuilder()
-                .duration(120).EUt(22)
-                .notConsumable(shapeExtruder.getStackForm())
-                .inputs(MetaItems.SHAPE_EMPTY.getStackForm())
-                .outputs(shapeExtruder.getStackForm())
-                .buildAndRegister();
+                    .duration(120).EUt(22)
+                    .notConsumable(shapeExtruder.getStackForm())
+                    .inputs(MetaItems.SHAPE_EMPTY.getStackForm())
+                    .outputs(shapeExtruder.getStackForm())
+                    .buildAndRegister();
         }
 
         BENDER_RECIPES.recipeBuilder()
-            .circuitMeta(4)
-            .input(OrePrefix.plate, Materials.Steel, 4)
-            .outputs(MetaItems.SHAPE_EMPTY.getStackForm())
-            .duration(180).EUt(12)
-            .buildAndRegister();
+                .circuitMeta(4)
+                .input(OrePrefix.plate, Materials.Steel, 4)
+                .outputs(MetaItems.SHAPE_EMPTY.getStackForm())
+                .duration(180).EUt(12)
+                .buildAndRegister();
 
         BENDER_RECIPES.recipeBuilder()
-            .circuitMeta(12)
-            .input(OrePrefix.plate, Materials.Tin, 2)
-            .outputs(MetaItems.FLUID_CELL.getStackForm())
-            .duration(200).EUt(8)
-            .buildAndRegister();
+                .circuitMeta(12)
+                .input(OrePrefix.plate, Materials.Tin, 2)
+                .outputs(MetaItems.FLUID_CELL.getStackForm())
+                .duration(200).EUt(8)
+                .buildAndRegister();
 
         BENDER_RECIPES.recipeBuilder()
-            .circuitMeta(12)
-            .input(OrePrefix.plate, Materials.Steel)
-            .outputs(MetaItems.FLUID_CELL.getStackForm())
-            .duration(100).EUt(8)
-            .buildAndRegister();
+                .circuitMeta(12)
+                .input(OrePrefix.plate, Materials.Steel)
+                .outputs(MetaItems.FLUID_CELL.getStackForm())
+                .duration(100).EUt(8)
+                .buildAndRegister();
 
         BENDER_RECIPES.recipeBuilder()
-            .circuitMeta(12)
-            .input(OrePrefix.plate, Polytetrafluoroethylene)
-            .outputs(MetaItems.FLUID_CELL.getStackForm(4))
-            .duration(100).EUt(8)
-            .buildAndRegister();
+                .circuitMeta(12)
+                .input(OrePrefix.plate, Polytetrafluoroethylene)
+                .outputs(MetaItems.FLUID_CELL.getStackForm(4))
+                .duration(100).EUt(8)
+                .buildAndRegister();
 
         BENDER_RECIPES.recipeBuilder()
-            .circuitMeta(12)
-            .input(OrePrefix.plate, Polybenzimidazole)
-            .outputs(MetaItems.FLUID_CELL.getStackForm(16))
-            .duration(100).EUt(8)
-            .buildAndRegister();
+                .circuitMeta(12)
+                .input(OrePrefix.plate, Polybenzimidazole)
+                .outputs(MetaItems.FLUID_CELL.getStackForm(16))
+                .duration(100).EUt(8)
+                .buildAndRegister();
 
         EXTRUDER_RECIPES.recipeBuilder()
-            .notConsumable(MetaItems.SHAPE_EXTRUDER_CELL)
-            .input(OrePrefix.ingot, Materials.Tin, 2)
-            .outputs(MetaItems.FLUID_CELL.getStackForm())
-            .duration(128).EUt(30)
-            .buildAndRegister();
+                .notConsumable(MetaItems.SHAPE_EXTRUDER_CELL)
+                .input(OrePrefix.ingot, Materials.Tin, 2)
+                .outputs(MetaItems.FLUID_CELL.getStackForm())
+                .duration(128).EUt(30)
+                .buildAndRegister();
 
         EXTRUDER_RECIPES.recipeBuilder()
-            .notConsumable(MetaItems.SHAPE_EXTRUDER_CELL)
-            .input(OrePrefix.ingot, Materials.Steel)
-            .outputs(MetaItems.FLUID_CELL.getStackForm())
-            .duration(128).EUt(30)
-            .buildAndRegister();
+                .notConsumable(MetaItems.SHAPE_EXTRUDER_CELL)
+                .input(OrePrefix.ingot, Materials.Steel)
+                .outputs(MetaItems.FLUID_CELL.getStackForm())
+                .duration(128).EUt(30)
+                .buildAndRegister();
 
         EXTRUDER_RECIPES.recipeBuilder()
-            .notConsumable(MetaItems.SHAPE_EXTRUDER_CELL)
-            .input(OrePrefix.ingot, Polytetrafluoroethylene)
-            .outputs(MetaItems.FLUID_CELL.getStackForm(4))
-            .duration(128).EUt(30)
-            .buildAndRegister();
+                .notConsumable(MetaItems.SHAPE_EXTRUDER_CELL)
+                .input(OrePrefix.ingot, Polytetrafluoroethylene)
+                .outputs(MetaItems.FLUID_CELL.getStackForm(4))
+                .duration(128).EUt(30)
+                .buildAndRegister();
 
         EXTRUDER_RECIPES.recipeBuilder()
-            .notConsumable(MetaItems.SHAPE_EXTRUDER_CELL)
-            .input(OrePrefix.ingot, Polybenzimidazole)
-            .outputs(MetaItems.FLUID_CELL.getStackForm(16))
-            .duration(128).EUt(30)
-            .buildAndRegister();
+                .notConsumable(MetaItems.SHAPE_EXTRUDER_CELL)
+                .input(OrePrefix.ingot, Polybenzimidazole)
+                .outputs(MetaItems.FLUID_CELL.getStackForm(16))
+                .duration(128).EUt(30)
+                .buildAndRegister();
 
         COMPRESSOR_RECIPES.recipeBuilder()
-            .input(OrePrefix.dust, Materials.NetherQuartz)
-            .output(OrePrefix.plate, Materials.NetherQuartz)
-            .duration(400).EUt(2).buildAndRegister();
+                .input(OrePrefix.dust, Materials.NetherQuartz)
+                .output(OrePrefix.plate, Materials.NetherQuartz)
+                .duration(400).EUt(2).buildAndRegister();
 
         COMPRESSOR_RECIPES.recipeBuilder()
                 .input(OrePrefix.dust, Materials.CertusQuartz)
@@ -238,61 +238,61 @@ private static void registerMixingCrystallizationRecipes() {
                 .buildAndRegister();
 
         RecipeMaps.MIXER_RECIPES.recipeBuilder()
-            .input(OrePrefix.dust, Materials.Stone, 1)
-            .fluidInputs(Materials.Lubricant.getFluid(20), Materials.Water.getFluid(4980))
-            .fluidOutputs(Materials.DrillingFluid.getFluid(5000))
-            .duration(64).EUt(16)
-            .buildAndRegister();
+                .input(OrePrefix.dust, Materials.Stone, 1)
+                .fluidInputs(Materials.Lubricant.getFluid(20), Materials.Water.getFluid(4980))
+                .fluidOutputs(Materials.DrillingFluid.getFluid(5000))
+                .duration(64).EUt(16)
+                .buildAndRegister();
 
         RecipeMaps.MIXER_RECIPES.recipeBuilder()
-            .input(OrePrefix.dust, Materials.Clay, 1)
-            .input(OrePrefix.dust, Materials.Stone, 3)
-            .fluidInputs(Materials.Water.getFluid(500))
-            .fluidOutputs(Materials.Concrete.getFluid(576))
-            .duration(20).EUt(16)
-            .buildAndRegister();
+                .input(OrePrefix.dust, Materials.Clay, 1)
+                .input(OrePrefix.dust, Materials.Stone, 3)
+                .fluidInputs(Materials.Water.getFluid(500))
+                .fluidOutputs(Materials.Concrete.getFluid(576))
+                .duration(20).EUt(16)
+                .buildAndRegister();
 
         RecipeMaps.MIXER_RECIPES.recipeBuilder()
-            .inputs(MetaBlocks.CONCRETE.getItemVariant(ConcreteVariant.LIGHT_CONCRETE, ChiselingVariant.NORMAL))
-            .fluidInputs(Materials.Water.getFluid(144))
-            .outputs(MetaBlocks.CONCRETE.getItemVariant(ConcreteVariant.DARK_CONCRETE, ChiselingVariant.NORMAL))
-            .duration(12).EUt(4)
-            .buildAndRegister();
+                .inputs(MetaBlocks.CONCRETE.getItemVariant(ConcreteVariant.LIGHT_CONCRETE, ChiselingVariant.NORMAL))
+                .fluidInputs(Materials.Water.getFluid(144))
+                .outputs(MetaBlocks.CONCRETE.getItemVariant(ConcreteVariant.DARK_CONCRETE, ChiselingVariant.NORMAL))
+                .duration(12).EUt(4)
+                .buildAndRegister();
 
         RecipeMaps.MIXER_RECIPES.recipeBuilder()
-            .duration(64).EUt(16)
-            .fluidInputs(Materials.Water.getFluid(1000))
-            .input("sand", 2)
-            .input(OrePrefix.dust, Materials.Stone, 6)
-            .input(OrePrefix.dust, Materials.Flint)
-            .fluidOutputs(Materials.ConstructionFoam.getFluid(1000))
-            .buildAndRegister();
+                .duration(64).EUt(16)
+                .fluidInputs(Materials.Water.getFluid(1000))
+                .input("sand", 2)
+                .input(OrePrefix.dust, Materials.Stone, 6)
+                .input(OrePrefix.dust, Materials.Flint)
+                .fluidOutputs(Materials.ConstructionFoam.getFluid(1000))
+                .buildAndRegister();
 
         RecipeMaps.MIXER_RECIPES.recipeBuilder()
-            .duration(1200).EUt(16)
-            .input(OrePrefix.dust, Materials.Ruby, 9)
-            .input(OrePrefix.dust, Materials.Redstone, 9)
-            .outputs(MetaItems.ENERGIUM_DUST.getStackForm(9))
-            .buildAndRegister();
+                .duration(1200).EUt(16)
+                .input(OrePrefix.dust, Materials.Ruby, 9)
+                .input(OrePrefix.dust, Materials.Redstone, 9)
+                .outputs(MetaItems.ENERGIUM_DUST.getStackForm(9))
+                .buildAndRegister();
 
         RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().inputs(MetaItems.ENERGIUM_DUST.getStackForm(9))
-            .fluidInputs(Materials.Water.getFluid(1800))
-            .outputs(MetaItems.ENERGY_CRYSTAL.getStackForm())
-            .duration(2000).EUt(120)
-            .buildAndRegister();
+                .fluidInputs(Materials.Water.getFluid(1800))
+                .outputs(MetaItems.ENERGY_CRYSTAL.getStackForm())
+                .duration(2000).EUt(120)
+                .buildAndRegister();
 
         RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder()
-            .inputs(MetaItems.ENERGIUM_DUST.getStackForm(9))
-            .fluidInputs(Materials.DistilledWater.getFluid(1800))
-            .outputs(MetaItems.ENERGY_CRYSTAL.getStackForm())
-            .duration(1500).EUt(120)
-            .buildAndRegister();
+                .inputs(MetaItems.ENERGIUM_DUST.getStackForm(9))
+                .fluidInputs(Materials.DistilledWater.getFluid(1800))
+                .outputs(MetaItems.ENERGY_CRYSTAL.getStackForm())
+                .duration(1500).EUt(120)
+                .buildAndRegister();
 
         RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder()
-            .input(OrePrefix.dust, Materials.SiliconDioxide)
-            .fluidInputs(Materials.DistilledWater.getFluid(200))
-            .chancedOutput(OreDictUnifier.get(OrePrefix.gem, Materials.Quartzite), 1000, 1000)
-            .duration(1500).EUt(24).buildAndRegister();
+                .input(OrePrefix.dust, Materials.SiliconDioxide)
+                .fluidInputs(Materials.DistilledWater.getFluid(200))
+                .chancedOutput(OreDictUnifier.get(OrePrefix.gem, Materials.Quartzite), 1000, 1000)
+                .duration(1500).EUt(24).buildAndRegister();
 
         //todo find UU-Matter replacement
 //        RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder()
@@ -302,17 +302,17 @@ private static void registerMixingCrystallizationRecipes() {
 //            .duration(72000).EUt(480).buildAndRegister();
 
         RecipeMaps.MIXER_RECIPES.recipeBuilder()
-            .input(OrePrefix.crushedPurified, Materials.Sphalerite)
-            .input(OrePrefix.crushedPurified, Materials.Galena)
-            .fluidInputs(Materials.SulfuricAcid.getFluid(4000))
-            .fluidOutputs(Materials.IndiumConcentrate.getFluid(1000))
-            .duration(60).EUt(150).buildAndRegister();
+                .input(OrePrefix.crushedPurified, Materials.Sphalerite)
+                .input(OrePrefix.crushedPurified, Materials.Galena)
+                .fluidInputs(Materials.SulfuricAcid.getFluid(4000))
+                .fluidOutputs(Materials.IndiumConcentrate.getFluid(1000))
+                .duration(60).EUt(150).buildAndRegister();
 
         RecipeMaps.MIXER_RECIPES.recipeBuilder()
-            .input(OrePrefix.dust, Materials.Sodium)
-            .input(OrePrefix.dust, Materials.Potassium)
-            .fluidOutputs(Materials.SodiumPotassium.getFluid(1000))
-            .duration(400).EUt(30).buildAndRegister();
+                .input(OrePrefix.dust, Materials.Sodium)
+                .input(OrePrefix.dust, Materials.Potassium)
+                .fluidOutputs(Materials.SodiumPotassium.getFluid(1000))
+                .duration(400).EUt(30).buildAndRegister();
 
     }
 
@@ -322,56 +322,56 @@ private static void registerOrganicRecyclingRecipes() {
     }
 
     private static final MaterialStack[][] alloySmelterList = {
-        {new MaterialStack(Materials.Copper, 3L), new MaterialStack(Materials.Tin, 1), new MaterialStack(Materials.Bronze, 4L)},
-        {new MaterialStack(Materials.Copper, 3L), new MaterialStack(Materials.Zinc, 1), new MaterialStack(Materials.Brass, 4L)},
-        {new MaterialStack(Materials.Copper, 1), new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Cupronickel, 2L)},
-        {new MaterialStack(Materials.Copper, 1), new MaterialStack(Materials.Redstone, 4L), new MaterialStack(Materials.RedAlloy, 1)},
-        {new MaterialStack(Materials.AnnealedCopper, 3L), new MaterialStack(Materials.Tin, 1), new MaterialStack(Materials.Bronze, 4L)},
-        {new MaterialStack(Materials.AnnealedCopper, 3L), new MaterialStack(Materials.Zinc, 1), new MaterialStack(Materials.Brass, 4L)},
-        {new MaterialStack(Materials.AnnealedCopper, 1), new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Cupronickel, 2L)},
-        {new MaterialStack(Materials.AnnealedCopper, 1), new MaterialStack(Materials.Redstone, 4L), new MaterialStack(Materials.RedAlloy, 1)},
-        {new MaterialStack(Materials.Iron, 1), new MaterialStack(Materials.Tin, 1), new MaterialStack(Materials.TinAlloy, 2L)},
-        {new MaterialStack(Materials.WroughtIron, 1), new MaterialStack(Materials.Tin, 1), new MaterialStack(Materials.TinAlloy, 2L)},
-        {new MaterialStack(Materials.Iron, 2L), new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Invar, 3L)},
-        {new MaterialStack(Materials.WroughtIron, 2L), new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Invar, 3L)},
-        {new MaterialStack(Materials.Tin, 9L), new MaterialStack(Materials.Antimony, 1), new MaterialStack(Materials.SolderingAlloy, 10L)},
-        {new MaterialStack(Materials.Lead, 4L), new MaterialStack(Materials.Antimony, 1), new MaterialStack(Materials.BatteryAlloy, 5L)},
-        {new MaterialStack(Materials.Gold, 1), new MaterialStack(Materials.Silver, 1), new MaterialStack(Materials.Electrum, 2L)},
-        {new MaterialStack(Materials.Magnesium, 1), new MaterialStack(Materials.Aluminium, 2L), new MaterialStack(Materials.Magnalium, 3L)}};
+            {new MaterialStack(Materials.Copper, 3L), new MaterialStack(Materials.Tin, 1), new MaterialStack(Materials.Bronze, 4L)},
+            {new MaterialStack(Materials.Copper, 3L), new MaterialStack(Materials.Zinc, 1), new MaterialStack(Materials.Brass, 4L)},
+            {new MaterialStack(Materials.Copper, 1), new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Cupronickel, 2L)},
+            {new MaterialStack(Materials.Copper, 1), new MaterialStack(Materials.Redstone, 4L), new MaterialStack(Materials.RedAlloy, 1)},
+            {new MaterialStack(Materials.AnnealedCopper, 3L), new MaterialStack(Materials.Tin, 1), new MaterialStack(Materials.Bronze, 4L)},
+            {new MaterialStack(Materials.AnnealedCopper, 3L), new MaterialStack(Materials.Zinc, 1), new MaterialStack(Materials.Brass, 4L)},
+            {new MaterialStack(Materials.AnnealedCopper, 1), new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Cupronickel, 2L)},
+            {new MaterialStack(Materials.AnnealedCopper, 1), new MaterialStack(Materials.Redstone, 4L), new MaterialStack(Materials.RedAlloy, 1)},
+            {new MaterialStack(Materials.Iron, 1), new MaterialStack(Materials.Tin, 1), new MaterialStack(Materials.TinAlloy, 2L)},
+            {new MaterialStack(Materials.WroughtIron, 1), new MaterialStack(Materials.Tin, 1), new MaterialStack(Materials.TinAlloy, 2L)},
+            {new MaterialStack(Materials.Iron, 2L), new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Invar, 3L)},
+            {new MaterialStack(Materials.WroughtIron, 2L), new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Invar, 3L)},
+            {new MaterialStack(Materials.Tin, 9L), new MaterialStack(Materials.Antimony, 1), new MaterialStack(Materials.SolderingAlloy, 10L)},
+            {new MaterialStack(Materials.Lead, 4L), new MaterialStack(Materials.Antimony, 1), new MaterialStack(Materials.BatteryAlloy, 5L)},
+            {new MaterialStack(Materials.Gold, 1), new MaterialStack(Materials.Silver, 1), new MaterialStack(Materials.Electrum, 2L)},
+            {new MaterialStack(Materials.Magnesium, 1), new MaterialStack(Materials.Aluminium, 2L), new MaterialStack(Materials.Magnalium, 3L)}};
 
     private static void registerAlloyRecipes() {
         for (MaterialStack[] stack : alloySmelterList) {
             if (stack[0].material.hasProperty(PropertyKey.INGOT)) {
                 RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder()
-                    .duration((int) stack[2].amount * 50).EUt(16)
-                    .input(OrePrefix.ingot, stack[0].material, (int) stack[0].amount)
-                    .input(OrePrefix.dust, stack[1].material, (int) stack[1].amount)
-                    .outputs(OreDictUnifier.get(OrePrefix.ingot, stack[2].material, (int) stack[2].amount))
-                    .buildAndRegister();
+                        .duration((int) stack[2].amount * 50).EUt(16)
+                        .input(OrePrefix.ingot, stack[0].material, (int) stack[0].amount)
+                        .input(OrePrefix.dust, stack[1].material, (int) stack[1].amount)
+                        .outputs(OreDictUnifier.get(OrePrefix.ingot, stack[2].material, (int) stack[2].amount))
+                        .buildAndRegister();
             }
             if (stack[1].material.hasProperty(PropertyKey.INGOT)) {
                 RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder()
-                    .duration((int) stack[2].amount * 50).EUt(16)
-                    .input(OrePrefix.dust, stack[0].material, (int) stack[0].amount)
-                    .input(OrePrefix.ingot, stack[1].material, (int) stack[1].amount)
-                    .outputs(OreDictUnifier.get(OrePrefix.ingot, stack[2].material, (int) stack[2].amount))
-                    .buildAndRegister();
+                        .duration((int) stack[2].amount * 50).EUt(16)
+                        .input(OrePrefix.dust, stack[0].material, (int) stack[0].amount)
+                        .input(OrePrefix.ingot, stack[1].material, (int) stack[1].amount)
+                        .outputs(OreDictUnifier.get(OrePrefix.ingot, stack[2].material, (int) stack[2].amount))
+                        .buildAndRegister();
             }
             if (stack[0].material.hasProperty(PropertyKey.INGOT)
                     && stack[1].material.hasProperty(PropertyKey.INGOT)) {
                 RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder()
+                        .duration((int) stack[2].amount * 50).EUt(16)
+                        .input(OrePrefix.ingot, stack[0].material, (int) stack[0].amount)
+                        .input(OrePrefix.ingot, stack[1].material, (int) stack[1].amount)
+                        .outputs(OreDictUnifier.get(OrePrefix.ingot, stack[2].material, (int) stack[2].amount))
+                        .buildAndRegister();
+            }
+            RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder()
                     .duration((int) stack[2].amount * 50).EUt(16)
-                    .input(OrePrefix.ingot, stack[0].material, (int) stack[0].amount)
-                    .input(OrePrefix.ingot, stack[1].material, (int) stack[1].amount)
+                    .input(OrePrefix.dust, stack[0].material, (int) stack[0].amount)
+                    .input(OrePrefix.dust, stack[1].material, (int) stack[1].amount)
                     .outputs(OreDictUnifier.get(OrePrefix.ingot, stack[2].material, (int) stack[2].amount))
                     .buildAndRegister();
-            }
-            RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder()
-                .duration((int) stack[2].amount * 50).EUt(16)
-                .input(OrePrefix.dust, stack[0].material, (int) stack[0].amount)
-                .input(OrePrefix.dust, stack[1].material, (int) stack[1].amount)
-                .outputs(OreDictUnifier.get(OrePrefix.ingot, stack[2].material, (int) stack[2].amount))
-                .buildAndRegister();
         }
 
         COMPRESSOR_RECIPES.recipeBuilder().inputs(MetaItems.INGOT_MIXED_METAL.getStackForm()).outputs(MetaItems.ADVANCED_ALLOY_PLATE.getStackForm()).duration(300).EUt(2).buildAndRegister();
@@ -390,11 +390,11 @@ private static void registerAlloyRecipes() {
     private static void registerAssemblerRecipes() {
         for (EnumDyeColor dyeColor : EnumDyeColor.values()) {
             CANNER_RECIPES.recipeBuilder()
-                .inputs(MetaItems.SPRAY_EMPTY.getStackForm())
-                .input(getOrdictColorName(dyeColor), 1)
-                .outputs(MetaItems.SPRAY_CAN_DYES[dyeColor.getMetadata()].getStackForm())
-                .EUt(8).duration(200)
-                .buildAndRegister();
+                    .inputs(MetaItems.SPRAY_EMPTY.getStackForm())
+                    .input(getOrdictColorName(dyeColor), 1)
+                    .outputs(MetaItems.SPRAY_CAN_DYES[dyeColor.getMetadata()].getStackForm())
+                    .EUt(8).duration(200)
+                    .buildAndRegister();
         }
 
         //todo fix
@@ -426,7 +426,7 @@ private static void registerAssemblerRecipes() {
                     .EUt(16).duration(800)
                     .buildAndRegister();
 
-            for (FluidStack solder : new FluidStack[]{Tin.getFluid(L), SolderingAlloy.getFluid(L/2)}) {
+            for (FluidStack solder : new FluidStack[]{Tin.getFluid(L), SolderingAlloy.getFluid(L / 2)}) {
                 RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
                         .inputs(new ItemStack(Blocks.LEVER))
                         .input(OrePrefix.plate, material)
@@ -747,106 +747,106 @@ private static void registerCutterRecipes() {
     private static void registerRecyclingRecipes() {
 
         MACERATOR_RECIPES.recipeBuilder()
-            .input(stone, Endstone)
-            .output(dust, Endstone)
-            .chancedOutput(dustTiny, Tungstate, 1200, 280)
-            .buildAndRegister();
+                .input(stone, Endstone)
+                .output(dust, Endstone)
+                .chancedOutput(dustTiny, Tungstate, 1200, 280)
+                .buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .input(stone, Netherrack)
-            .output(dust, Netherrack)
-            .chancedOutput(nugget, Gold, 500, 120)
-            .buildAndRegister();
+                .input(stone, Netherrack)
+                .output(dust, Netherrack)
+                .chancedOutput(nugget, Gold, 500, 120)
+                .buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .input(stone, Soapstone)
-            .output(dustImpure, Talc)
-            .chancedOutput(dustTiny, Chromite, 1000, 280)
-            .buildAndRegister();
+                .input(stone, Soapstone)
+                .output(dustImpure, Talc)
+                .chancedOutput(dustTiny, Chromite, 1000, 280)
+                .buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .input(stone, Redrock)
-            .output(dust, Redrock)
-            .chancedOutput(dust, Redrock, 1000, 380)
-            .buildAndRegister();
+                .input(stone, Redrock)
+                .output(dust, Redrock)
+                .chancedOutput(dust, Redrock, 1000, 380)
+                .buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .input(stone, Marble)
-            .output(dust, Marble)
-            .chancedOutput(dust, Marble, 1000, 380)
-            .buildAndRegister();
+                .input(stone, Marble)
+                .output(dust, Marble)
+                .chancedOutput(dust, Marble, 1000, 380)
+                .buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .input(stone, Basalt)
-            .output(dust, Basalt)
-            .chancedOutput(dust, Basalt, 1000, 380)
-            .buildAndRegister();
+                .input(stone, Basalt)
+                .output(dust, Basalt)
+                .chancedOutput(dust, Basalt, 1000, 380)
+                .buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .input(stone, GraniteBlack)
-            .output(dust, GraniteBlack)
-            .chancedOutput(dust, Thorium, 100, 40)
-            .buildAndRegister();
+                .input(stone, GraniteBlack)
+                .output(dust, GraniteBlack)
+                .chancedOutput(dust, Thorium, 100, 40)
+                .buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .input(stone, GraniteRed)
-            .output(dust, GraniteRed)
-            .chancedOutput(dustSmall, Uranium238, 100, 40)
-            .buildAndRegister();
+                .input(stone, GraniteRed)
+                .output(dust, GraniteRed)
+                .chancedOutput(dustSmall, Uranium238, 100, 40)
+                .buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .input(stone, Andesite)
-            .output(dust, Andesite)
-            .chancedOutput(dustSmall, Stone, 100, 40)
-            .buildAndRegister();
+                .input(stone, Andesite)
+                .output(dust, Andesite)
+                .chancedOutput(dustSmall, Stone, 100, 40)
+                .buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .input(stone, Diorite)
-            .output(dust, Diorite)
-            .chancedOutput(dustSmall, Stone, 100, 40)
-            .buildAndRegister();
+                .input(stone, Diorite)
+                .output(dust, Diorite)
+                .chancedOutput(dustSmall, Stone, 100, 40)
+                .buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .input(stone, Granite)
-            .output(dust, Granite)
-            .chancedOutput(dustSmall, Stone, 100, 40)
-            .buildAndRegister();
+                .input(stone, Granite)
+                .output(dust, Granite)
+                .chancedOutput(dustSmall, Stone, 100, 40)
+                .buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.PORKCHOP))
-            .output(dustSmall, Meat, 6)
-            .output(dustTiny, Bone)
-            .duration(102).EUt(4).buildAndRegister();
+                .inputs(new ItemStack(Items.PORKCHOP))
+                .output(dustSmall, Meat, 6)
+                .output(dustTiny, Bone)
+                .duration(102).EUt(4).buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.FISH, 1, GTValues.W))
-            .output(dustSmall, Meat, 6)
-            .output(dustTiny, Bone)
-            .duration(102).EUt(4).buildAndRegister();
+                .inputs(new ItemStack(Items.FISH, 1, GTValues.W))
+                .output(dustSmall, Meat, 6)
+                .output(dustTiny, Bone)
+                .duration(102).EUt(4).buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.CHICKEN))
-            .output(dust, Meat)
-            .output(dustTiny, Bone)
-            .duration(102).EUt(4).buildAndRegister();
+                .inputs(new ItemStack(Items.CHICKEN))
+                .output(dust, Meat)
+                .output(dustTiny, Bone)
+                .duration(102).EUt(4).buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.BEEF))
-            .output(dustSmall, Meat, 6)
-            .output(dustTiny, Bone)
-            .duration(102).EUt(4).buildAndRegister();
+                .inputs(new ItemStack(Items.BEEF))
+                .output(dustSmall, Meat, 6)
+                .output(dustTiny, Bone)
+                .duration(102).EUt(4).buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.RABBIT))
-            .output(dustSmall, Meat, 6)
-            .output(dustTiny, Bone)
-            .duration(102).EUt(4).buildAndRegister();
+                .inputs(new ItemStack(Items.RABBIT))
+                .output(dustSmall, Meat, 6)
+                .output(dustTiny, Bone)
+                .duration(102).EUt(4).buildAndRegister();
 
         MACERATOR_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.MUTTON))
-            .output(dust, Meat)
-            .output(dustTiny, Bone)
-            .duration(102).EUt(4).buildAndRegister();
+                .inputs(new ItemStack(Items.MUTTON))
+                .output(dust, Meat)
+                .output(dustTiny, Bone)
+                .duration(102).EUt(4).buildAndRegister();
 
 
     }
@@ -867,9 +867,9 @@ private static void registerFluidRecipes() {
 
     private static  & IStringSerializable> void registerBrickRecipe(StoneBlock stoneBlock, T normalVariant, T brickVariant) {
         ModHandler.addShapedRecipe(stoneBlock.getRegistryName().getNamespace() + "_" + normalVariant + "_bricks",
-            stoneBlock.getItemVariant(brickVariant, ChiselingVariant.NORMAL, 4),
-            "XX", "XX", 'X',
-            stoneBlock.getItemVariant(normalVariant, ChiselingVariant.NORMAL));
+                stoneBlock.getItemVariant(brickVariant, ChiselingVariant.NORMAL, 4),
+                "XX", "XX", 'X',
+                stoneBlock.getItemVariant(normalVariant, ChiselingVariant.NORMAL));
     }
 
     private static  & IStringSerializable> void registerChiselingRecipes(StoneBlock stoneBlock) {
@@ -878,22 +878,23 @@ private static  & IStringSerializable> void registerChiselingR
             if (!isBricksVariant) {
                 ModHandler.addSmeltingRecipe(stoneBlock.getItemVariant(variant, ChiselingVariant.CRACKED), stoneBlock.getItemVariant(variant, ChiselingVariant.NORMAL));
                 FORGE_HAMMER_RECIPES.recipeBuilder().duration(12).EUt(4)
-                    .inputs(stoneBlock.getItemVariant(variant, ChiselingVariant.NORMAL))
-                    .outputs(stoneBlock.getItemVariant(variant, ChiselingVariant.CRACKED))
-                    .buildAndRegister();
+                        .inputs(stoneBlock.getItemVariant(variant, ChiselingVariant.NORMAL))
+                        .outputs(stoneBlock.getItemVariant(variant, ChiselingVariant.CRACKED))
+                        .buildAndRegister();
             } else {
                 ModHandler.addSmeltingRecipe(stoneBlock.getItemVariant(variant, ChiselingVariant.NORMAL), stoneBlock.getItemVariant(variant, ChiselingVariant.CRACKED));
             }
             CHEMICAL_BATH_RECIPES.recipeBuilder().duration(12).EUt(4)
-                .inputs(stoneBlock.getItemVariant(variant, !isBricksVariant ? ChiselingVariant.CRACKED : ChiselingVariant.NORMAL))
-                .fluidInputs(Materials.Water.getFluid(144))
-                .outputs(stoneBlock.getItemVariant(variant, ChiselingVariant.MOSSY))
-                .buildAndRegister();
+                    .inputs(stoneBlock.getItemVariant(variant, !isBricksVariant ? ChiselingVariant.CRACKED : ChiselingVariant.NORMAL))
+                    .fluidInputs(Materials.Water.getFluid(144))
+                    .outputs(stoneBlock.getItemVariant(variant, ChiselingVariant.MOSSY))
+                    .buildAndRegister();
             ModHandler.addShapelessRecipe(stoneBlock.getRegistryName().getPath() + "_chiseling_" + variant,
-                stoneBlock.getItemVariant(variant, ChiselingVariant.CHISELED),
-                stoneBlock.getItemVariant(variant, ChiselingVariant.NORMAL));
+                    stoneBlock.getItemVariant(variant, ChiselingVariant.CHISELED),
+                    stoneBlock.getItemVariant(variant, ChiselingVariant.NORMAL));
         }
     }
+
     private static void registerNBTRemoval() {
         for (MetaTileEntityQuantumChest chest : MetaTileEntities.QUANTUM_CHEST)
             if (chest != null) {
diff --git a/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java
index 6fd844a324a..a7fb43605c1 100644
--- a/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java
@@ -86,23 +86,23 @@ public static void init() {
         }
 
         RecipeMaps.MIXER_RECIPES.recipeBuilder().duration(100).EUt(8)
-            .input(dust, Sugar)
-            .inputs(new ItemStack(Blocks.BROWN_MUSHROOM))
-            .inputs(new ItemStack(Items.SPIDER_EYE))
-            .outputs(new ItemStack(Items.FERMENTED_SPIDER_EYE))
-            .buildAndRegister();
+                .input(dust, Sugar)
+                .inputs(new ItemStack(Blocks.BROWN_MUSHROOM))
+                .inputs(new ItemStack(Items.SPIDER_EYE))
+                .outputs(new ItemStack(Items.FERMENTED_SPIDER_EYE))
+                .buildAndRegister();
 
         RecipeMaps.MIXER_RECIPES.recipeBuilder().duration(100).EUt(8)
-            .input(dust, Sugar)
-            .inputs(new ItemStack(Blocks.RED_MUSHROOM))
-            .inputs(new ItemStack(Items.SPIDER_EYE))
-            .outputs(new ItemStack(Items.FERMENTED_SPIDER_EYE))
-            .buildAndRegister();
+                .input(dust, Sugar)
+                .inputs(new ItemStack(Blocks.RED_MUSHROOM))
+                .inputs(new ItemStack(Items.SPIDER_EYE))
+                .outputs(new ItemStack(Items.FERMENTED_SPIDER_EYE))
+                .buildAndRegister();
 
         RecipeMaps.SIFTER_RECIPES.recipeBuilder().duration(800).EUt(16)
-            .inputs(new ItemStack(Blocks.GRAVEL))
-            .outputs(new ItemStack(Items.FLINT))
-            .buildAndRegister();
+                .inputs(new ItemStack(Blocks.GRAVEL))
+                .outputs(new ItemStack(Items.FLINT))
+                .buildAndRegister();
 
         RecipeMaps.PACKER_RECIPES.recipeBuilder()
                 .inputs(TOOL_MATCHES.getStackForm(16)).input(OrePrefix.plate, Materials.Paper)
diff --git a/src/main/java/gregtech/loaders/recipe/RecyclingRecipes.java b/src/main/java/gregtech/loaders/recipe/RecyclingRecipes.java
index 13ff9857be9..74c258c5e59 100644
--- a/src/main/java/gregtech/loaders/recipe/RecyclingRecipes.java
+++ b/src/main/java/gregtech/loaders/recipe/RecyclingRecipes.java
@@ -39,9 +39,9 @@ private static void initializeArcRecyclingRecipes() {
 
     public static void registerArcRecyclingRecipe(Consumer> inputSupplier, List components, boolean ignoreArcSmelting) {
         List materials = components.stream()
-            .filter(stack -> stack.material.hasProperty(PropertyKey.DUST))
-            .filter(stack -> stack.amount >= M / 9) //do only materials which have at least one nugget
-            .collect(Collectors.toList());
+                .filter(stack -> stack.material.hasProperty(PropertyKey.DUST))
+                .filter(stack -> stack.amount >= M / 9) //do only materials which have at least one nugget
+                .collect(Collectors.toList());
         if (materials.isEmpty()) return;
         MaterialStack firstStack = materials.get(0);
         Material material = firstStack.material;
@@ -49,24 +49,24 @@ public static void registerArcRecyclingRecipe(Consumer> inputSu
         if (material.hasProperty(PropertyKey.BLAST)) {
             int blastFurnaceTemperature = material.getProperty(PropertyKey.BLAST).getBlastTemperature();
             voltageMultiplier = blastFurnaceTemperature == 0 ? 1 : blastFurnaceTemperature > 2000 ? 16 : 4;
-        } else if (!material.hasProperty(PropertyKey.INGOT)){
+        } else if (!material.hasProperty(PropertyKey.INGOT)) {
             //do not apply arc smelting for gems, solid materials and dust materials
             //only generate recipes for ingot materials
             ignoreArcSmelting = true;
         }
 
         RecipeBuilder maceratorRecipeBuilder = RecipeMaps.MACERATOR_RECIPES.recipeBuilder()
-            .outputs(materials.stream().map(OreDictUnifier::getDust).collect(Collectors.toList()))
-            .duration((int) Math.max(1L, firstStack.amount * 30 / M))
-            .EUt(8 * voltageMultiplier);
+                .outputs(materials.stream().map(OreDictUnifier::getDust).collect(Collectors.toList()))
+                .duration((int) Math.max(1L, firstStack.amount * 30 / M))
+                .EUt(8 * voltageMultiplier);
         inputSupplier.accept(maceratorRecipeBuilder);
         maceratorRecipeBuilder.buildAndRegister();
 
         if (material.hasFluid()) {
             RecipeBuilder fluidExtractorRecipeBuilder = RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder()
-                .fluidOutputs(material.getFluid((int) (firstStack.amount * L / M)))
-                .duration((int) Math.max(1L, firstStack.amount * 80 / M))
-                .EUt(32 * voltageMultiplier);
+                    .fluidOutputs(material.getFluid((int) (firstStack.amount * L / M)))
+                    .duration((int) Math.max(1L, firstStack.amount * 80 / M))
+                    .EUt(32 * voltageMultiplier);
             inputSupplier.accept(fluidExtractorRecipeBuilder);
             fluidExtractorRecipeBuilder.buildAndRegister();
         }
@@ -76,9 +76,9 @@ public static void registerArcRecyclingRecipe(Consumer> inputSu
             resultList.removeIf(ItemStack::isEmpty);
             if (resultList.isEmpty()) return;
             RecipeBuilder arcFurnaceRecipeBuilder = RecipeMaps.ARC_FURNACE_RECIPES.recipeBuilder()
-                .outputs(resultList)
-                .duration((int) Math.max(1L, firstStack.amount * 60 / M))
-                .EUt(30 * voltageMultiplier);
+                    .outputs(resultList)
+                    .duration((int) Math.max(1L, firstStack.amount * 60 / M))
+                    .EUt(30 * voltageMultiplier);
             inputSupplier.accept(arcFurnaceRecipeBuilder);
             arcFurnaceRecipeBuilder.buildAndRegister();
         }
@@ -91,11 +91,11 @@ private static ItemStack getArcSmeltingResult(MaterialStack materialStack) {
             return OreDictUnifier.getDust(Materials.Ash, materialAmount);
         } else if (material.hasProperty(PropertyKey.GEM)) {
             if (materialStack.material.getMaterialComponents().stream()
-                .anyMatch(stack -> stack.material == Materials.Oxygen)) {
+                    .anyMatch(stack -> stack.material == Materials.Oxygen)) {
                 return OreDictUnifier.getDust(Materials.Ash, materialAmount);
             }
             if (materialStack.material.getMaterialComponents().stream()
-                .anyMatch(stack -> stack.material == Materials.Carbon)) {
+                    .anyMatch(stack -> stack.material == Materials.Carbon)) {
                 return OreDictUnifier.getDust(Materials.Carbon, materialAmount);
             }
             return OreDictUnifier.getDust(Materials.DarkAsh, materialAmount);
diff --git a/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java b/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java
index bbe1b75738b..10127822b60 100644
--- a/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java
+++ b/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java
@@ -33,6 +33,7 @@ public static void init() {
             miscRecipes();
         toolArmorRecipes();
     }
+
     private static void woodRecipes() {
         if (ConfigHolder.vanillaRecipes.nerfStickCrafting) {
             ModHandler.removeRecipeByName(new ResourceLocation("minecraft:stick"));
diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java
index 93cecb1084f..a8a326e2516 100644
--- a/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java
+++ b/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java
@@ -12,40 +12,40 @@ public class ChemicalBathRecipes {
     public static void init() {
 
         CHEMICAL_BATH_RECIPES.recipeBuilder()
-            .input(dust, Wood)
-            .fluidInputs(Water.getFluid(100))
-            .output(Items.PAPER)
-            .duration(200).EUt(4).buildAndRegister();
+                .input(dust, Wood)
+                .fluidInputs(Water.getFluid(100))
+                .output(Items.PAPER)
+                .duration(200).EUt(4).buildAndRegister();
 
         CHEMICAL_BATH_RECIPES.recipeBuilder()
-            .input(dust, Paper)
-            .fluidInputs(Water.getFluid(100))
-            .output(Items.PAPER)
-            .duration(100).EUt(4).buildAndRegister();
+                .input(dust, Paper)
+                .fluidInputs(Water.getFluid(100))
+                .output(Items.PAPER)
+                .duration(100).EUt(4).buildAndRegister();
 
         CHEMICAL_BATH_RECIPES.recipeBuilder()
-            .input(Items.REEDS, 1, true)
-            .fluidInputs(Water.getFluid(100))
-            .output(Items.PAPER)
-            .duration(100).EUt(8).buildAndRegister();
+                .input(Items.REEDS, 1, true)
+                .fluidInputs(Water.getFluid(100))
+                .output(Items.PAPER)
+                .duration(100).EUt(8).buildAndRegister();
 
         CHEMICAL_BATH_RECIPES.recipeBuilder()
-            .input(dust, Wood)
-            .fluidInputs(DistilledWater.getFluid(100))
-            .output(Items.PAPER)
-            .duration(200).EUt(4).buildAndRegister();
+                .input(dust, Wood)
+                .fluidInputs(DistilledWater.getFluid(100))
+                .output(Items.PAPER)
+                .duration(200).EUt(4).buildAndRegister();
 
         CHEMICAL_BATH_RECIPES.recipeBuilder()
-            .input(dust, Paper)
-            .fluidInputs(DistilledWater.getFluid(100))
-            .output(Items.PAPER)
-            .duration(100).EUt(4).buildAndRegister();
+                .input(dust, Paper)
+                .fluidInputs(DistilledWater.getFluid(100))
+                .output(Items.PAPER)
+                .duration(100).EUt(4).buildAndRegister();
 
         CHEMICAL_BATH_RECIPES.recipeBuilder()
-            .input(Items.REEDS, 1, true)
-            .fluidInputs(DistilledWater.getFluid(100))
-            .output(Items.PAPER)
-            .duration(100).EUt(8).buildAndRegister();
+                .input(Items.REEDS, 1, true)
+                .fluidInputs(DistilledWater.getFluid(100))
+                .output(Items.PAPER)
+                .duration(100).EUt(8).buildAndRegister();
 
         //todo add these to ore byproducts
         CHEMICAL_BATH_RECIPES.recipeBuilder()
diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java
index cfe7fec5676..b43e5540af5 100644
--- a/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java
+++ b/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java
@@ -27,56 +27,56 @@ public static void init() {
 
         // A Few Random Recipes
         FLUID_HEATER_RECIPES.recipeBuilder()
-            .circuitMeta(1)
-            .fluidInputs(Acetone.getFluid(100))
-            .fluidOutputs(Ethenone.getFluid(100))
-            .duration(16).EUt(30).buildAndRegister();
+                .circuitMeta(1)
+                .fluidInputs(Acetone.getFluid(100))
+                .fluidOutputs(Ethenone.getFluid(100))
+                .duration(16).EUt(30).buildAndRegister();
 
         FLUID_HEATER_RECIPES.recipeBuilder()
-            .circuitMeta(1)
-            .fluidInputs(DissolvedCalciumAcetate.getFluid(200))
-            .fluidOutputs(Acetone.getFluid(200))
-            .duration(16).EUt(30).buildAndRegister();
+                .circuitMeta(1)
+                .fluidInputs(DissolvedCalciumAcetate.getFluid(200))
+                .fluidOutputs(Acetone.getFluid(200))
+                .duration(16).EUt(30).buildAndRegister();
 
         VACUUM_RECIPES.recipeBuilder()
-            .fluidInputs(Water.getFluid(1000))
-            .fluidOutputs(Ice.getFluid(1000))
-            .duration(50).EUt(30).buildAndRegister();
+                .fluidInputs(Water.getFluid(1000))
+                .fluidOutputs(Ice.getFluid(1000))
+                .duration(50).EUt(30).buildAndRegister();
 
         VACUUM_RECIPES.recipeBuilder()
-            .fluidInputs(Air.getFluid(4000))
-            .fluidOutputs(LiquidAir.getFluid(4000))
-            .duration(400).EUt(30).buildAndRegister();
+                .fluidInputs(Air.getFluid(4000))
+                .fluidOutputs(LiquidAir.getFluid(4000))
+                .duration(400).EUt(30).buildAndRegister();
 
         BLAST_RECIPES.recipeBuilder()
-            .input(dust, FerriteMixture)
-            .fluidInputs(Oxygen.getFluid(2000))
-            .output(ingot, NickelZincFerrite)
-            .blastFurnaceTemp(1500)
-            .duration(400).EUt(120).buildAndRegister();
+                .input(dust, FerriteMixture)
+                .fluidInputs(Oxygen.getFluid(2000))
+                .output(ingot, NickelZincFerrite)
+                .blastFurnaceTemp(1500)
+                .duration(400).EUt(120).buildAndRegister();
 
         FERMENTING_RECIPES.recipeBuilder()
-            .fluidInputs(Biomass.getFluid(100))
-            .fluidOutputs(FermentedBiomass.getFluid(100))
-            .duration(150).EUt(2).buildAndRegister();
+                .fluidInputs(Biomass.getFluid(100))
+                .fluidOutputs(FermentedBiomass.getFluid(100))
+                .duration(150).EUt(2).buildAndRegister();
 
         WIREMILL_RECIPES.recipeBuilder()
-            .input(ingot, Polycaprolactam)
-            .output(Items.STRING, 32)
-            .duration(80).EUt(48).buildAndRegister();
+                .input(ingot, Polycaprolactam)
+                .output(Items.STRING, 32)
+                .duration(80).EUt(48).buildAndRegister();
 
         BLAST_RECIPES.recipeBuilder()
-            .input(Items.REDSTONE)
-            .input(ingot, Copper)
-            .output(ingot, RedAlloy, 2)
-            .blastFurnaceTemp(1200)
-            .duration(884).EUt(120).buildAndRegister();
+                .input(Items.REDSTONE)
+                .input(ingot, Copper)
+                .output(ingot, RedAlloy, 2)
+                .blastFurnaceTemp(1200)
+                .duration(884).EUt(120).buildAndRegister();
 
         BLAST_RECIPES.recipeBuilder()
-            .input(Items.REDSTONE)
-            .input(dust, Copper)
-            .output(ingot, RedAlloy, 2)
-            .blastFurnaceTemp(1200)
-            .duration(884).EUt(120).buildAndRegister();
+                .input(Items.REDSTONE)
+                .input(dust, Copper)
+                .output(ingot, RedAlloy, 2)
+                .blastFurnaceTemp(1200)
+                .duration(884).EUt(120).buildAndRegister();
     }
 }
diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/CrackingRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/CrackingRecipes.java
index 3044e832b1d..5ac927429e0 100644
--- a/src/main/java/gregtech/loaders/recipe/chemistry/CrackingRecipes.java
+++ b/src/main/java/gregtech/loaders/recipe/chemistry/CrackingRecipes.java
@@ -7,135 +7,135 @@ public class CrackingRecipes {
 
     public static void init() {
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidInputs(Ethane.getFluid(1000))
-            .fluidOutputs(HydroCrackedEthane.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidInputs(Ethane.getFluid(1000))
+                .fluidOutputs(HydroCrackedEthane.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidInputs(Ethylene.getFluid(1000))
-            .fluidOutputs(HydroCrackedEthylene.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidInputs(Ethylene.getFluid(1000))
+                .fluidOutputs(HydroCrackedEthylene.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidInputs(Propene.getFluid(1000))
-            .fluidOutputs(HydroCrackedPropene.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidInputs(Propene.getFluid(1000))
+                .fluidOutputs(HydroCrackedPropene.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidInputs(Propane.getFluid(1000))
-            .fluidOutputs(HydroCrackedPropane.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidInputs(Propane.getFluid(1000))
+                .fluidOutputs(HydroCrackedPropane.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidInputs(LightFuel.getFluid(1000))
-            .fluidOutputs(HydroCrackedLightFuel.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidInputs(LightFuel.getFluid(1000))
+                .fluidOutputs(HydroCrackedLightFuel.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidInputs(Butane.getFluid(1000))
-            .fluidOutputs(HydroCrackedButane.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidInputs(Butane.getFluid(1000))
+                .fluidOutputs(HydroCrackedButane.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidInputs(Naphtha.getFluid(1000))
-            .fluidOutputs(HydroCrackedNaphtha.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidInputs(Naphtha.getFluid(1000))
+                .fluidOutputs(HydroCrackedNaphtha.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidInputs(HeavyFuel.getFluid(1000))
-            .fluidOutputs(HydroCrackedHeavyFuel.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidInputs(HeavyFuel.getFluid(1000))
+                .fluidOutputs(HydroCrackedHeavyFuel.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidInputs(RefineryGas.getFluid(1000))
-            .fluidOutputs(HydroCrackedGas.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidInputs(RefineryGas.getFluid(1000))
+                .fluidOutputs(HydroCrackedGas.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidInputs(Butene.getFluid(1000))
-            .fluidOutputs(HydroCrackedButene.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidInputs(Butene.getFluid(1000))
+                .fluidOutputs(HydroCrackedButene.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidInputs(Butadiene.getFluid(1000))
-            .fluidOutputs(HydroCrackedButadiene.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidInputs(Butadiene.getFluid(1000))
+                .fluidOutputs(HydroCrackedButadiene.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Steam.getFluid(2000))
-            .fluidInputs(Ethane.getFluid(1000))
-            .fluidOutputs(SteamCrackedEthane.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Steam.getFluid(2000))
+                .fluidInputs(Ethane.getFluid(1000))
+                .fluidOutputs(SteamCrackedEthane.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Steam.getFluid(2000))
-            .fluidInputs(Ethylene.getFluid(1000))
-            .fluidOutputs(SteamCrackedEthylene.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Steam.getFluid(2000))
+                .fluidInputs(Ethylene.getFluid(1000))
+                .fluidOutputs(SteamCrackedEthylene.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Steam.getFluid(2000))
-            .fluidInputs(Propene.getFluid(1000))
-            .fluidOutputs(SteamCrackedPropene.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Steam.getFluid(2000))
+                .fluidInputs(Propene.getFluid(1000))
+                .fluidOutputs(SteamCrackedPropene.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Steam.getFluid(2000))
-            .fluidInputs(Propane.getFluid(1000))
-            .fluidOutputs(SteamCrackedPropane.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Steam.getFluid(2000))
+                .fluidInputs(Propane.getFluid(1000))
+                .fluidOutputs(SteamCrackedPropane.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Steam.getFluid(2000))
-            .fluidInputs(LightFuel.getFluid(1000))
-            .fluidOutputs(SteamCrackedLightFuel.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Steam.getFluid(2000))
+                .fluidInputs(LightFuel.getFluid(1000))
+                .fluidOutputs(SteamCrackedLightFuel.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Steam.getFluid(2000))
-            .fluidInputs(Butane.getFluid(1000))
-            .fluidOutputs(SteamCrackedButane.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Steam.getFluid(2000))
+                .fluidInputs(Butane.getFluid(1000))
+                .fluidOutputs(SteamCrackedButane.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Steam.getFluid(2000))
-            .fluidInputs(Naphtha.getFluid(1000))
-            .fluidOutputs(SteamCrackedNaphtha.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Steam.getFluid(2000))
+                .fluidInputs(Naphtha.getFluid(1000))
+                .fluidOutputs(SteamCrackedNaphtha.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Steam.getFluid(2000))
-            .fluidInputs(HeavyFuel.getFluid(1000))
-            .fluidOutputs(SteamCrackedHeavyFuel.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Steam.getFluid(2000))
+                .fluidInputs(HeavyFuel.getFluid(1000))
+                .fluidOutputs(SteamCrackedHeavyFuel.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Steam.getFluid(2000))
-            .fluidInputs(RefineryGas.getFluid(1000))
-            .fluidOutputs(SteamCrackedGas.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Steam.getFluid(2000))
+                .fluidInputs(RefineryGas.getFluid(1000))
+                .fluidOutputs(SteamCrackedGas.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Steam.getFluid(2000))
-            .fluidInputs(Butene.getFluid(1000))
-            .fluidOutputs(SteamCrackedButene.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Steam.getFluid(2000))
+                .fluidInputs(Butene.getFluid(1000))
+                .fluidOutputs(SteamCrackedButene.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
 
         CRACKING_RECIPES.recipeBuilder()
-            .fluidInputs(Steam.getFluid(2000))
-            .fluidInputs(Butadiene.getFluid(1000))
-            .fluidOutputs(SteamCrackedButadiene.getFluid(1000))
-            .duration(40).EUt(120).buildAndRegister();
+                .fluidInputs(Steam.getFluid(2000))
+                .fluidInputs(Butadiene.getFluid(1000))
+                .fluidOutputs(SteamCrackedButadiene.getFluid(1000))
+                .duration(40).EUt(120).buildAndRegister();
     }
 }
diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/DistillationRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/DistillationRecipes.java
index 2b0aabc4c63..7b6f83ceb94 100644
--- a/src/main/java/gregtech/loaders/recipe/chemistry/DistillationRecipes.java
+++ b/src/main/java/gregtech/loaders/recipe/chemistry/DistillationRecipes.java
@@ -13,57 +13,57 @@ public class DistillationRecipes {
 
     public static void init() {
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(Creosote.getFluid(24))
-            .fluidOutputs(Lubricant.getFluid(12))
-            .duration(16).EUt(96).buildAndRegister();
+                .fluidInputs(Creosote.getFluid(24))
+                .fluidOutputs(Lubricant.getFluid(12))
+                .duration(16).EUt(96).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(HydroCrackedEthane.getFluid(1000))
-            .fluidOutputs(Methane.getFluid(2000))
-            .duration(120).EUt(120).buildAndRegister();
+                .fluidInputs(HydroCrackedEthane.getFluid(1000))
+                .fluidOutputs(Methane.getFluid(2000))
+                .duration(120).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SteamCrackedEthane.getFluid(1000))
-            .output(dustSmall, Carbon, 2)
-            .fluidOutputs(Methane.getFluid(1500))
-            .duration(120).EUt(120).buildAndRegister();
+                .fluidInputs(SteamCrackedEthane.getFluid(1000))
+                .output(dustSmall, Carbon, 2)
+                .fluidOutputs(Methane.getFluid(1500))
+                .duration(120).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(HydroCrackedEthylene.getFluid(1000))
-            .fluidOutputs(Ethane.getFluid(1000))
-            .duration(120).EUt(120).buildAndRegister();
+                .fluidInputs(HydroCrackedEthylene.getFluid(1000))
+                .fluidOutputs(Ethane.getFluid(1000))
+                .duration(120).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SteamCrackedEthylene.getFluid(1000))
-            .output(dust, Carbon)
-            .fluidOutputs(Methane.getFluid(1000))
-            .duration(120).EUt(120).buildAndRegister();
+                .fluidInputs(SteamCrackedEthylene.getFluid(1000))
+                .output(dust, Carbon)
+                .fluidOutputs(Methane.getFluid(1000))
+                .duration(120).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(HydroCrackedPropene.getFluid(1000))
-            .fluidOutputs(Propane.getFluid(500))
-            .fluidOutputs(Ethylene.getFluid(500))
-            .fluidOutputs(Methane.getFluid(500))
-            .duration(120).EUt(120).buildAndRegister();
+                .fluidInputs(HydroCrackedPropene.getFluid(1000))
+                .fluidOutputs(Propane.getFluid(500))
+                .fluidOutputs(Ethylene.getFluid(500))
+                .fluidOutputs(Methane.getFluid(500))
+                .duration(120).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SteamCrackedPropene.getFluid(1000))
-            .output(dustSmall, Carbon, 6)
-            .fluidOutputs(Methane.getFluid(1500))
-            .duration(180).EUt(120).buildAndRegister();
+                .fluidInputs(SteamCrackedPropene.getFluid(1000))
+                .output(dustSmall, Carbon, 6)
+                .fluidOutputs(Methane.getFluid(1500))
+                .duration(180).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(HydroCrackedPropane.getFluid(1000))
-            .fluidOutputs(Ethane.getFluid(1000))
-            .fluidOutputs(Methane.getFluid(1000))
-            .duration(120).EUt(120).buildAndRegister();
+                .fluidInputs(HydroCrackedPropane.getFluid(1000))
+                .fluidOutputs(Ethane.getFluid(1000))
+                .fluidOutputs(Methane.getFluid(1000))
+                .duration(120).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SteamCrackedPropane.getFluid(1000))
-            .output(dustSmall, Carbon, 2)
-            .fluidOutputs(Ethylene.getFluid(750))
-            .fluidOutputs(Methane.getFluid(1250))
-            .duration(120).EUt(120).buildAndRegister();
+                .fluidInputs(SteamCrackedPropane.getFluid(1000))
+                .output(dustSmall, Carbon, 2)
+                .fluidOutputs(Ethylene.getFluid(750))
+                .fluidOutputs(Methane.getFluid(1250))
+                .duration(120).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
                 .fluidInputs(HydroCrackedLightFuel.getFluid(1000))
@@ -76,177 +76,177 @@ public static void init() {
                 .duration(120).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SteamCrackedLightFuel.getFluid(1000))
-            .output(dustTiny, Carbon, 3)
-            .fluidOutputs(HeavyFuel.getFluid(50))
-            .fluidOutputs(Naphtha.getFluid(100))
-            .fluidOutputs(Toluene.getFluid(30))
-            .fluidOutputs(Benzene.getFluid(150))
-            .fluidOutputs(Butene.getFluid(65))
-            .fluidOutputs(Butadiene.getFluid(50))
-            .fluidOutputs(Propane.getFluid(50))
-            .fluidOutputs(Propene.getFluid(250))
-            .fluidOutputs(Ethane.getFluid(50))
-            .fluidOutputs(Ethylene.getFluid(250))
-            .fluidOutputs(Methane.getFluid(250))
-            .duration(120).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(HydroCrackedButane.getFluid(750))
-            .fluidOutputs(Propane.getFluid(500))
-            .fluidOutputs(Ethane.getFluid(500))
-            .fluidOutputs(Methane.getFluid(500))
-            .duration(90).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SteamCrackedButane.getFluid(1000))
-            .output(dustTiny, Carbon, 11)
-            .fluidOutputs(Propane.getFluid(125))
-            .fluidOutputs(Ethane.getFluid(125))
-            .fluidOutputs(Ethylene.getFluid(125))
-            .fluidOutputs(Methane.getFluid(2000))
-            .duration(240).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(HydroCrackedNaphtha.getFluid(1000))
-            .fluidOutputs(Butane.getFluid(800))
-            .fluidOutputs(Propane.getFluid(300))
-            .fluidOutputs(Ethane.getFluid(250))
-            .fluidOutputs(Methane.getFluid(250))
-            .duration(120).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SteamCrackedNaphtha.getFluid(1000))
-            .output(dustTiny, Carbon, 3)
-            .fluidOutputs(HeavyFuel.getFluid(25))
-            .fluidOutputs(LightFuel.getFluid(50))
-            .fluidOutputs(Toluene.getFluid(20))
-            .fluidOutputs(Benzene.getFluid(100))
-            .fluidOutputs(Butene.getFluid(50))
-            .fluidOutputs(Butadiene.getFluid(50))
-            .fluidOutputs(Propane.getFluid(15))
-            .fluidOutputs(Propene.getFluid(300))
-            .fluidOutputs(Ethane.getFluid(65))
-            .fluidOutputs(Ethylene.getFluid(500))
-            .fluidOutputs(Methane.getFluid(500))
-            .duration(120).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(HydroCrackedHeavyFuel.getFluid(1000))
-            .fluidOutputs(LightFuel.getFluid(600))
-            .fluidOutputs(Naphtha.getFluid(100))
-            .fluidOutputs(Butane.getFluid(100))
-            .fluidOutputs(Propane.getFluid(100))
-            .fluidOutputs(Ethane.getFluid(75))
-            .fluidOutputs(Methane.getFluid(75))
-            .duration(120).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SteamCrackedHeavyFuel.getFluid(1000))
-            .output(dustTiny, Carbon, 3)
-            .fluidOutputs(LightFuel.getFluid(100))
-            .fluidOutputs(Naphtha.getFluid(125))
-            .fluidOutputs(Toluene.getFluid(80))
-            .fluidOutputs(Benzene.getFluid(400))
-            .fluidOutputs(Butene.getFluid(80))
-            .fluidOutputs(Butadiene.getFluid(50))
-            .fluidOutputs(Propane.getFluid(10))
-            .fluidOutputs(Propene.getFluid(100))
-            .fluidOutputs(Ethane.getFluid(15))
-            .fluidOutputs(Ethylene.getFluid(150))
-            .fluidOutputs(Methane.getFluid(150))
-            .duration(120).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(HydroCrackedGas.getFluid(1000))
-            .fluidOutputs(Methane.getFluid(1400))
-            .fluidOutputs(Hydrogen.getFluid(1340))
-            .fluidOutputs(Helium.getFluid(20))
-            .duration(120).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SteamCrackedGas.getFluid(800))
-            .output(dustTiny, Carbon)
-            .fluidOutputs(Propene.getFluid(6))
-            .fluidOutputs(Ethane.getFluid(6))
-            .fluidOutputs(Ethylene.getFluid(20))
-            .fluidOutputs(Methane.getFluid(914))
-            .fluidOutputs(Helium.getFluid(16))
-            .duration(96).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(HydroCrackedButene.getFluid(750))
-            .fluidOutputs(Butane.getFluid(250))
-            .fluidOutputs(Propene.getFluid(250))
-            .fluidOutputs(Ethane.getFluid(250))
-            .fluidOutputs(Methane.getFluid(250))
-            .duration(90).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SteamCrackedButene.getFluid(2000))
-            .output(dust, Carbon, 3)
-            .fluidOutputs(Propene.getFluid(250))
-            .fluidOutputs(Ethylene.getFluid(625))
-            .fluidOutputs(Methane.getFluid(3000))
-            .duration(240).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(HydroCrackedButadiene.getFluid(750))
-            .fluidOutputs(Butene.getFluid(500))
-            .fluidOutputs(Ethylene.getFluid(500))
-            .duration(90).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SteamCrackedButadiene.getFluid(2000))
-            .output(dust, Carbon, 2)
-            .fluidOutputs(Propene.getFluid(250))
-            .fluidOutputs(Ethylene.getFluid(375))
-            .fluidOutputs(Methane.getFluid(2250))
-            .duration(240).EUt(120).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(OilLight.getFluid(150))
-            .fluidOutputs(SulfuricHeavyFuel.getFluid(10))
-            .fluidOutputs(SulfuricLightFuel.getFluid(20))
-            .fluidOutputs(SulfuricNaphtha.getFluid(30))
-            .fluidOutputs(SulfuricGas.getFluid(240))
-            .duration(20).EUt(96).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(OilMedium.getFluid(100))
-            .fluidOutputs(SulfuricHeavyFuel.getFluid(15))
-            .fluidOutputs(SulfuricLightFuel.getFluid(50))
-            .fluidOutputs(SulfuricNaphtha.getFluid(20))
-            .fluidOutputs(SulfuricGas.getFluid(60))
-            .duration(20).EUt(96).buildAndRegister();
-
-        DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(OilHeavy.getFluid(150))
-            .fluidOutputs(SulfuricHeavyFuel.getFluid(250))
-            .fluidOutputs(SulfuricLightFuel.getFluid(45))
-            .fluidOutputs(SulfuricNaphtha.getFluid(15))
-            .fluidOutputs(SulfuricGas.getFluid(60))
-            .duration(20).EUt(288).buildAndRegister();
+                .fluidInputs(SteamCrackedLightFuel.getFluid(1000))
+                .output(dustTiny, Carbon, 3)
+                .fluidOutputs(HeavyFuel.getFluid(50))
+                .fluidOutputs(Naphtha.getFluid(100))
+                .fluidOutputs(Toluene.getFluid(30))
+                .fluidOutputs(Benzene.getFluid(150))
+                .fluidOutputs(Butene.getFluid(65))
+                .fluidOutputs(Butadiene.getFluid(50))
+                .fluidOutputs(Propane.getFluid(50))
+                .fluidOutputs(Propene.getFluid(250))
+                .fluidOutputs(Ethane.getFluid(50))
+                .fluidOutputs(Ethylene.getFluid(250))
+                .fluidOutputs(Methane.getFluid(250))
+                .duration(120).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(Oil.getFluid(50))
-            .fluidOutputs(SulfuricHeavyFuel.getFluid(15))
-            .fluidOutputs(SulfuricLightFuel.getFluid(50))
-            .fluidOutputs(SulfuricNaphtha.getFluid(20))
-            .fluidOutputs(SulfuricGas.getFluid(60))
-            .duration(20).EUt(96).buildAndRegister();
+                .fluidInputs(HydroCrackedButane.getFluid(750))
+                .fluidOutputs(Propane.getFluid(500))
+                .fluidOutputs(Ethane.getFluid(500))
+                .fluidOutputs(Methane.getFluid(500))
+                .duration(90).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(DilutedHydrochloricAcid.getFluid(2000))
-            .fluidOutputs(Water.getFluid(1000))
-            .fluidOutputs(HydrochloricAcid.getFluid(1000))
-            .duration(600).EUt(64).buildAndRegister();
+                .fluidInputs(SteamCrackedButane.getFluid(1000))
+                .output(dustTiny, Carbon, 11)
+                .fluidOutputs(Propane.getFluid(125))
+                .fluidOutputs(Ethane.getFluid(125))
+                .fluidOutputs(Ethylene.getFluid(125))
+                .fluidOutputs(Methane.getFluid(2000))
+                .duration(240).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(DilutedSulfuricAcid.getFluid(3000))
-            .fluidOutputs(SulfuricAcid.getFluid(2000))
-            .fluidOutputs(Water.getFluid(1000))
-            .duration(600).EUt(120).buildAndRegister();
+                .fluidInputs(HydroCrackedNaphtha.getFluid(1000))
+                .fluidOutputs(Butane.getFluid(800))
+                .fluidOutputs(Propane.getFluid(300))
+                .fluidOutputs(Ethane.getFluid(250))
+                .fluidOutputs(Methane.getFluid(250))
+                .duration(120).EUt(120).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(SteamCrackedNaphtha.getFluid(1000))
+                .output(dustTiny, Carbon, 3)
+                .fluidOutputs(HeavyFuel.getFluid(25))
+                .fluidOutputs(LightFuel.getFluid(50))
+                .fluidOutputs(Toluene.getFluid(20))
+                .fluidOutputs(Benzene.getFluid(100))
+                .fluidOutputs(Butene.getFluid(50))
+                .fluidOutputs(Butadiene.getFluid(50))
+                .fluidOutputs(Propane.getFluid(15))
+                .fluidOutputs(Propene.getFluid(300))
+                .fluidOutputs(Ethane.getFluid(65))
+                .fluidOutputs(Ethylene.getFluid(500))
+                .fluidOutputs(Methane.getFluid(500))
+                .duration(120).EUt(120).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(HydroCrackedHeavyFuel.getFluid(1000))
+                .fluidOutputs(LightFuel.getFluid(600))
+                .fluidOutputs(Naphtha.getFluid(100))
+                .fluidOutputs(Butane.getFluid(100))
+                .fluidOutputs(Propane.getFluid(100))
+                .fluidOutputs(Ethane.getFluid(75))
+                .fluidOutputs(Methane.getFluid(75))
+                .duration(120).EUt(120).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(SteamCrackedHeavyFuel.getFluid(1000))
+                .output(dustTiny, Carbon, 3)
+                .fluidOutputs(LightFuel.getFluid(100))
+                .fluidOutputs(Naphtha.getFluid(125))
+                .fluidOutputs(Toluene.getFluid(80))
+                .fluidOutputs(Benzene.getFluid(400))
+                .fluidOutputs(Butene.getFluid(80))
+                .fluidOutputs(Butadiene.getFluid(50))
+                .fluidOutputs(Propane.getFluid(10))
+                .fluidOutputs(Propene.getFluid(100))
+                .fluidOutputs(Ethane.getFluid(15))
+                .fluidOutputs(Ethylene.getFluid(150))
+                .fluidOutputs(Methane.getFluid(150))
+                .duration(120).EUt(120).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(HydroCrackedGas.getFluid(1000))
+                .fluidOutputs(Methane.getFluid(1400))
+                .fluidOutputs(Hydrogen.getFluid(1340))
+                .fluidOutputs(Helium.getFluid(20))
+                .duration(120).EUt(120).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(SteamCrackedGas.getFluid(800))
+                .output(dustTiny, Carbon)
+                .fluidOutputs(Propene.getFluid(6))
+                .fluidOutputs(Ethane.getFluid(6))
+                .fluidOutputs(Ethylene.getFluid(20))
+                .fluidOutputs(Methane.getFluid(914))
+                .fluidOutputs(Helium.getFluid(16))
+                .duration(96).EUt(120).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(HydroCrackedButene.getFluid(750))
+                .fluidOutputs(Butane.getFluid(250))
+                .fluidOutputs(Propene.getFluid(250))
+                .fluidOutputs(Ethane.getFluid(250))
+                .fluidOutputs(Methane.getFluid(250))
+                .duration(90).EUt(120).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(SteamCrackedButene.getFluid(2000))
+                .output(dust, Carbon, 3)
+                .fluidOutputs(Propene.getFluid(250))
+                .fluidOutputs(Ethylene.getFluid(625))
+                .fluidOutputs(Methane.getFluid(3000))
+                .duration(240).EUt(120).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(HydroCrackedButadiene.getFluid(750))
+                .fluidOutputs(Butene.getFluid(500))
+                .fluidOutputs(Ethylene.getFluid(500))
+                .duration(90).EUt(120).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(SteamCrackedButadiene.getFluid(2000))
+                .output(dust, Carbon, 2)
+                .fluidOutputs(Propene.getFluid(250))
+                .fluidOutputs(Ethylene.getFluid(375))
+                .fluidOutputs(Methane.getFluid(2250))
+                .duration(240).EUt(120).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(OilLight.getFluid(150))
+                .fluidOutputs(SulfuricHeavyFuel.getFluid(10))
+                .fluidOutputs(SulfuricLightFuel.getFluid(20))
+                .fluidOutputs(SulfuricNaphtha.getFluid(30))
+                .fluidOutputs(SulfuricGas.getFluid(240))
+                .duration(20).EUt(96).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(OilMedium.getFluid(100))
+                .fluidOutputs(SulfuricHeavyFuel.getFluid(15))
+                .fluidOutputs(SulfuricLightFuel.getFluid(50))
+                .fluidOutputs(SulfuricNaphtha.getFluid(20))
+                .fluidOutputs(SulfuricGas.getFluid(60))
+                .duration(20).EUt(96).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(OilHeavy.getFluid(150))
+                .fluidOutputs(SulfuricHeavyFuel.getFluid(250))
+                .fluidOutputs(SulfuricLightFuel.getFluid(45))
+                .fluidOutputs(SulfuricNaphtha.getFluid(15))
+                .fluidOutputs(SulfuricGas.getFluid(60))
+                .duration(20).EUt(288).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(Oil.getFluid(50))
+                .fluidOutputs(SulfuricHeavyFuel.getFluid(15))
+                .fluidOutputs(SulfuricLightFuel.getFluid(50))
+                .fluidOutputs(SulfuricNaphtha.getFluid(20))
+                .fluidOutputs(SulfuricGas.getFluid(60))
+                .duration(20).EUt(96).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(DilutedHydrochloricAcid.getFluid(2000))
+                .fluidOutputs(Water.getFluid(1000))
+                .fluidOutputs(HydrochloricAcid.getFluid(1000))
+                .duration(600).EUt(64).buildAndRegister();
+
+        DISTILLATION_RECIPES.recipeBuilder()
+                .fluidInputs(DilutedSulfuricAcid.getFluid(3000))
+                .fluidOutputs(SulfuricAcid.getFluid(2000))
+                .fluidOutputs(Water.getFluid(1000))
+                .duration(600).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
                 .fluidInputs(CharcoalByproducts.getFluid(1000))
@@ -277,71 +277,71 @@ public static void init() {
                 .duration(40).EUt(256).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(WoodGas.getFluid(1000))
-            .fluidOutputs(CarbonDioxide.getFluid(490))
-            .fluidOutputs(Ethylene.getFluid(20))
-            .fluidOutputs(Methane.getFluid(130))
-            .fluidOutputs(CarbonMonoxide.getFluid(340))
-            .fluidOutputs(Hydrogen.getFluid(20))
-            .duration(40).EUt(256).buildAndRegister();
+                .fluidInputs(WoodGas.getFluid(1000))
+                .fluidOutputs(CarbonDioxide.getFluid(490))
+                .fluidOutputs(Ethylene.getFluid(20))
+                .fluidOutputs(Methane.getFluid(130))
+                .fluidOutputs(CarbonMonoxide.getFluid(340))
+                .fluidOutputs(Hydrogen.getFluid(20))
+                .duration(40).EUt(256).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(Water.getFluid(576))
-            .fluidOutputs(DistilledWater.getFluid(520))
-            .duration(160).EUt(120).buildAndRegister();
+                .fluidInputs(Water.getFluid(576))
+                .fluidOutputs(DistilledWater.getFluid(520))
+                .duration(160).EUt(120).buildAndRegister();
 
         DISTILLERY_RECIPES.recipeBuilder()
-            .fluidInputs(Water.getFluid(5))
-            .circuitMeta(5)
-            .fluidOutputs(Materials.DistilledWater.getFluid(5))
-            .duration(16).EUt(10).buildAndRegister();
+                .fluidInputs(Water.getFluid(5))
+                .circuitMeta(5)
+                .fluidOutputs(Materials.DistilledWater.getFluid(5))
+                .duration(16).EUt(10).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(Acetone.getFluid(1000))
-            .fluidOutputs(Ethenone.getFluid(1000))
-            .fluidOutputs(Methane.getFluid(1000))
-            .duration(80).EUt(640).buildAndRegister();
+                .fluidInputs(Acetone.getFluid(1000))
+                .fluidOutputs(Ethenone.getFluid(1000))
+                .fluidOutputs(Methane.getFluid(1000))
+                .duration(80).EUt(640).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(DissolvedCalciumAcetate.getFluid(1000))
-            .output(dust, Quicklime, 2)
-            .fluidOutputs(Acetone.getFluid(1000))
-            .fluidOutputs(CarbonDioxide.getFluid(1000))
-            .fluidOutputs(Water.getFluid(1000))
-            .duration(80).EUt(120).buildAndRegister();
+                .fluidInputs(DissolvedCalciumAcetate.getFluid(1000))
+                .output(dust, Quicklime, 2)
+                .fluidOutputs(Acetone.getFluid(1000))
+                .fluidOutputs(CarbonDioxide.getFluid(1000))
+                .fluidOutputs(Water.getFluid(1000))
+                .duration(80).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(SeedOil.getFluid(24))
-            .fluidOutputs(Lubricant.getFluid(12))
-            .duration(16).EUt(96).buildAndRegister();
+                .fluidInputs(SeedOil.getFluid(24))
+                .fluidOutputs(Lubricant.getFluid(12))
+                .duration(16).EUt(96).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(FermentedBiomass.getFluid(1000))
-            .outputs(new ItemStack(Items.DYE, 1, 15))
-            .fluidOutputs(AceticAcid.getFluid(25))
-            .fluidOutputs(Water.getFluid(375))
-            .fluidOutputs(Ethanol.getFluid(150))
-            .fluidOutputs(Methanol.getFluid(150))
-            .fluidOutputs(Ammonia.getFluid(100))
-            .fluidOutputs(CarbonDioxide.getFluid(400))
-            .fluidOutputs(Methane.getFluid(600))
-            .duration(75).EUt(180).buildAndRegister();
+                .fluidInputs(FermentedBiomass.getFluid(1000))
+                .outputs(new ItemStack(Items.DYE, 1, 15))
+                .fluidOutputs(AceticAcid.getFluid(25))
+                .fluidOutputs(Water.getFluid(375))
+                .fluidOutputs(Ethanol.getFluid(150))
+                .fluidOutputs(Methanol.getFluid(150))
+                .fluidOutputs(Ammonia.getFluid(100))
+                .fluidOutputs(CarbonDioxide.getFluid(400))
+                .fluidOutputs(Methane.getFluid(600))
+                .duration(75).EUt(180).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(RefineryGas.getFluid(1000))
-            .fluidOutputs(Butane.getFluid(60))
-            .fluidOutputs(Propane.getFluid(70))
-            .fluidOutputs(Ethane.getFluid(100))
-            .fluidOutputs(Methane.getFluid(750))
-            .fluidOutputs(Helium.getFluid(20))
-            .duration(240).EUt(120).buildAndRegister();
+                .fluidInputs(RefineryGas.getFluid(1000))
+                .fluidOutputs(Butane.getFluid(60))
+                .fluidOutputs(Propane.getFluid(70))
+                .fluidOutputs(Ethane.getFluid(100))
+                .fluidOutputs(Methane.getFluid(750))
+                .fluidOutputs(Helium.getFluid(20))
+                .duration(240).EUt(120).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
-            .fluidInputs(Biomass.getFluid(600))
-            .output(dustSmall, Wood, 2)
-            .fluidOutputs(Ethanol.getFluid(240))
-            .fluidOutputs(Water.getFluid(240))
-            .duration(32).EUt(400).buildAndRegister();
+                .fluidInputs(Biomass.getFluid(600))
+                .output(dustSmall, Wood, 2)
+                .fluidOutputs(Ethanol.getFluid(240))
+                .fluidOutputs(Water.getFluid(240))
+                .duration(32).EUt(400).buildAndRegister();
 
         DISTILLATION_RECIPES.recipeBuilder()
                 .fluidInputs(CoalGas.getFluid(1000))
@@ -364,45 +364,45 @@ public static void init() {
                 .buildAndRegister();
 
         DISTILLERY_RECIPES.recipeBuilder()
-            .circuitMeta(1)
-            .fluidInputs(Toluene.getFluid(30))
-            .fluidOutputs(LightFuel.getFluid(30))
-            .duration(160).EUt(24).buildAndRegister();
+                .circuitMeta(1)
+                .fluidInputs(Toluene.getFluid(30))
+                .fluidOutputs(LightFuel.getFluid(30))
+                .duration(160).EUt(24).buildAndRegister();
 
         DISTILLERY_RECIPES.recipeBuilder()
-            .circuitMeta(1)
-            .fluidInputs(HeavyFuel.getFluid(10))
-            .fluidOutputs(Toluene.getFluid(4))
-            .duration(16).EUt(24).buildAndRegister();
+                .circuitMeta(1)
+                .fluidInputs(HeavyFuel.getFluid(10))
+                .fluidOutputs(Toluene.getFluid(4))
+                .duration(16).EUt(24).buildAndRegister();
 
         DISTILLERY_RECIPES.recipeBuilder()
-            .circuitMeta(2)
-            .fluidInputs(HeavyFuel.getFluid(10))
-            .fluidOutputs(Benzene.getFluid(4))
-            .duration(16).EUt(24).buildAndRegister();
+                .circuitMeta(2)
+                .fluidInputs(HeavyFuel.getFluid(10))
+                .fluidOutputs(Benzene.getFluid(4))
+                .duration(16).EUt(24).buildAndRegister();
 
         DISTILLERY_RECIPES.recipeBuilder()
-            .circuitMeta(3)
-            .fluidInputs(HeavyFuel.getFluid(20))
-            .fluidOutputs(Phenol.getFluid(5))
-            .duration(32).EUt(24).buildAndRegister();
+                .circuitMeta(3)
+                .fluidInputs(HeavyFuel.getFluid(20))
+                .fluidOutputs(Phenol.getFluid(5))
+                .duration(32).EUt(24).buildAndRegister();
 
         DISTILLERY_RECIPES.recipeBuilder()
-            .circuitMeta(5)
-            .fluidInputs(OilLight.getFluid(300))
-            .fluidOutputs(Oil.getFluid(100))
-            .duration(16).EUt(24).buildAndRegister();
+                .circuitMeta(5)
+                .fluidInputs(OilLight.getFluid(300))
+                .fluidOutputs(Oil.getFluid(100))
+                .duration(16).EUt(24).buildAndRegister();
 
         DISTILLERY_RECIPES.recipeBuilder()
-            .circuitMeta(5)
-            .fluidInputs(OilMedium.getFluid(200))
-            .fluidOutputs(Oil.getFluid(100))
-            .duration(16).EUt(24).buildAndRegister();
+                .circuitMeta(5)
+                .fluidInputs(OilMedium.getFluid(200))
+                .fluidOutputs(Oil.getFluid(100))
+                .duration(16).EUt(24).buildAndRegister();
 
         DISTILLERY_RECIPES.recipeBuilder()
-            .circuitMeta(5)
-            .fluidInputs(OilHeavy.getFluid(100))
-            .fluidOutputs(Oil.getFluid(100))
-            .duration(16).EUt(24).buildAndRegister();
+                .circuitMeta(5)
+                .fluidInputs(OilHeavy.getFluid(100))
+                .fluidOutputs(Oil.getFluid(100))
+                .duration(16).EUt(24).buildAndRegister();
     }
 }
diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/LCRCombined.java b/src/main/java/gregtech/loaders/recipe/chemistry/LCRCombined.java
index 28350ffb518..69d6cbf469f 100644
--- a/src/main/java/gregtech/loaders/recipe/chemistry/LCRCombined.java
+++ b/src/main/java/gregtech/loaders/recipe/chemistry/LCRCombined.java
@@ -20,7 +20,7 @@ static void init() {
                 .fluidOutputs(SaltWater.getFluid(1000))
                 .fluidOutputs(DilutedHydrochloricAcid.getFluid(1000))
                 .EUt(30)
-                .duration(24*20)
+                .duration(24 * 20)
                 .buildAndRegister();
 
         LARGE_CHEMICAL_RECIPES.recipeBuilder()
@@ -33,7 +33,7 @@ static void init() {
                 .fluidOutputs(Epichlorohydrin.getFluid(1000))
                 .fluidOutputs(SaltWater.getFluid(1000))
                 .EUt(30)
-                .duration(24*20)
+                .duration(24 * 20)
                 .buildAndRegister();
 
         LARGE_CHEMICAL_RECIPES.recipeBuilder()
diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java
index 34dc2e5e16f..3c741fc80e0 100644
--- a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java
+++ b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java
@@ -11,84 +11,84 @@ public class MixerRecipes {
 
     public static void init() {
         MIXER_RECIPES.recipeBuilder()
-            .fluidInputs(NitricAcid.getFluid(1000))
-            .fluidInputs(SulfuricAcid.getFluid(1000))
-            .fluidOutputs(NitrationMixture.getFluid(2000))
-            .duration(500).EUt(2).buildAndRegister();
+                .fluidInputs(NitricAcid.getFluid(1000))
+                .fluidInputs(SulfuricAcid.getFluid(1000))
+                .fluidOutputs(NitrationMixture.getFluid(2000))
+                .duration(500).EUt(2).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .input(dust, Sodium, 2)
-            .input(dust, Sulfur)
-            .output(dust, SodiumSulfide, 3)
-            .duration(60).EUt(30).buildAndRegister();
+                .input(dust, Sodium, 2)
+                .input(dust, Sulfur)
+                .output(dust, SodiumSulfide, 3)
+                .duration(60).EUt(30).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .fluidInputs(PolyvinylAcetate.getFluid(1000))
-            .fluidInputs(Acetone.getFluid(1500))
-            .fluidOutputs(Glue.getFluid(2500))
-            .duration(50).EUt(8).buildAndRegister();
+                .fluidInputs(PolyvinylAcetate.getFluid(1000))
+                .fluidInputs(Acetone.getFluid(1500))
+                .fluidOutputs(Glue.getFluid(2500))
+                .duration(50).EUt(8).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .fluidInputs(PolyvinylAcetate.getFluid(1000))
-            .fluidInputs(MethylAcetate.getFluid(1500))
-            .fluidOutputs(Glue.getFluid(2500))
-            .duration(50).EUt(8).buildAndRegister();
+                .fluidInputs(PolyvinylAcetate.getFluid(1000))
+                .fluidInputs(MethylAcetate.getFluid(1500))
+                .fluidOutputs(Glue.getFluid(2500))
+                .duration(50).EUt(8).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .input(dust, Wood, 4)
-            .fluidInputs(SulfuricAcid.getFluid(1000))
-            .output(Items.COAL, 1, 1)
-            .fluidOutputs(DilutedSulfuricAcid.getFluid(1000))
-            .duration(1200).EUt(2).buildAndRegister();
+                .input(dust, Wood, 4)
+                .fluidInputs(SulfuricAcid.getFluid(1000))
+                .output(Items.COAL, 1, 1)
+                .fluidOutputs(DilutedSulfuricAcid.getFluid(1000))
+                .duration(1200).EUt(2).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .input(Items.SUGAR, 4)
-            .fluidInputs(SulfuricAcid.getFluid(1000))
-            .output(Items.COAL, 1, 1)
-            .fluidOutputs(DilutedSulfuricAcid.getFluid(1000))
-            .duration(1200).EUt(2).buildAndRegister();
+                .input(Items.SUGAR, 4)
+                .fluidInputs(SulfuricAcid.getFluid(1000))
+                .output(Items.COAL, 1, 1)
+                .fluidOutputs(DilutedSulfuricAcid.getFluid(1000))
+                .duration(1200).EUt(2).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .input(dust, Gallium)
-            .input(dust, Arsenic)
-            .output(dust, GalliumArsenide, 2)
-            .duration(300).EUt(30).buildAndRegister();
+                .input(dust, Gallium)
+                .input(dust, Arsenic)
+                .output(dust, GalliumArsenide, 2)
+                .duration(300).EUt(30).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .input(dust, Salt, 2)
-            .fluidInputs(Water.getFluid(1000))
-            .fluidOutputs(SaltWater.getFluid(1000))
-            .duration(40).EUt(8).buildAndRegister();
+                .input(dust, Salt, 2)
+                .fluidInputs(Water.getFluid(1000))
+                .fluidOutputs(SaltWater.getFluid(1000))
+                .duration(40).EUt(8).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .fluidInputs(BioDiesel.getFluid(1000))
-            .fluidInputs(Tetranitromethane.getFluid(40))
-            .fluidOutputs(NitroDiesel.getFluid(750))
-            .duration(20).EUt(480).buildAndRegister();
+                .fluidInputs(BioDiesel.getFluid(1000))
+                .fluidInputs(Tetranitromethane.getFluid(40))
+                .fluidOutputs(NitroDiesel.getFluid(750))
+                .duration(20).EUt(480).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .fluidInputs(Diesel.getFluid(1000))
-            .fluidInputs(Tetranitromethane.getFluid(20))
-            .fluidOutputs(NitroDiesel.getFluid(1000))
-            .duration(20).EUt(480).buildAndRegister();
+                .fluidInputs(Diesel.getFluid(1000))
+                .fluidInputs(Tetranitromethane.getFluid(20))
+                .fluidOutputs(NitroDiesel.getFluid(1000))
+                .duration(20).EUt(480).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidInputs(Dimethylhydrazine.getFluid(1000))
-            .fluidOutputs(RocketFuel.getFluid(3000))
-            .duration(60).EUt(16).buildAndRegister();
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidInputs(Dimethylhydrazine.getFluid(1000))
+                .fluidOutputs(RocketFuel.getFluid(3000))
+                .duration(60).EUt(16).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .fluidInputs(DinitrogenTetroxide.getFluid(1000))
-            .fluidInputs(Dimethylhydrazine.getFluid(1000))
-            .fluidOutputs(RocketFuel.getFluid(6000))
-            .duration(60).EUt(16).buildAndRegister();
+                .fluidInputs(DinitrogenTetroxide.getFluid(1000))
+                .fluidInputs(Dimethylhydrazine.getFluid(1000))
+                .fluidOutputs(RocketFuel.getFluid(6000))
+                .duration(60).EUt(16).buildAndRegister();
 
         MIXER_RECIPES.recipeBuilder()
-            .fluidInputs(LightFuel.getFluid(5000))
-            .fluidInputs(HeavyFuel.getFluid(1000))
-            .fluidOutputs(Diesel.getFluid(6000))
-            .duration(16).EUt(120).buildAndRegister();
+                .fluidInputs(LightFuel.getFluid(5000))
+                .fluidInputs(HeavyFuel.getFluid(1000))
+                .fluidOutputs(Diesel.getFluid(6000))
+                .duration(16).EUt(120).buildAndRegister();
 
         // Alloys
         MIXER_RECIPES.recipeBuilder().duration(600).EUt(1920)
diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java
index 65130588f56..b82a69831fa 100644
--- a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java
+++ b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java
@@ -19,239 +19,239 @@ public class ReactorRecipes {
     public static void init() {
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Isoprene.getFluid(144))
-            .fluidInputs(Air.getFluid(2000))
-            .output(dust, RawRubber)
-            .duration(160).EUt(30).buildAndRegister();
+                .fluidInputs(Isoprene.getFluid(144))
+                .fluidInputs(Air.getFluid(2000))
+                .output(dust, RawRubber)
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Isoprene.getFluid(144))
-            .fluidInputs(Oxygen.getFluid(2000))
-            .output(dust, RawRubber, 3)
-            .duration(160).EUt(30).buildAndRegister();
+                .fluidInputs(Isoprene.getFluid(144))
+                .fluidInputs(Oxygen.getFluid(2000))
+                .output(dust, RawRubber, 3)
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Butadiene.getFluid(3000))
-            .fluidInputs(Styrene.getFluid(1000))
-            .fluidInputs(Air.getFluid(15000))
-            .output(dust, RawStyreneButadieneRubber, 27)
-            .duration(480).EUt(240).buildAndRegister();
+                .fluidInputs(Butadiene.getFluid(3000))
+                .fluidInputs(Styrene.getFluid(1000))
+                .fluidInputs(Air.getFluid(15000))
+                .output(dust, RawStyreneButadieneRubber, 27)
+                .duration(480).EUt(240).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Butadiene.getFluid(3000))
-            .fluidInputs(Styrene.getFluid(1000))
-            .fluidInputs(Oxygen.getFluid(15000))
-            .output(dust, RawStyreneButadieneRubber, 41)
-            .duration(480).EUt(240).buildAndRegister();
+                .fluidInputs(Butadiene.getFluid(3000))
+                .fluidInputs(Styrene.getFluid(1000))
+                .fluidInputs(Oxygen.getFluid(15000))
+                .output(dust, RawStyreneButadieneRubber, 41)
+                .duration(480).EUt(240).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, RawStyreneButadieneRubber, 9)
-            .input(dust, Sulfur)
-            .fluidOutputs(StyreneButadieneRubber.getFluid(1296))
-            .duration(600).EUt(30).buildAndRegister();
+                .input(dust, RawStyreneButadieneRubber, 9)
+                .input(dust, Sulfur)
+                .fluidOutputs(StyreneButadieneRubber.getFluid(1296))
+                .duration(600).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Propene.getFluid(2000))
-            .fluidOutputs(Methane.getFluid(1000))
-            .fluidOutputs(Isoprene.getFluid(1000))
-            .duration(120).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Propene.getFluid(2000))
+                .fluidOutputs(Methane.getFluid(1000))
+                .fluidOutputs(Isoprene.getFluid(1000))
+                .duration(120).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .input(dust, Carbon)
-            .fluidInputs(Hydrogen.getFluid(4000))
-            .fluidOutputs(Methane.getFluid(1000))
-            .duration(3500).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .input(dust, Carbon)
+                .fluidInputs(Hydrogen.getFluid(4000))
+                .fluidOutputs(Methane.getFluid(1000))
+                .duration(3500).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Ethylene.getFluid(1000))
-            .fluidInputs(Propene.getFluid(1000))
-            .fluidOutputs(Hydrogen.getFluid(2000))
-            .fluidOutputs(Isoprene.getFluid(1000))
-            .duration(120).EUt(30).buildAndRegister();
+                .fluidInputs(Ethylene.getFluid(1000))
+                .fluidInputs(Propene.getFluid(1000))
+                .fluidOutputs(Hydrogen.getFluid(2000))
+                .fluidOutputs(Isoprene.getFluid(1000))
+                .duration(120).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, SodiumSulfide, 3)
-            .fluidInputs(Dichlorobenzene.getFluid(1000))
-            .fluidInputs(Air.getFluid(16000))
-            .output(dust, Salt, 2)
-            .fluidOutputs(PolyphenyleneSulfide.getFluid(1000))
-            .duration(240).EUt(360).buildAndRegister();
+                .input(dust, SodiumSulfide, 3)
+                .fluidInputs(Dichlorobenzene.getFluid(1000))
+                .fluidInputs(Air.getFluid(16000))
+                .output(dust, Salt, 2)
+                .fluidOutputs(PolyphenyleneSulfide.getFluid(1000))
+                .duration(240).EUt(360).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, SodiumSulfide, 3)
-            .fluidInputs(Dichlorobenzene.getFluid(1000))
-            .fluidInputs(Oxygen.getFluid(8000))
-            .output(dust, Salt, 2)
-            .fluidOutputs(PolyphenyleneSulfide.getFluid(1500))
-            .duration(240).EUt(360).buildAndRegister();
+                .input(dust, SodiumSulfide, 3)
+                .fluidInputs(Dichlorobenzene.getFluid(1000))
+                .fluidInputs(Oxygen.getFluid(8000))
+                .output(dust, Salt, 2)
+                .fluidOutputs(PolyphenyleneSulfide.getFluid(1500))
+                .duration(240).EUt(360).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Air.getFluid(1000))
-            .fluidInputs(Ethylene.getFluid(144))
-            .fluidOutputs(Polyethylene.getFluid(144))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Air.getFluid(1000))
+                .fluidInputs(Ethylene.getFluid(144))
+                .fluidOutputs(Polyethylene.getFluid(144))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidInputs(Ethylene.getFluid(144))
-            .fluidOutputs(Polyethylene.getFluid(216))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidInputs(Ethylene.getFluid(144))
+                .fluidOutputs(Polyethylene.getFluid(216))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Air.getFluid(7500))
-            .fluidInputs(Ethylene.getFluid(2160))
-            .fluidInputs(TitaniumTetrachloride.getFluid(100))
-            .fluidOutputs(Polyethylene.getFluid(3240))
-            .duration(800).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Air.getFluid(7500))
+                .fluidInputs(Ethylene.getFluid(2160))
+                .fluidInputs(TitaniumTetrachloride.getFluid(100))
+                .fluidOutputs(Polyethylene.getFluid(3240))
+                .duration(800).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Oxygen.getFluid(7500))
-            .fluidInputs(Ethylene.getFluid(2160))
-            .fluidInputs(TitaniumTetrachloride.getFluid(100))
-            .fluidOutputs(Polyethylene.getFluid(4320))
-            .duration(800).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Oxygen.getFluid(7500))
+                .fluidInputs(Ethylene.getFluid(2160))
+                .fluidInputs(TitaniumTetrachloride.getFluid(100))
+                .fluidOutputs(Polyethylene.getFluid(4320))
+                .duration(800).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Air.getFluid(1000))
-            .fluidInputs(VinylChloride.getFluid(144))
-            .fluidOutputs(PolyvinylChloride.getFluid(144))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Air.getFluid(1000))
+                .fluidInputs(VinylChloride.getFluid(144))
+                .fluidOutputs(PolyvinylChloride.getFluid(144))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidInputs(VinylChloride.getFluid(144))
-            .fluidOutputs(PolyvinylChloride.getFluid(216))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidInputs(VinylChloride.getFluid(144))
+                .fluidOutputs(PolyvinylChloride.getFluid(216))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Air.getFluid(7500))
-            .fluidInputs(VinylChloride.getFluid(2160))
-            .fluidInputs(TitaniumTetrachloride.getFluid(100))
-            .fluidOutputs(PolyvinylChloride.getFluid(3240))
-            .duration(800).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Air.getFluid(7500))
+                .fluidInputs(VinylChloride.getFluid(2160))
+                .fluidInputs(TitaniumTetrachloride.getFluid(100))
+                .fluidOutputs(PolyvinylChloride.getFluid(3240))
+                .duration(800).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Oxygen.getFluid(7500))
-            .fluidInputs(VinylChloride.getFluid(2160))
-            .fluidInputs(TitaniumTetrachloride.getFluid(100))
-            .fluidOutputs(PolyvinylChloride.getFluid(4320))
-            .duration(800).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Oxygen.getFluid(7500))
+                .fluidInputs(VinylChloride.getFluid(2160))
+                .fluidInputs(TitaniumTetrachloride.getFluid(100))
+                .fluidOutputs(PolyvinylChloride.getFluid(4320))
+                .duration(800).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Polydimethylsiloxane, 9)
-            .input(dust, Sulfur)
-            .fluidOutputs(SiliconeRubber.getFluid(1296))
-            .duration(600).EUt(30).buildAndRegister();
+                .input(dust, Polydimethylsiloxane, 9)
+                .input(dust, Sulfur)
+                .fluidOutputs(SiliconeRubber.getFluid(1296))
+                .duration(600).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(HydrochloricAcid.getFluid(1000))
-            .fluidInputs(Acetone.getFluid(1000))
-            .fluidInputs(Phenol.getFluid(2000))
-            .fluidOutputs(BisphenolA.getFluid(1000))
-            .fluidOutputs(DilutedHydrochloricAcid.getFluid(1000))
-            .duration(160).EUt(30).buildAndRegister();
+                .fluidInputs(HydrochloricAcid.getFluid(1000))
+                .fluidInputs(Acetone.getFluid(1000))
+                .fluidInputs(Phenol.getFluid(2000))
+                .fluidOutputs(BisphenolA.getFluid(1000))
+                .fluidOutputs(DilutedHydrochloricAcid.getFluid(1000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(SulfurTrioxide.getFluid(1000))
-            .fluidInputs(Water.getFluid(1000))
-            .fluidOutputs(SulfuricAcid.getFluid(1000))
-            .duration(320).EUt(8).buildAndRegister();
+                .fluidInputs(SulfurTrioxide.getFluid(1000))
+                .fluidInputs(Water.getFluid(1000))
+                .fluidOutputs(SulfuricAcid.getFluid(1000))
+                .duration(320).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Air.getFluid(1000))
-            .fluidInputs(Tetrafluoroethylene.getFluid(144))
-            .fluidOutputs(Polytetrafluoroethylene.getFluid(144))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Air.getFluid(1000))
+                .fluidInputs(Tetrafluoroethylene.getFluid(144))
+                .fluidOutputs(Polytetrafluoroethylene.getFluid(144))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidInputs(Tetrafluoroethylene.getFluid(144))
-            .fluidOutputs(Polytetrafluoroethylene.getFluid(216))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidInputs(Tetrafluoroethylene.getFluid(144))
+                .fluidOutputs(Polytetrafluoroethylene.getFluid(216))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Air.getFluid(7500))
-            .fluidInputs(Tetrafluoroethylene.getFluid(2160))
-            .fluidInputs(TitaniumTetrachloride.getFluid(100))
-            .fluidOutputs(Polytetrafluoroethylene.getFluid(3240))
-            .duration(800).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Air.getFluid(7500))
+                .fluidInputs(Tetrafluoroethylene.getFluid(2160))
+                .fluidInputs(TitaniumTetrachloride.getFluid(100))
+                .fluidOutputs(Polytetrafluoroethylene.getFluid(3240))
+                .duration(800).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Oxygen.getFluid(7500))
-            .fluidInputs(Tetrafluoroethylene.getFluid(2160))
-            .fluidInputs(TitaniumTetrachloride.getFluid(100))
-            .fluidOutputs(Polytetrafluoroethylene.getFluid(4320))
-            .duration(800).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Oxygen.getFluid(7500))
+                .fluidInputs(Tetrafluoroethylene.getFluid(2160))
+                .fluidInputs(TitaniumTetrachloride.getFluid(100))
+                .fluidOutputs(Polytetrafluoroethylene.getFluid(4320))
+                .duration(800).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, SodiumHydroxide, 3)
-            .fluidInputs(Epichlorohydrin.getFluid(1000))
-            .fluidInputs(BisphenolA.getFluid(1000))
-            .fluidOutputs(Epoxy.getFluid(1000))
-            .fluidOutputs(SaltWater.getFluid(1000))
-            .duration(200).EUt(30).buildAndRegister();
+                .input(dust, SodiumHydroxide, 3)
+                .fluidInputs(Epichlorohydrin.getFluid(1000))
+                .fluidInputs(BisphenolA.getFluid(1000))
+                .fluidOutputs(Epoxy.getFluid(1000))
+                .fluidOutputs(SaltWater.getFluid(1000))
+                .duration(200).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Carbon, 2)
-            .input(dust, Rutile, 3)
-            .fluidInputs(Chlorine.getFluid(4000))
-            .fluidOutputs(CarbonMonoxide.getFluid(2000))
-            .fluidOutputs(TitaniumTetrachloride.getFluid(1000))
-            .duration(500).EUt(480).buildAndRegister();
+                .input(dust, Carbon, 2)
+                .input(dust, Rutile, 3)
+                .fluidInputs(Chlorine.getFluid(4000))
+                .fluidOutputs(CarbonMonoxide.getFluid(2000))
+                .fluidOutputs(TitaniumTetrachloride.getFluid(1000))
+                .duration(500).EUt(480).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Dimethyldichlorosilane.getFluid(1000))
-            .fluidInputs(Water.getFluid(1000))
-            .output(dust, Polydimethylsiloxane, 3)
-            .fluidOutputs(DilutedHydrochloricAcid.getFluid(1000))
-            .duration(240).EUt(96).buildAndRegister();
+                .fluidInputs(Dimethyldichlorosilane.getFluid(1000))
+                .fluidInputs(Water.getFluid(1000))
+                .output(dust, Polydimethylsiloxane, 3)
+                .fluidOutputs(DilutedHydrochloricAcid.getFluid(1000))
+                .duration(240).EUt(96).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Silicon)
-            .fluidInputs(HydrochloricAcid.getFluid(2000))
-            .fluidInputs(Methanol.getFluid(2000))
-            .output(dust, Polydimethylsiloxane, 3)
-            .fluidOutputs(DilutedHydrochloricAcid.getFluid(2000))
-            .duration(480).EUt(96).buildAndRegister();
+                .input(dust, Silicon)
+                .fluidInputs(HydrochloricAcid.getFluid(2000))
+                .fluidInputs(Methanol.getFluid(2000))
+                .output(dust, Polydimethylsiloxane, 3)
+                .fluidOutputs(DilutedHydrochloricAcid.getFluid(2000))
+                .duration(480).EUt(96).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .input(dust, Silicon)
-            .fluidInputs(Water.getFluid(1000))
-            .fluidInputs(Chlorine.getFluid(4000))
-            .fluidInputs(Methane.getFluid(2000))
-            .output(dust, Polydimethylsiloxane, 3)
-            .fluidOutputs(HydrochloricAcid.getFluid(2000))
-            .fluidOutputs(DilutedHydrochloricAcid.getFluid(2000))
-            .duration(480).EUt(96).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .input(dust, Silicon)
+                .fluidInputs(Water.getFluid(1000))
+                .fluidInputs(Chlorine.getFluid(4000))
+                .fluidInputs(Methane.getFluid(2000))
+                .output(dust, Polydimethylsiloxane, 3)
+                .fluidOutputs(HydrochloricAcid.getFluid(2000))
+                .fluidOutputs(DilutedHydrochloricAcid.getFluid(2000))
+                .duration(480).EUt(96).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Chlorine.getFluid(1000))
-            .fluidInputs(Hydrogen.getFluid(1000))
-            .fluidOutputs(HydrochloricAcid.getFluid(1000))
-            .duration(60).EUt(8).buildAndRegister();
+                .fluidInputs(Chlorine.getFluid(1000))
+                .fluidInputs(Hydrogen.getFluid(1000))
+                .fluidOutputs(HydrochloricAcid.getFluid(1000))
+                .duration(60).EUt(8).buildAndRegister();
 
         // NaCl + H2SO4 -> NaHSO4 + HCl
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Salt, 2)
-            .fluidInputs(SulfuricAcid.getFluid(1000))
-            .output(dust, SodiumBisulfate, 7)
-            .fluidOutputs(HydrochloricAcid.getFluid(1000))
-            .duration(60).EUt(30).buildAndRegister();
+                .input(dust, Salt, 2)
+                .fluidInputs(SulfuricAcid.getFluid(1000))
+                .output(dust, SodiumBisulfate, 7)
+                .fluidOutputs(HydrochloricAcid.getFluid(1000))
+                .duration(60).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
                 .input(dust, Iron)
@@ -262,20 +262,20 @@ public static void init() {
                 .buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Chlorine.getFluid(6000))
-            .fluidInputs(Methane.getFluid(1000))
-            .fluidOutputs(HydrochloricAcid.getFluid(3000))
-            .fluidOutputs(Chloroform.getFluid(1000))
-            .duration(80).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Chlorine.getFluid(6000))
+                .fluidInputs(Methane.getFluid(1000))
+                .fluidOutputs(HydrochloricAcid.getFluid(3000))
+                .fluidOutputs(Chloroform.getFluid(1000))
+                .duration(80).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(3))
-            .fluidInputs(Chlorine.getFluid(2000))
-            .fluidInputs(Methane.getFluid(1000))
-            .fluidOutputs(HydrochloricAcid.getFluid(1000))
-            .fluidOutputs(Chloromethane.getFluid(1000))
-            .duration(80).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(3))
+                .fluidInputs(Chlorine.getFluid(2000))
+                .fluidInputs(Methane.getFluid(1000))
+                .fluidOutputs(HydrochloricAcid.getFluid(1000))
+                .fluidOutputs(Chloromethane.getFluid(1000))
+                .duration(80).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
                 .fluidInputs(Chlorine.getFluid(4000))
@@ -286,322 +286,322 @@ public static void init() {
                 .duration(120).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Propene.getFluid(1000))
-            .fluidInputs(Chlorine.getFluid(2000))
-            .fluidOutputs(HydrochloricAcid.getFluid(1000))
-            .fluidOutputs(AllylChloride.getFluid(1000))
-            .duration(160).EUt(30).buildAndRegister();
+                .fluidInputs(Propene.getFluid(1000))
+                .fluidInputs(Chlorine.getFluid(2000))
+                .fluidOutputs(HydrochloricAcid.getFluid(1000))
+                .fluidOutputs(AllylChloride.getFluid(1000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Chlorine.getFluid(2000))
-            .fluidInputs(Ethylene.getFluid(1000))
-            .fluidOutputs(VinylChloride.getFluid(1000))
-            .fluidOutputs(HydrochloricAcid.getFluid(1000))
-            .duration(160).EUt(30).buildAndRegister();
+                .fluidInputs(Chlorine.getFluid(2000))
+                .fluidInputs(Ethylene.getFluid(1000))
+                .fluidOutputs(VinylChloride.getFluid(1000))
+                .fluidOutputs(HydrochloricAcid.getFluid(1000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Apatite, 9)
-            .fluidInputs(SulfuricAcid.getFluid(5000))
-            .fluidInputs(Water.getFluid(10000))
-            .output(dust, Gypsum, 40)
-            .fluidOutputs(HydrochloricAcid.getFluid(1000))
-            .fluidOutputs(PhosphoricAcid.getFluid(3000))
-            .duration(320).EUt(30).buildAndRegister();
+                .input(dust, Apatite, 9)
+                .fluidInputs(SulfuricAcid.getFluid(5000))
+                .fluidInputs(Water.getFluid(10000))
+                .output(dust, Gypsum, 40)
+                .fluidOutputs(HydrochloricAcid.getFluid(1000))
+                .fluidOutputs(PhosphoricAcid.getFluid(3000))
+                .duration(320).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(SulfurDioxide.getFluid(1000))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidOutputs(SulfurTrioxide.getFluid(1000))
-            .duration(200).EUt(30).buildAndRegister();
+                .fluidInputs(SulfurDioxide.getFluid(1000))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidOutputs(SulfurTrioxide.getFluid(1000))
+                .duration(200).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(3))
-            .input(dust, Sulfur)
-            .fluidInputs(Oxygen.getFluid(3000))
-            .fluidOutputs(SulfurTrioxide.getFluid(1000))
-            .duration(280).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(3))
+                .input(dust, Sulfur)
+                .fluidInputs(Oxygen.getFluid(3000))
+                .fluidOutputs(SulfurTrioxide.getFluid(1000))
+                .duration(280).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Chloroform.getFluid(2000))
-            .fluidInputs(HydrofluoricAcid.getFluid(4000))
-            .fluidOutputs(HydrochloricAcid.getFluid(6000))
-            .fluidOutputs(Tetrafluoroethylene.getFluid(1000))
-            .duration(240).EUt(256).buildAndRegister();
+                .fluidInputs(Chloroform.getFluid(2000))
+                .fluidInputs(HydrofluoricAcid.getFluid(4000))
+                .fluidOutputs(HydrochloricAcid.getFluid(6000))
+                .fluidOutputs(Tetrafluoroethylene.getFluid(1000))
+                .duration(240).EUt(256).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .input(dust, Sodium)
-            .fluidInputs(Water.getFluid(1000))
-            .output(dust, SodiumHydroxide, 3)
-            .fluidOutputs(Hydrogen.getFluid(1000))
-            .duration(40).EUt(8).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .input(dust, Sodium)
+                .fluidInputs(Water.getFluid(1000))
+                .output(dust, SodiumHydroxide, 3)
+                .fluidOutputs(Hydrogen.getFluid(1000))
+                .duration(40).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Air.getFluid(1000))
-            .fluidInputs(Styrene.getFluid(144))
-            .fluidOutputs(Polystyrene.getFluid(144))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Air.getFluid(1000))
+                .fluidInputs(Styrene.getFluid(144))
+                .fluidOutputs(Polystyrene.getFluid(144))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidInputs(Styrene.getFluid(144))
-            .fluidOutputs(Polystyrene.getFluid(216))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidInputs(Styrene.getFluid(144))
+                .fluidOutputs(Polystyrene.getFluid(216))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Air.getFluid(7500))
-            .fluidInputs(Styrene.getFluid(2160))
-            .fluidInputs(TitaniumTetrachloride.getFluid(100))
-            .fluidOutputs(Polystyrene.getFluid(3240))
-            .duration(800).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Air.getFluid(7500))
+                .fluidInputs(Styrene.getFluid(2160))
+                .fluidInputs(TitaniumTetrachloride.getFluid(100))
+                .fluidOutputs(Polystyrene.getFluid(3240))
+                .duration(800).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Oxygen.getFluid(7500))
-            .fluidInputs(Styrene.getFluid(2160))
-            .fluidInputs(TitaniumTetrachloride.getFluid(100))
-            .fluidOutputs(Polystyrene.getFluid(4320))
-            .duration(800).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Oxygen.getFluid(7500))
+                .fluidInputs(Styrene.getFluid(2160))
+                .fluidInputs(TitaniumTetrachloride.getFluid(100))
+                .fluidOutputs(Polystyrene.getFluid(4320))
+                .duration(800).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(3))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidInputs(HydrochloricAcid.getFluid(1000))
-            .fluidInputs(Ethylene.getFluid(1000))
-            .fluidOutputs(Water.getFluid(1000))
-            .fluidOutputs(VinylChloride.getFluid(1000))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(3))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidInputs(HydrochloricAcid.getFluid(1000))
+                .fluidInputs(Ethylene.getFluid(1000))
+                .fluidOutputs(Water.getFluid(1000))
+                .fluidOutputs(VinylChloride.getFluid(1000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Oxygen.getFluid(2000))
-            .fluidInputs(Cumene.getFluid(1000))
-            .fluidOutputs(Phenol.getFluid(1000))
-            .fluidOutputs(Acetone.getFluid(1000))
-            .duration(160).EUt(30).buildAndRegister();
+                .fluidInputs(Oxygen.getFluid(2000))
+                .fluidInputs(Cumene.getFluid(1000))
+                .fluidOutputs(Phenol.getFluid(1000))
+                .fluidOutputs(Acetone.getFluid(1000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(NitrationMixture.getFluid(3000))
-            .fluidInputs(Glycerol.getFluid(1000))
-            .fluidOutputs(GlycerylTrinitrate.getFluid(1000))
-            .fluidOutputs(DilutedSulfuricAcid.getFluid(3000))
-            .duration(180).EUt(30).buildAndRegister();
+                .fluidInputs(NitrationMixture.getFluid(3000))
+                .fluidInputs(Glycerol.getFluid(1000))
+                .fluidOutputs(GlycerylTrinitrate.getFluid(1000))
+                .fluidOutputs(DilutedSulfuricAcid.getFluid(3000))
+                .duration(180).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(SulfuricAcid.getFluid(1000))
-            .fluidInputs(AceticAcid.getFluid(1000))
-            .fluidOutputs(Ethenone.getFluid(1000))
-            .fluidOutputs(DilutedSulfuricAcid.getFluid(1000))
-            .duration(160).EUt(120).buildAndRegister();
+                .fluidInputs(SulfuricAcid.getFluid(1000))
+                .fluidInputs(AceticAcid.getFluid(1000))
+                .fluidOutputs(Ethenone.getFluid(1000))
+                .fluidOutputs(DilutedSulfuricAcid.getFluid(1000))
+                .duration(160).EUt(120).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Calcite, 5)
-            .fluidInputs(AceticAcid.getFluid(2000))
-            .fluidOutputs(DissolvedCalciumAcetate.getFluid(1000))
-            .fluidOutputs(CarbonDioxide.getFluid(1000))
-            .duration(200).EUt(120).buildAndRegister();
+                .input(dust, Calcite, 5)
+                .fluidInputs(AceticAcid.getFluid(2000))
+                .fluidOutputs(DissolvedCalciumAcetate.getFluid(1000))
+                .fluidOutputs(CarbonDioxide.getFluid(1000))
+                .duration(200).EUt(120).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Quicklime, 2)
-            .fluidInputs(AceticAcid.getFluid(2000))
-            .fluidOutputs(DissolvedCalciumAcetate.getFluid(1000))
-            .duration(400).EUt(380).buildAndRegister();
+                .input(dust, Quicklime, 2)
+                .fluidInputs(AceticAcid.getFluid(2000))
+                .fluidOutputs(DissolvedCalciumAcetate.getFluid(1000))
+                .duration(400).EUt(380).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Calcium)
-            .fluidInputs(AceticAcid.getFluid(2000))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidOutputs(DissolvedCalciumAcetate.getFluid(1000))
-            .duration(400).EUt(380).buildAndRegister();
+                .input(dust, Calcium)
+                .fluidInputs(AceticAcid.getFluid(2000))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidOutputs(DissolvedCalciumAcetate.getFluid(1000))
+                .duration(400).EUt(380).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Methanol.getFluid(1000))
-            .fluidInputs(AceticAcid.getFluid(1000))
-            .fluidOutputs(MethylAcetate.getFluid(1000))
-            .fluidOutputs(Water.getFluid(1000))
-            .duration(240).EUt(30).buildAndRegister();
+                .fluidInputs(Methanol.getFluid(1000))
+                .fluidInputs(AceticAcid.getFluid(1000))
+                .fluidOutputs(MethylAcetate.getFluid(1000))
+                .fluidOutputs(Water.getFluid(1000))
+                .duration(240).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Glycerol.getFluid(1000))
-            .fluidInputs(HydrochloricAcid.getFluid(1000))
-            .fluidOutputs(Water.getFluid(2000))
-            .fluidOutputs(Epichlorohydrin.getFluid(1000))
-            .duration(480).EUt(30).buildAndRegister();
+                .fluidInputs(Glycerol.getFluid(1000))
+                .fluidInputs(HydrochloricAcid.getFluid(1000))
+                .fluidOutputs(Water.getFluid(2000))
+                .fluidOutputs(Epichlorohydrin.getFluid(1000))
+                .duration(480).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, SodiumHydroxide, 3)
-            .fluidInputs(AllylChloride.getFluid(1000))
-            .fluidInputs(HypochlorousAcid.getFluid(1000))
-            .fluidOutputs(SaltWater.getFluid(1000))
-            .fluidOutputs(Epichlorohydrin.getFluid(1000))
-            .duration(480).EUt(30).buildAndRegister();
+                .input(dust, SodiumHydroxide, 3)
+                .fluidInputs(AllylChloride.getFluid(1000))
+                .fluidInputs(HypochlorousAcid.getFluid(1000))
+                .fluidOutputs(SaltWater.getFluid(1000))
+                .fluidOutputs(Epichlorohydrin.getFluid(1000))
+                .duration(480).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Sulfur)
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidOutputs(HydrogenSulfide.getFluid(1000))
-            .duration(60).EUt(8).buildAndRegister();
+                .input(dust, Sulfur)
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidOutputs(HydrogenSulfide.getFluid(1000))
+                .duration(60).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(SulfuricLightFuel.getFluid(12000))
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidOutputs(HydrogenSulfide.getFluid(1000))
-            .fluidOutputs(LightFuel.getFluid(12000))
-            .duration(160).EUt(30).buildAndRegister();
+                .fluidInputs(SulfuricLightFuel.getFluid(12000))
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidOutputs(HydrogenSulfide.getFluid(1000))
+                .fluidOutputs(LightFuel.getFluid(12000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(SulfuricHeavyFuel.getFluid(8000))
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidOutputs(HydrogenSulfide.getFluid(1000))
-            .fluidOutputs(HeavyFuel.getFluid(8000))
-            .duration(160).EUt(30).buildAndRegister();
+                .fluidInputs(SulfuricHeavyFuel.getFluid(8000))
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidOutputs(HydrogenSulfide.getFluid(1000))
+                .fluidOutputs(HeavyFuel.getFluid(8000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(SulfuricNaphtha.getFluid(12000))
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidOutputs(HydrogenSulfide.getFluid(1000))
-            .fluidOutputs(Naphtha.getFluid(12000))
-            .duration(160).EUt(30).buildAndRegister();
+                .fluidInputs(SulfuricNaphtha.getFluid(12000))
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidOutputs(HydrogenSulfide.getFluid(1000))
+                .fluidOutputs(Naphtha.getFluid(12000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(SulfuricGas.getFluid(16000))
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidOutputs(HydrogenSulfide.getFluid(1000))
-            .fluidOutputs(RefineryGas.getFluid(16000))
-            .duration(160).EUt(30).buildAndRegister();
+                .fluidInputs(SulfuricGas.getFluid(16000))
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidOutputs(HydrogenSulfide.getFluid(1000))
+                .fluidOutputs(RefineryGas.getFluid(16000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(NaturalGas.getFluid(16000))
-            .fluidInputs(Hydrogen.getFluid(2000))
-            .fluidOutputs(HydrogenSulfide.getFluid(1000))
-            .fluidOutputs(RefineryGas.getFluid(16000))
-            .duration(160).EUt(30).buildAndRegister();
+                .fluidInputs(NaturalGas.getFluid(16000))
+                .fluidInputs(Hydrogen.getFluid(2000))
+                .fluidOutputs(HydrogenSulfide.getFluid(1000))
+                .fluidOutputs(RefineryGas.getFluid(16000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Nitrogen.getFluid(1000))
-            .fluidInputs(Oxygen.getFluid(2000))
-            .fluidOutputs(NitrogenDioxide.getFluid(1000))
-            .duration(1250).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Nitrogen.getFluid(1000))
+                .fluidInputs(Oxygen.getFluid(2000))
+                .fluidOutputs(NitrogenDioxide.getFluid(1000))
+                .duration(1250).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidInputs(NitricOxide.getFluid(1000))
-            .fluidOutputs(NitrogenDioxide.getFluid(1000))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidInputs(NitricOxide.getFluid(1000))
+                .fluidOutputs(NitrogenDioxide.getFluid(1000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Air.getFluid(1000))
-            .fluidInputs(VinylAcetate.getFluid(144))
-            .fluidOutputs(PolyvinylAcetate.getFluid(144))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Air.getFluid(1000))
+                .fluidInputs(VinylAcetate.getFluid(144))
+                .fluidOutputs(PolyvinylAcetate.getFluid(144))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidInputs(VinylAcetate.getFluid(144))
-            .fluidOutputs(PolyvinylAcetate.getFluid(216))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidInputs(VinylAcetate.getFluid(144))
+                .fluidOutputs(PolyvinylAcetate.getFluid(216))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Air.getFluid(7500))
-            .fluidInputs(VinylAcetate.getFluid(2160))
-            .fluidInputs(TitaniumTetrachloride.getFluid(100))
-            .fluidOutputs(PolyvinylAcetate.getFluid(3240))
-            .duration(800).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Air.getFluid(7500))
+                .fluidInputs(VinylAcetate.getFluid(2160))
+                .fluidInputs(TitaniumTetrachloride.getFluid(100))
+                .fluidOutputs(PolyvinylAcetate.getFluid(3240))
+                .duration(800).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Oxygen.getFluid(7500))
-            .fluidInputs(VinylAcetate.getFluid(2160))
-            .fluidInputs(TitaniumTetrachloride.getFluid(100))
-            .fluidOutputs(PolyvinylAcetate.getFluid(4320))
-            .duration(800).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Oxygen.getFluid(7500))
+                .fluidInputs(VinylAcetate.getFluid(2160))
+                .fluidInputs(TitaniumTetrachloride.getFluid(100))
+                .fluidOutputs(PolyvinylAcetate.getFluid(4320))
+                .duration(800).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(6000))
-            .fluidInputs(CarbonDioxide.getFluid(1000))
-            .fluidOutputs(Water.getFluid(1000))
-            .fluidOutputs(Methanol.getFluid(1000))
-            .duration(120).EUt(96).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(6000))
+                .fluidInputs(CarbonDioxide.getFluid(1000))
+                .fluidOutputs(Water.getFluid(1000))
+                .fluidOutputs(Methanol.getFluid(1000))
+                .duration(120).EUt(96).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Hydrogen.getFluid(4000))
-            .fluidInputs(CarbonMonoxide.getFluid(1000))
-            .fluidOutputs(Methanol.getFluid(1000))
-            .duration(120).EUt(96).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Hydrogen.getFluid(4000))
+                .fluidInputs(CarbonMonoxide.getFluid(1000))
+                .fluidOutputs(Methanol.getFluid(1000))
+                .duration(120).EUt(96).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(3))
-            .input(dust, Carbon)
-            .fluidInputs(Hydrogen.getFluid(4000))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidOutputs(Methanol.getFluid(1000))
-            .duration(320).EUt(96).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(3))
+                .input(dust, Carbon)
+                .fluidInputs(Hydrogen.getFluid(4000))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidOutputs(Methanol.getFluid(1000))
+                .duration(320).EUt(96).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Mercury.getFluid(1000))
-            .fluidInputs(Water.getFluid(10000))
-            .fluidInputs(Chlorine.getFluid(10000))
-            .fluidOutputs(HypochlorousAcid.getFluid(10000))
-            .duration(600).EUt(8).buildAndRegister();
+                .fluidInputs(Mercury.getFluid(1000))
+                .fluidInputs(Water.getFluid(10000))
+                .fluidInputs(Chlorine.getFluid(10000))
+                .fluidOutputs(HypochlorousAcid.getFluid(10000))
+                .duration(600).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Water.getFluid(1000))
-            .fluidInputs(Chlorine.getFluid(2000))
-            .fluidOutputs(HydrochloricAcid.getFluid(1000))
-            .fluidOutputs(HypochlorousAcid.getFluid(1000))
-            .duration(120).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Water.getFluid(1000))
+                .fluidInputs(Chlorine.getFluid(2000))
+                .fluidOutputs(HydrochloricAcid.getFluid(1000))
+                .fluidOutputs(HypochlorousAcid.getFluid(1000))
+                .duration(120).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Dimethylamine.getFluid(1000))
-            .fluidInputs(Monochloramine.getFluid(1000))
-            .fluidOutputs(Dimethylhydrazine.getFluid(1000))
-            .fluidOutputs(HydrochloricAcid.getFluid(1000))
-            .duration(960).EUt(480).buildAndRegister();
+                .fluidInputs(Dimethylamine.getFluid(1000))
+                .fluidInputs(Monochloramine.getFluid(1000))
+                .fluidOutputs(Dimethylhydrazine.getFluid(1000))
+                .fluidOutputs(HydrochloricAcid.getFluid(1000))
+                .duration(960).EUt(480).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Methanol.getFluid(2000))
-            .fluidInputs(Ammonia.getFluid(2000))
-            .fluidInputs(HypochlorousAcid.getFluid(1000))
-            .fluidOutputs(Dimethylhydrazine.getFluid(1000))
-            .fluidOutputs(DilutedHydrochloricAcid.getFluid(2000))
-            .duration(1040).EUt(480).buildAndRegister();
+                .fluidInputs(Methanol.getFluid(2000))
+                .fluidInputs(Ammonia.getFluid(2000))
+                .fluidInputs(HypochlorousAcid.getFluid(1000))
+                .fluidOutputs(Dimethylhydrazine.getFluid(1000))
+                .fluidOutputs(DilutedHydrochloricAcid.getFluid(2000))
+                .duration(1040).EUt(480).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .input(dust, Sulfur)
-            .fluidInputs(Oxygen.getFluid(2000))
-            .fluidOutputs(SulfurDioxide.getFluid(1000))
-            .duration(60).EUt(8).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .input(dust, Sulfur)
+                .fluidInputs(Oxygen.getFluid(2000))
+                .fluidOutputs(SulfurDioxide.getFluid(1000))
+                .duration(60).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Oxygen.getFluid(3000))
-            .fluidInputs(HydrogenSulfide.getFluid(1000))
-            .fluidOutputs(Water.getFluid(1000))
-            .fluidOutputs(SulfurDioxide.getFluid(1000))
-            .duration(120).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Oxygen.getFluid(3000))
+                .fluidInputs(HydrogenSulfide.getFluid(1000))
+                .fluidOutputs(Water.getFluid(1000))
+                .fluidOutputs(SulfurDioxide.getFluid(1000))
+                .duration(120).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Hydrogen.getFluid(1000))
-            .fluidInputs(Fluorine.getFluid(1000))
-            .fluidOutputs(HydrofluoricAcid.getFluid(1000))
-            .duration(60).EUt(8).buildAndRegister();
+                .fluidInputs(Hydrogen.getFluid(1000))
+                .fluidInputs(Fluorine.getFluid(1000))
+                .fluidOutputs(HydrofluoricAcid.getFluid(1000))
+                .duration(60).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Ethylene.getFluid(1000))
-            .fluidInputs(Benzene.getFluid(1000))
-            .fluidOutputs(Hydrogen.getFluid(2000))
-            .fluidOutputs(Styrene.getFluid(1000))
-            .duration(120).EUt(30).buildAndRegister();
+                .fluidInputs(Ethylene.getFluid(1000))
+                .fluidInputs(Benzene.getFluid(1000))
+                .fluidOutputs(Hydrogen.getFluid(2000))
+                .fluidOutputs(Styrene.getFluid(1000))
+                .duration(120).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
                 .fluidInputs(Ethylbenzene.getFluid(1000))
@@ -611,228 +611,228 @@ public static void init() {
                 .buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(PhosphoricAcid.getFluid(0))
-            .fluidInputs(Benzene.getFluid(8000))
-            .fluidInputs(Propene.getFluid(8000))
-            .fluidOutputs(Cumene.getFluid(8000))
-            .duration(1920).EUt(30).buildAndRegister();
-
-        CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Silicon)
-            .fluidInputs(Chloromethane.getFluid(2000))
-            .fluidOutputs(Dimethyldichlorosilane.getFluid(1000))
-            .duration(240).EUt(96).buildAndRegister();
+                .notConsumable(PhosphoricAcid.getFluid(0))
+                .fluidInputs(Benzene.getFluid(8000))
+                .fluidInputs(Propene.getFluid(8000))
+                .fluidOutputs(Cumene.getFluid(8000))
+                .duration(1920).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Oxygen.getFluid(2000))
-            .fluidInputs(Ethylene.getFluid(1000))
-            .fluidOutputs(AceticAcid.getFluid(1000))
-            .duration(100).EUt(30).buildAndRegister();
+                .input(dust, Silicon)
+                .fluidInputs(Chloromethane.getFluid(2000))
+                .fluidOutputs(Dimethyldichlorosilane.getFluid(1000))
+                .duration(240).EUt(96).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(CarbonMonoxide.getFluid(1000))
-            .fluidInputs(Methanol.getFluid(1000))
-            .fluidOutputs(AceticAcid.getFluid(1000))
-            .duration(300).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Oxygen.getFluid(2000))
+                .fluidInputs(Ethylene.getFluid(1000))
+                .fluidOutputs(AceticAcid.getFluid(1000))
+                .duration(100).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Hydrogen.getFluid(4000))
-            .fluidInputs(CarbonMonoxide.getFluid(2000))
-            .fluidOutputs(AceticAcid.getFluid(1000))
-            .duration(320).EUt(30).buildAndRegister();
+                .fluidInputs(CarbonMonoxide.getFluid(1000))
+                .fluidInputs(Methanol.getFluid(1000))
+                .fluidOutputs(AceticAcid.getFluid(1000))
+                .duration(300).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(4))
-            .input(dust, Carbon, 2)
-            .fluidInputs(Oxygen.getFluid(2000))
-            .fluidInputs(Hydrogen.getFluid(4000))
-            .fluidOutputs(AceticAcid.getFluid(1000))
-            .duration(480).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Hydrogen.getFluid(4000))
+                .fluidInputs(CarbonMonoxide.getFluid(2000))
+                .fluidOutputs(AceticAcid.getFluid(1000))
+                .duration(320).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Aluminium, 4)
-            .fluidInputs(IndiumConcentrate.getFluid(1000))
-            .output(dustTiny, Indium)
-            .fluidOutputs(LeadZincSolution.getFluid(1000))
-            .duration(50).EUt(600).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(4))
+                .input(dust, Carbon, 2)
+                .fluidInputs(Oxygen.getFluid(2000))
+                .fluidInputs(Hydrogen.getFluid(4000))
+                .fluidOutputs(AceticAcid.getFluid(1000))
+                .duration(480).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(NitrogenDioxide.getFluid(3000))
-            .fluidInputs(Water.getFluid(1000))
-            .fluidOutputs(NitricOxide.getFluid(1000))
-            .fluidOutputs(NitricAcid.getFluid(2000))
-            .duration(240).EUt(30).buildAndRegister();
+                .input(dust, Aluminium, 4)
+                .fluidInputs(IndiumConcentrate.getFluid(1000))
+                .output(dustTiny, Indium)
+                .fluidOutputs(LeadZincSolution.getFluid(1000))
+                .duration(50).EUt(600).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Oxygen.getFluid(5000))
-            .fluidInputs(Ammonia.getFluid(2000))
-            .fluidOutputs(NitricOxide.getFluid(2000))
-            .fluidOutputs(Water.getFluid(3000))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(NitrogenDioxide.getFluid(3000))
+                .fluidInputs(Water.getFluid(1000))
+                .fluidOutputs(NitricOxide.getFluid(1000))
+                .fluidOutputs(NitricAcid.getFluid(2000))
+                .duration(240).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(3))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidInputs(AceticAcid.getFluid(1000))
-            .fluidInputs(Ethylene.getFluid(1000))
-            .fluidOutputs(Water.getFluid(1000))
-            .fluidOutputs(VinylAcetate.getFluid(1000))
-            .duration(180).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Oxygen.getFluid(5000))
+                .fluidInputs(Ammonia.getFluid(2000))
+                .fluidOutputs(NitricOxide.getFluid(2000))
+                .fluidOutputs(Water.getFluid(3000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .input(dust, Carbon)
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidOutputs(CarbonMonoxide.getFluid(1000))
-            .duration(40).EUt(8).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(3))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidInputs(AceticAcid.getFluid(1000))
+                .fluidInputs(Ethylene.getFluid(1000))
+                .fluidOutputs(Water.getFluid(1000))
+                .fluidOutputs(VinylAcetate.getFluid(1000))
+                .duration(180).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .input(gem, Charcoal)
-            .fluidInputs(Oxygen.getFluid(1000))
-            .output(dustTiny, Ash)
-            .fluidOutputs(CarbonMonoxide.getFluid(1000))
-            .duration(80).EUt(8).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .input(dust, Carbon)
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidOutputs(CarbonMonoxide.getFluid(1000))
+                .duration(40).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .input(gem, Coal)
-            .fluidInputs(Oxygen.getFluid(1000))
-            .output(dustTiny, Ash)
-            .fluidOutputs(CarbonMonoxide.getFluid(1000))
-            .duration(80).EUt(8).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .input(gem, Charcoal)
+                .fluidInputs(Oxygen.getFluid(1000))
+                .output(dustTiny, Ash)
+                .fluidOutputs(CarbonMonoxide.getFluid(1000))
+                .duration(80).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .input(dust, Charcoal)
-            .fluidInputs(Oxygen.getFluid(1000))
-            .output(dustTiny, Ash)
-            .fluidOutputs(CarbonMonoxide.getFluid(1000))
-            .duration(80).EUt(8).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .input(gem, Coal)
+                .fluidInputs(Oxygen.getFluid(1000))
+                .output(dustTiny, Ash)
+                .fluidOutputs(CarbonMonoxide.getFluid(1000))
+                .duration(80).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .duration(80).EUt(8)
-            .input(dust, Coal)
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .outputs(OreDictUnifier.get(dustTiny, Ash))
-            .fluidOutputs(CarbonMonoxide.getFluid(1000))
-            .buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .input(dust, Charcoal)
+                .fluidInputs(Oxygen.getFluid(1000))
+                .output(dustTiny, Ash)
+                .fluidOutputs(CarbonMonoxide.getFluid(1000))
+                .duration(80).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Carbon)
-            .fluidInputs(CarbonDioxide.getFluid(1000))
-            .fluidOutputs(CarbonMonoxide.getFluid(2000))
-            .duration(800).EUt(8).buildAndRegister();
+                .duration(80).EUt(8)
+                .input(dust, Coal)
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .outputs(OreDictUnifier.get(dustTiny, Ash))
+                .fluidOutputs(CarbonMonoxide.getFluid(1000))
+                .buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Hydrogen.getFluid(3000))
-            .fluidInputs(Nitrogen.getFluid(1000))
-            .fluidOutputs(Ammonia.getFluid(1000))
-            .duration(320).EUt(384).buildAndRegister();
+                .input(dust, Carbon)
+                .fluidInputs(CarbonDioxide.getFluid(1000))
+                .fluidOutputs(CarbonMonoxide.getFluid(2000))
+                .duration(800).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(HypochlorousAcid.getFluid(1000))
-            .fluidInputs(Ammonia.getFluid(1000))
-            .fluidOutputs(Water.getFluid(1000))
-            .fluidOutputs(Monochloramine.getFluid(1000))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Hydrogen.getFluid(3000))
+                .fluidInputs(Nitrogen.getFluid(1000))
+                .fluidOutputs(Ammonia.getFluid(1000))
+                .duration(320).EUt(384).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Ammonia.getFluid(1000))
-            .fluidInputs(Methanol.getFluid(2000))
-            .fluidOutputs(Water.getFluid(2000))
-            .fluidOutputs(Dimethylamine.getFluid(1000))
-            .duration(240).EUt(120).buildAndRegister();
+                .fluidInputs(HypochlorousAcid.getFluid(1000))
+                .fluidInputs(Ammonia.getFluid(1000))
+                .fluidOutputs(Water.getFluid(1000))
+                .fluidOutputs(Monochloramine.getFluid(1000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, PhosphorusPentoxide, 14)
-            .fluidInputs(Water.getFluid(6000))
-            .fluidOutputs(PhosphoricAcid.getFluid(4000))
-            .duration(40).EUt(30).buildAndRegister();
+                .fluidInputs(Ammonia.getFluid(1000))
+                .fluidInputs(Methanol.getFluid(2000))
+                .fluidOutputs(Water.getFluid(2000))
+                .fluidOutputs(Dimethylamine.getFluid(1000))
+                .duration(240).EUt(120).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .input(dust, Phosphorus, 2)
-            .fluidInputs(Water.getFluid(3000))
-            .fluidInputs(Oxygen.getFluid(5000))
-            .fluidOutputs(PhosphoricAcid.getFluid(2000))
-            .duration(320).EUt(30).buildAndRegister();
+                .input(dust, PhosphorusPentoxide, 14)
+                .fluidInputs(Water.getFluid(6000))
+                .fluidOutputs(PhosphoricAcid.getFluid(4000))
+                .duration(40).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(HydrochloricAcid.getFluid(1000))
-            .fluidInputs(Methanol.getFluid(1000))
-            .fluidOutputs(Water.getFluid(1000))
-            .fluidOutputs(Chloromethane.getFluid(1000))
-            .duration(160).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .input(dust, Phosphorus, 2)
+                .fluidInputs(Water.getFluid(3000))
+                .fluidInputs(Oxygen.getFluid(5000))
+                .fluidOutputs(PhosphoricAcid.getFluid(2000))
+                .duration(320).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .input(dust, Phosphorus, 4)
-            .fluidInputs(Oxygen.getFluid(10000))
-            .output(dust, PhosphorusPentoxide, 14)
-            .duration(40).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(HydrochloricAcid.getFluid(1000))
+                .fluidInputs(Methanol.getFluid(1000))
+                .fluidOutputs(Water.getFluid(1000))
+                .fluidOutputs(Chloromethane.getFluid(1000))
+                .duration(160).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .input(dust, Carbon)
-            .fluidInputs(Oxygen.getFluid(2000))
-            .fluidOutputs(CarbonDioxide.getFluid(1000))
-            .duration(40).EUt(8).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .input(dust, Phosphorus, 4)
+                .fluidInputs(Oxygen.getFluid(10000))
+                .output(dust, PhosphorusPentoxide, 14)
+                .duration(40).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .input(gem, Charcoal)
-            .fluidInputs(Oxygen.getFluid(2000))
-            .output(dustTiny, Ash)
-            .fluidOutputs(CarbonDioxide.getFluid(1000))
-            .duration(80).EUt(8).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .input(dust, Carbon)
+                .fluidInputs(Oxygen.getFluid(2000))
+                .fluidOutputs(CarbonDioxide.getFluid(1000))
+                .duration(40).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .input(gem, Coal)
-            .fluidInputs(Oxygen.getFluid(2000))
-            .output(dustTiny, Ash)
-            .fluidOutputs(CarbonDioxide.getFluid(1000))
-            .duration(80).EUt(8).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .input(gem, Charcoal)
+                .fluidInputs(Oxygen.getFluid(2000))
+                .output(dustTiny, Ash)
+                .fluidOutputs(CarbonDioxide.getFluid(1000))
+                .duration(80).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .input(dust, Charcoal)
-            .fluidInputs(Oxygen.getFluid(2000))
-            .output(dustTiny, Ash)
-            .fluidOutputs(CarbonDioxide.getFluid(1000))
-            .duration(80).EUt(8).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .input(gem, Coal)
+                .fluidInputs(Oxygen.getFluid(2000))
+                .output(dustTiny, Ash)
+                .fluidOutputs(CarbonDioxide.getFluid(1000))
+                .duration(80).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .input(dust, Coal)
-            .fluidInputs(Oxygen.getFluid(2000))
-            .output(dustTiny, Ash)
-            .fluidOutputs(CarbonDioxide.getFluid(1000))
-            .duration(80).EUt(8).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .input(dust, Charcoal)
+                .fluidInputs(Oxygen.getFluid(2000))
+                .output(dustTiny, Ash)
+                .fluidOutputs(CarbonDioxide.getFluid(1000))
+                .duration(80).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .fluidInputs(Water.getFluid(2000))
-            .fluidInputs(Methane.getFluid(1000))
-            .fluidOutputs(Hydrogen.getFluid(8000))
-            .fluidOutputs(CarbonDioxide.getFluid(1000))
-            .duration(150).EUt(480).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .input(dust, Coal)
+                .fluidInputs(Oxygen.getFluid(2000))
+                .output(dustTiny, Ash)
+                .fluidOutputs(CarbonDioxide.getFluid(1000))
+                .duration(80).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(MethylAcetate.getFluid(2000))
-            .fluidInputs(NitricAcid.getFluid(4000))
-            .output(dust, Carbon, 5)
-            .fluidOutputs(Tetranitromethane.getFluid(1000))
-            .fluidOutputs(Water.getFluid(8000))
-            .duration(480).EUt(120).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .fluidInputs(Water.getFluid(2000))
+                .fluidInputs(Methane.getFluid(1000))
+                .fluidOutputs(Hydrogen.getFluid(8000))
+                .fluidOutputs(CarbonDioxide.getFluid(1000))
+                .duration(150).EUt(480).buildAndRegister();
+
+        CHEMICAL_RECIPES.recipeBuilder()
+                .fluidInputs(MethylAcetate.getFluid(2000))
+                .fluidInputs(NitricAcid.getFluid(4000))
+                .output(dust, Carbon, 5)
+                .fluidOutputs(Tetranitromethane.getFluid(1000))
+                .fluidOutputs(Water.getFluid(8000))
+                .duration(480).EUt(120).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
                 .fluidInputs(NitricAcid.getFluid(8000))
@@ -842,255 +842,255 @@ public static void init() {
                 .duration(480).EUt(120).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(3))
-            .fluidInputs(Oxygen.getFluid(7000))
-            .fluidInputs(Ammonia.getFluid(2000))
-            .fluidOutputs(DinitrogenTetroxide.getFluid(1000))
-            .fluidOutputs(Water.getFluid(3000))
-            .duration(480).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(3))
+                .fluidInputs(Oxygen.getFluid(7000))
+                .fluidInputs(Ammonia.getFluid(2000))
+                .fluidOutputs(DinitrogenTetroxide.getFluid(1000))
+                .fluidOutputs(Water.getFluid(3000))
+                .duration(480).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(NitrogenDioxide.getFluid(2000))
-            .fluidOutputs(DinitrogenTetroxide.getFluid(1000))
-            .duration(640).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(NitrogenDioxide.getFluid(2000))
+                .fluidOutputs(DinitrogenTetroxide.getFluid(1000))
+                .duration(640).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(3))
-            .fluidInputs(Oxygen.getFluid(7000))
-            .fluidInputs(Nitrogen.getFluid(2000))
-            .fluidInputs(Hydrogen.getFluid(6000))
-            .fluidOutputs(DinitrogenTetroxide.getFluid(1000))
-            .fluidOutputs(Water.getFluid(3000))
-            .duration(1100).EUt(480).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(3))
+                .fluidInputs(Oxygen.getFluid(7000))
+                .fluidInputs(Nitrogen.getFluid(2000))
+                .fluidInputs(Hydrogen.getFluid(6000))
+                .fluidOutputs(DinitrogenTetroxide.getFluid(1000))
+                .fluidOutputs(Water.getFluid(3000))
+                .duration(1100).EUt(480).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Oxygen.getFluid(4000))
-            .fluidInputs(Ammonia.getFluid(1000))
-            .fluidOutputs(NitricAcid.getFluid(1000))
-            .fluidOutputs(Water.getFluid(1000))
-            .duration(480).EUt(480).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Oxygen.getFluid(4000))
+                .fluidInputs(Ammonia.getFluid(1000))
+                .fluidOutputs(NitricAcid.getFluid(1000))
+                .fluidOutputs(Water.getFluid(1000))
+                .duration(480).EUt(480).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(3))
-            .fluidInputs(Water.getFluid(1000))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidInputs(NitrogenDioxide.getFluid(2000))
-            .fluidOutputs(NitricAcid.getFluid(2000))
-            .duration(240).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(3))
+                .fluidInputs(Water.getFluid(1000))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidInputs(NitrogenDioxide.getFluid(2000))
+                .fluidOutputs(NitricAcid.getFluid(2000))
+                .duration(240).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(Oxygen.getFluid(4000))
-            .fluidInputs(Nitrogen.getFluid(1000))
-            .fluidInputs(Hydrogen.getFluid(3000))
-            .fluidOutputs(NitricAcid.getFluid(1000))
-            .fluidOutputs(Water.getFluid(1000))
-            .duration(720).EUt(480).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(Oxygen.getFluid(4000))
+                .fluidInputs(Nitrogen.getFluid(1000))
+                .fluidInputs(Hydrogen.getFluid(3000))
+                .fluidOutputs(NitricAcid.getFluid(1000))
+                .fluidOutputs(Water.getFluid(1000))
+                .duration(720).EUt(480).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dustTiny, SodiumHydroxide)
-            .fluidInputs(SeedOil.getFluid(6000))
-            .fluidInputs(Methanol.getFluid(1000))
-            .fluidOutputs(Glycerol.getFluid(1000))
-            .fluidOutputs(BioDiesel.getFluid(6000))
-            .duration(600).EUt(30).buildAndRegister();
+                .input(dustTiny, SodiumHydroxide)
+                .fluidInputs(SeedOil.getFluid(6000))
+                .fluidInputs(Methanol.getFluid(1000))
+                .fluidOutputs(Glycerol.getFluid(1000))
+                .fluidOutputs(BioDiesel.getFluid(6000))
+                .duration(600).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dustTiny, SodiumHydroxide)
-            .fluidInputs(SeedOil.getFluid(6000))
-            .fluidInputs(Ethanol.getFluid(1000))
-            .fluidOutputs(Glycerol.getFluid(1000))
-            .fluidOutputs(BioDiesel.getFluid(6000))
-            .duration(600).EUt(30).buildAndRegister();
+                .input(dustTiny, SodiumHydroxide)
+                .fluidInputs(SeedOil.getFluid(6000))
+                .fluidInputs(Ethanol.getFluid(1000))
+                .fluidOutputs(Glycerol.getFluid(1000))
+                .fluidOutputs(BioDiesel.getFluid(6000))
+                .duration(600).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(SulfuricAcid.getFluid(1000))
-            .fluidInputs(Ethanol.getFluid(1000))
-            .fluidOutputs(Ethylene.getFluid(1000))
-            .fluidOutputs(DilutedSulfuricAcid.getFluid(1000))
-            .duration(1200).EUt(120).buildAndRegister();
+                .fluidInputs(SulfuricAcid.getFluid(1000))
+                .fluidInputs(Ethanol.getFluid(1000))
+                .fluidOutputs(Ethylene.getFluid(1000))
+                .fluidOutputs(DilutedSulfuricAcid.getFluid(1000))
+                .duration(1200).EUt(120).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, SodiumBisulfate, 7)
-            .fluidInputs(Water.getFluid(1000))
-            .output(dust, SodiumHydroxide, 3)
-            .fluidOutputs(SulfuricAcid.getFluid(1000))
-            .duration(60).EUt(30).buildAndRegister();
+                .input(dust, SodiumBisulfate, 7)
+                .fluidInputs(Water.getFluid(1000))
+                .output(dust, SodiumHydroxide, 3)
+                .fluidOutputs(SulfuricAcid.getFluid(1000))
+                .duration(60).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.SUGAR))
-            .input(dustTiny, Polyethylene)
-            .fluidInputs(Toluene.getFluid(133))
-            .outputs(MetaItems.GELLED_TOLUENE.getStackForm(2))
-            .duration(140).EUt(192).buildAndRegister();
+                .inputs(new ItemStack(Items.SUGAR))
+                .input(dustTiny, Polyethylene)
+                .fluidInputs(Toluene.getFluid(133))
+                .outputs(MetaItems.GELLED_TOLUENE.getStackForm(2))
+                .duration(140).EUt(192).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(2))
-            .fluidInputs(HydrogenSulfide.getFluid(1000))
-            .fluidInputs(Oxygen.getFluid(4000))
-            .fluidOutputs(SulfuricAcid.getFluid(1000))
-            .duration(320).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(2))
+                .fluidInputs(HydrogenSulfide.getFluid(1000))
+                .fluidInputs(Oxygen.getFluid(4000))
+                .fluidOutputs(SulfuricAcid.getFluid(1000))
+                .duration(320).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Saltpeter)
-            .fluidInputs(Naphtha.getFluid(576))
-            .output(dustTiny, Potassium)
-            .fluidOutputs(Polycaprolactam.getFluid(1296))
-            .duration(640).EUt(30).buildAndRegister();
+                .input(dust, Saltpeter)
+                .fluidInputs(Naphtha.getFluid(576))
+                .output(dustTiny, Potassium)
+                .fluidOutputs(Polycaprolactam.getFluid(1296))
+                .duration(640).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Epichlorohydrin.getFluid(144))
-            .fluidInputs(Naphtha.getFluid(3000))
-            .fluidInputs(NitrogenDioxide.getFluid(1000))
-            .fluidOutputs(Epoxy.getFluid(288))
-            .duration(240).EUt(30).buildAndRegister();
+                .fluidInputs(Epichlorohydrin.getFluid(144))
+                .fluidInputs(Naphtha.getFluid(3000))
+                .fluidInputs(NitrogenDioxide.getFluid(1000))
+                .fluidOutputs(Epoxy.getFluid(288))
+                .duration(240).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Calcium)
-            .input(dust, Carbon)
-            .fluidInputs(Oxygen.getFluid(3000))
-            .output(dust, Calcite, 5)
-            .duration(500).EUt(30).buildAndRegister();
+                .input(dust, Calcium)
+                .input(dust, Carbon)
+                .fluidInputs(Oxygen.getFluid(3000))
+                .output(dust, Calcite, 5)
+                .duration(500).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Sulfur)
-            .fluidInputs(Water.getFluid(4000))
-            .fluidOutputs(SulfuricAcid.getFluid(1000))
-            .fluidOutputs(Hydrogen.getFluid(6000))
-            .duration(1150).EUt(30).buildAndRegister();
+                .input(dust, Sulfur)
+                .fluidInputs(Water.getFluid(4000))
+                .fluidOutputs(SulfuricAcid.getFluid(1000))
+                .fluidOutputs(Hydrogen.getFluid(6000))
+                .duration(1150).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(crushedPurified, Chalcopyrite)
-            .fluidInputs(NitricAcid.getFluid(1000))
-            .output(dustTiny, PlatinumGroupSludge)
-            .fluidOutputs(CopperSulfateSolution.getFluid(1000))
-            .duration(50).EUt(30).buildAndRegister();
+                .input(crushedPurified, Chalcopyrite)
+                .fluidInputs(NitricAcid.getFluid(1000))
+                .output(dustTiny, PlatinumGroupSludge)
+                .fluidOutputs(CopperSulfateSolution.getFluid(1000))
+                .duration(50).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(crushedPurified, Pentlandite)
-            .fluidInputs(NitricAcid.getFluid(1000))
-            .output(dustTiny, PlatinumGroupSludge)
-            .fluidOutputs(NickelSulfateSolution.getFluid(1000))
-            .duration(50).EUt(30).buildAndRegister();
+                .input(crushedPurified, Pentlandite)
+                .fluidInputs(NitricAcid.getFluid(1000))
+                .output(dustTiny, PlatinumGroupSludge)
+                .fluidOutputs(NickelSulfateSolution.getFluid(1000))
+                .duration(50).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Quicklime, 2)
-            .fluidInputs(CarbonDioxide.getFluid(1000))
-            .output(dust, Calcite, 5)
-            .duration(80).EUt(30).buildAndRegister();
+                .input(dust, Quicklime, 2)
+                .fluidInputs(CarbonDioxide.getFluid(1000))
+                .output(dust, Calcite, 5)
+                .duration(80).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Magnesia, 2)
-            .fluidInputs(CarbonDioxide.getFluid(1000))
-            .output(dust, Magnesite, 5)
-            .duration(80).EUt(30).buildAndRegister();
+                .input(dust, Magnesia, 2)
+                .fluidInputs(CarbonDioxide.getFluid(1000))
+                .output(dust, Magnesite, 5)
+                .duration(80).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .notConsumable(new IntCircuitIngredient(1))
-            .input(dust, Calcite, 5)
-            .output(dust, Quicklime, 2)
-            .fluidOutputs(CarbonDioxide.getFluid(1000))
-            .duration(240).EUt(30).buildAndRegister();
+                .notConsumable(new IntCircuitIngredient(1))
+                .input(dust, Calcite, 5)
+                .output(dust, Quicklime, 2)
+                .fluidOutputs(CarbonDioxide.getFluid(1000))
+                .duration(240).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, Magnesite, 5)
-            .output(dust, Magnesia, 2)
-            .fluidOutputs(CarbonDioxide.getFluid(1000))
-            .duration(240).EUt(30).buildAndRegister();
+                .input(dust, Magnesite, 5)
+                .output(dust, Magnesia, 2)
+                .fluidOutputs(CarbonDioxide.getFluid(1000))
+                .duration(240).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, RawRubber, 9)
-            .input(dust, Sulfur)
-            .fluidOutputs(Rubber.getFluid(1296))
-            .duration(600).EUt(16).buildAndRegister();
+                .input(dust, RawRubber, 9)
+                .input(dust, Sulfur)
+                .fluidOutputs(Rubber.getFluid(1296))
+                .duration(600).EUt(16).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.MELON, 1, OreDictionary.WILDCARD_VALUE))
-            .input(nugget, Gold, 8)
-            .outputs(new ItemStack(Items.SPECKLED_MELON))
-            .duration(50).EUt(30).buildAndRegister();
+                .inputs(new ItemStack(Items.MELON, 1, OreDictionary.WILDCARD_VALUE))
+                .input(nugget, Gold, 8)
+                .outputs(new ItemStack(Items.SPECKLED_MELON))
+                .duration(50).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.CARROT, 1, OreDictionary.WILDCARD_VALUE))
-            .input(nugget, Gold, 8)
-            .outputs(new ItemStack(Items.GOLDEN_CARROT))
-            .duration(50).EUt(30).buildAndRegister();
+                .inputs(new ItemStack(Items.CARROT, 1, OreDictionary.WILDCARD_VALUE))
+                .input(nugget, Gold, 8)
+                .outputs(new ItemStack(Items.GOLDEN_CARROT))
+                .duration(50).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.APPLE, 1, OreDictionary.WILDCARD_VALUE))
-            .input(ingot, Gold, 8)
-            .outputs(new ItemStack(Items.GOLDEN_APPLE))
-            .duration(50).EUt(30).buildAndRegister();
+                .inputs(new ItemStack(Items.APPLE, 1, OreDictionary.WILDCARD_VALUE))
+                .input(ingot, Gold, 8)
+                .outputs(new ItemStack(Items.GOLDEN_APPLE))
+                .duration(50).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.APPLE, 1, OreDictionary.WILDCARD_VALUE))
-            .input(block, Gold, 8)
-            .outputs(new ItemStack(Items.GOLDEN_APPLE, 1, 1))
-            .duration(50).EUt(30).buildAndRegister();
+                .inputs(new ItemStack(Items.APPLE, 1, OreDictionary.WILDCARD_VALUE))
+                .input(block, Gold, 8)
+                .outputs(new ItemStack(Items.GOLDEN_APPLE, 1, 1))
+                .duration(50).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.BLAZE_POWDER))
-            .inputs(new ItemStack(Items.SLIME_BALL))
-            .outputs(new ItemStack(Items.MAGMA_CREAM))
-            .duration(50).EUt(30).buildAndRegister();
+                .inputs(new ItemStack(Items.BLAZE_POWDER))
+                .inputs(new ItemStack(Items.SLIME_BALL))
+                .outputs(new ItemStack(Items.MAGMA_CREAM))
+                .duration(50).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .inputs(new ItemStack(Items.BLAZE_POWDER))
-            .input(OrePrefix.gem, Materials.EnderPearl)
-            .outputs(new ItemStack(Items.ENDER_EYE))
-            .duration(50).EUt(30).buildAndRegister();
+                .inputs(new ItemStack(Items.BLAZE_POWDER))
+                .input(OrePrefix.gem, Materials.EnderPearl)
+                .outputs(new ItemStack(Items.ENDER_EYE))
+                .duration(50).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .inputs(MetaItems.GELLED_TOLUENE.getStackForm(4))
-            .fluidInputs(SulfuricAcid.getFluid(250))
-            .outputs(new ItemStack(Blocks.TNT))
-            .duration(200).EUt(24).buildAndRegister();
+                .inputs(MetaItems.GELLED_TOLUENE.getStackForm(4))
+                .fluidInputs(SulfuricAcid.getFluid(250))
+                .outputs(new ItemStack(Blocks.TNT))
+                .duration(200).EUt(24).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, SodiumBisulfate, 7)
-            .fluidInputs(Water.getFluid(1000))
-            .output(dust, SodiumHydroxide, 3)
-            .fluidOutputs(SulfuricAcid.getFluid(1000))
-            .duration(60).EUt(30).buildAndRegister();
+                .input(dust, SodiumBisulfate, 7)
+                .fluidInputs(Water.getFluid(1000))
+                .output(dust, SodiumHydroxide, 3)
+                .fluidOutputs(SulfuricAcid.getFluid(1000))
+                .duration(60).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(dust, SodiumHydroxide, 6)
-            .fluidInputs(Dichlorobenzene.getFluid(1000))
-            .output(dust, Salt, 4)
-            .fluidOutputs(Phenol.getFluid(1000))
-            .fluidOutputs(Oxygen.getFluid(1000))
-            .duration(120).EUt(30).buildAndRegister();
+                .input(dust, SodiumHydroxide, 6)
+                .fluidInputs(Dichlorobenzene.getFluid(1000))
+                .output(dust, Salt, 4)
+                .fluidOutputs(Phenol.getFluid(1000))
+                .fluidOutputs(Oxygen.getFluid(1000))
+                .duration(120).EUt(30).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Benzene.getFluid(1000))
-            .fluidInputs(Oxygen.getFluid(1000))
-            .fluidOutputs(Phenol.getFluid(1000))
-            .duration(400).EUt(2000).buildAndRegister();
+                .fluidInputs(Benzene.getFluid(1000))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidOutputs(Phenol.getFluid(1000))
+                .duration(400).EUt(2000).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(Glycerol.getFluid(1000))
-            .fluidInputs(CarbonDioxide.getFluid(1000))
-            .fluidOutputs(Ethylene.getFluid(2000))
-            .fluidOutputs(Oxygen.getFluid(5000))
-            .duration(400).EUt(200).buildAndRegister();
+                .fluidInputs(Glycerol.getFluid(1000))
+                .fluidInputs(CarbonDioxide.getFluid(1000))
+                .fluidOutputs(Ethylene.getFluid(2000))
+                .fluidOutputs(Oxygen.getFluid(5000))
+                .duration(400).EUt(200).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .fluidInputs(MethylAcetate.getFluid(1000))
-            .fluidInputs(Water.getFluid(1000))
-            .notConsumable(OreDictUnifier.get(dust, SodiumHydroxide))
-            .fluidOutputs(AceticAcid.getFluid(1000))
-            .fluidOutputs(Methanol.getFluid(1000))
-            .duration(264).EUt(60).buildAndRegister();
+                .fluidInputs(MethylAcetate.getFluid(1000))
+                .fluidInputs(Water.getFluid(1000))
+                .notConsumable(OreDictUnifier.get(dust, SodiumHydroxide))
+                .fluidOutputs(AceticAcid.getFluid(1000))
+                .fluidOutputs(Methanol.getFluid(1000))
+                .duration(264).EUt(60).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
-            .input(ingot, Plutonium239, 8)
-            .input(dustTiny, Uranium238)
-            .fluidInputs(Air.getFluid(1000))
-            .output(dust, Plutonium239, 8)
-            .fluidOutputs(Radon.getFluid(100))
-            .duration(12000).EUt(8).buildAndRegister();
+                .input(ingot, Plutonium239, 8)
+                .input(dustTiny, Uranium238)
+                .fluidInputs(Air.getFluid(1000))
+                .output(dust, Plutonium239, 8)
+                .fluidOutputs(Radon.getFluid(100))
+                .duration(12000).EUt(8).buildAndRegister();
 
         CHEMICAL_RECIPES.recipeBuilder()
                 .input(Items.PAPER)
diff --git a/src/main/resources/assets/gregtech/blockstates/autogenerated/compressed_block.json b/src/main/resources/assets/gregtech/blockstates/autogenerated/compressed_block.json
index c12f232a85e..6ef34226bd8 100644
--- a/src/main/resources/assets/gregtech/blockstates/autogenerated/compressed_block.json
+++ b/src/main/resources/assets/gregtech/blockstates/autogenerated/compressed_block.json
@@ -8,8 +8,8 @@
     }
   },
   "variants": {
-      "variant": {
-        $VARIANTS$
-      }
+    "variant": {
+      $VARIANTS$
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/autogenerated/ore_block.json b/src/main/resources/assets/gregtech/blockstates/autogenerated/ore_block.json
index c4e19d2f0be..1d748a1cb1e 100644
--- a/src/main/resources/assets/gregtech/blockstates/autogenerated/ore_block.json
+++ b/src/main/resources/assets/gregtech/blockstates/autogenerated/ore_block.json
@@ -11,7 +11,7 @@
   },
   "variants": {
     "stone_type": {
-$STONE_TYPES$
+      $STONE_TYPES$
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/autogenerated/surface_rock.json b/src/main/resources/assets/gregtech/blockstates/autogenerated/surface_rock.json
index b4da6b704a4..f4ae77e5899 100644
--- a/src/main/resources/assets/gregtech/blockstates/autogenerated/surface_rock.json
+++ b/src/main/resources/assets/gregtech/blockstates/autogenerated/surface_rock.json
@@ -7,9 +7,17 @@
     }
   },
   "variants": {
-    "facing=north": { "y": 0 },
-    "facing=east": { "y": 90 },
-    "facing=south": { "y": 180 },
-    "facing=west": { "y": -90 }
+    "facing=north": {
+      "y": 0
+    },
+    "facing=east": {
+      "y": 90
+    },
+    "facing=south": {
+      "y": 180
+    },
+    "facing=west": {
+      "y": -90
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/boiler_firebox_casing.json b/src/main/resources/assets/gregtech/blockstates/boiler_firebox_casing.json
index ee19f0d602b..f82dc637b12 100644
--- a/src/main/resources/assets/gregtech/blockstates/boiler_firebox_casing.json
+++ b/src/main/resources/assets/gregtech/blockstates/boiler_firebox_casing.json
@@ -27,7 +27,6 @@
         }
       }
     ],
-
     "active=false,variant=steel_firebox": [
       {
         "textures": {
@@ -46,7 +45,6 @@
         }
       }
     ],
-
     "active=false,variant=titanium_firebox": [
       {
         "textures": {
@@ -65,7 +63,6 @@
         }
       }
     ],
-
     "active=false,variant=tungstensteel_firebox": [
       {
         "textures": {
diff --git a/src/main/resources/assets/gregtech/blockstates/cable_double.json b/src/main/resources/assets/gregtech/blockstates/cable_double.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/cable_double.json
+++ b/src/main/resources/assets/gregtech/blockstates/cable_double.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/cable_hex.json b/src/main/resources/assets/gregtech/blockstates/cable_hex.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/cable_hex.json
+++ b/src/main/resources/assets/gregtech/blockstates/cable_hex.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/cable_octal.json b/src/main/resources/assets/gregtech/blockstates/cable_octal.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/cable_octal.json
+++ b/src/main/resources/assets/gregtech/blockstates/cable_octal.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/cable_quadruple.json b/src/main/resources/assets/gregtech/blockstates/cable_quadruple.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/cable_quadruple.json
+++ b/src/main/resources/assets/gregtech/blockstates/cable_quadruple.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/cable_single.json b/src/main/resources/assets/gregtech/blockstates/cable_single.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/cable_single.json
+++ b/src/main/resources/assets/gregtech/blockstates/cable_single.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/concrete.json b/src/main/resources/assets/gregtech/blockstates/concrete.json
index e23af6513a2..510d5b80cc5 100644
--- a/src/main/resources/assets/gregtech/blockstates/concrete.json
+++ b/src/main/resources/assets/gregtech/blockstates/concrete.json
@@ -7,85 +7,117 @@
     }
   },
   "variants": {
-    "chiseling=normal,variant=light_concrete": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_light_stone"
-      }
-    }],
-    "chiseling=normal,variant=light_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_light_bricks"
-      }
-    }],
-    "chiseling=normal,variant=dark_concrete": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_dark_stone"
-      }
-    }],
-    "chiseling=normal,variant=dark_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_dark_bricks"
-      }
-    }],
-    "chiseling=cracked,variant=light_concrete": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_light_cobble"
-      }
-    }],
-    "chiseling=cracked,variant=light_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_light_bricks_cracked"
-      }
-    }],
-    "chiseling=cracked,variant=dark_concrete": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_dark_cobble"
-      }
-    }],
-    "chiseling=cracked,variant=dark_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_dark_bricks_cracked"
-      }
-    }],
-    "chiseling=mossy,variant=light_concrete": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_light_cobble_mossy"
-      }
-    }],
-    "chiseling=mossy,variant=light_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_light_bricks_mossy"
-      }
-    }],
-    "chiseling=mossy,variant=dark_concrete": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_dark_cobble_mossy"
-      }
-    }],
-    "chiseling=mossy,variant=dark_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_dark_bricks_mossy"
-      }
-    }],
-    "chiseling=chiseled,variant=light_concrete": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_light_smooth"
-      }
-    }],
-    "chiseling=chiseled,variant=light_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_light_bricks_chiseled"
-      }
-    }],
-    "chiseling=chiseled,variant=dark_concrete": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_dark_smooth"
-      }
-    }],
-    "chiseling=chiseled,variant=dark_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/concrete/concrete_dark_bricks_chiseled"
-      }
-    }]
+    "chiseling=normal,variant=light_concrete": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_light_stone"
+        }
+      }
+    ],
+    "chiseling=normal,variant=light_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_light_bricks"
+        }
+      }
+    ],
+    "chiseling=normal,variant=dark_concrete": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_dark_stone"
+        }
+      }
+    ],
+    "chiseling=normal,variant=dark_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_dark_bricks"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=light_concrete": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_light_cobble"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=light_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_light_bricks_cracked"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=dark_concrete": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_dark_cobble"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=dark_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_dark_bricks_cracked"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=light_concrete": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_light_cobble_mossy"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=light_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_light_bricks_mossy"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=dark_concrete": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_dark_cobble_mossy"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=dark_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_dark_bricks_mossy"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=light_concrete": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_light_smooth"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=light_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_light_bricks_chiseled"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=dark_concrete": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_dark_smooth"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=dark_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/concrete/concrete_dark_bricks_chiseled"
+        }
+      }
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/fluid_pipe_huge.json b/src/main/resources/assets/gregtech/blockstates/fluid_pipe_huge.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/fluid_pipe_huge.json
+++ b/src/main/resources/assets/gregtech/blockstates/fluid_pipe_huge.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/fluid_pipe_large.json b/src/main/resources/assets/gregtech/blockstates/fluid_pipe_large.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/fluid_pipe_large.json
+++ b/src/main/resources/assets/gregtech/blockstates/fluid_pipe_large.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/fluid_pipe_normal.json b/src/main/resources/assets/gregtech/blockstates/fluid_pipe_normal.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/fluid_pipe_normal.json
+++ b/src/main/resources/assets/gregtech/blockstates/fluid_pipe_normal.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/fluid_pipe_small.json b/src/main/resources/assets/gregtech/blockstates/fluid_pipe_small.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/fluid_pipe_small.json
+++ b/src/main/resources/assets/gregtech/blockstates/fluid_pipe_small.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/fluid_pipe_tiny.json b/src/main/resources/assets/gregtech/blockstates/fluid_pipe_tiny.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/fluid_pipe_tiny.json
+++ b/src/main/resources/assets/gregtech/blockstates/fluid_pipe_tiny.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/foam.json b/src/main/resources/assets/gregtech/blockstates/foam.json
index 8dc09f0cf9e..2d638ae69c0 100644
--- a/src/main/resources/assets/gregtech/blockstates/foam.json
+++ b/src/main/resources/assets/gregtech/blockstates/foam.json
@@ -8,6 +8,8 @@
     }
   },
   "variants": {
-    "normal": [{}]
+    "normal": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/granite.json b/src/main/resources/assets/gregtech/blockstates/granite.json
index a90e05ef9c7..ec69fc88a87 100644
--- a/src/main/resources/assets/gregtech/blockstates/granite.json
+++ b/src/main/resources/assets/gregtech/blockstates/granite.json
@@ -7,85 +7,117 @@
     }
   },
   "variants": {
-    "chiseling=normal,variant=black_granite": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_black_stone"
-      }
-    }],
-    "chiseling=normal,variant=red_granite": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_red_stone"
-      }
-    }],
-    "chiseling=normal,variant=black_granite_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_black_bricks"
-      }
-    }],
-    "chiseling=normal,variant=red_granite_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_red_bricks"
-      }
-    }],
-    "chiseling=cracked,variant=black_granite": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_black_cobble"
-      }
-    }],
-    "chiseling=cracked,variant=red_granite": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_red_cobble"
-      }
-    }],
-    "chiseling=cracked,variant=black_granite_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_black_bricks_cracked"
-      }
-    }],
-    "chiseling=cracked,variant=red_granite_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_red_bricks_cracked"
-      }
-    }],
-    "chiseling=mossy,variant=black_granite": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_black_cobble_mossy"
-      }
-    }],
-    "chiseling=mossy,variant=red_granite": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_red_cobble_mossy"
-      }
-    }],
-    "chiseling=mossy,variant=black_granite_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_black_bricks_mossy"
-      }
-    }],
-    "chiseling=mossy,variant=red_granite_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_red_bricks_mossy"
-      }
-    }],
-    "chiseling=chiseled,variant=black_granite": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_black_smooth"
-      }
-    }],
-    "chiseling=chiseled,variant=red_granite": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_red_smooth"
-      }
-    }],
-    "chiseling=chiseled,variant=black_granite_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_black_bricks_chiseled"
-      }
-    }],
-    "chiseling=chiseled,variant=red_granite_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/granite/granite_red_bricks_chiseled"
-      }
-    }]
+    "chiseling=normal,variant=black_granite": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_black_stone"
+        }
+      }
+    ],
+    "chiseling=normal,variant=red_granite": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_red_stone"
+        }
+      }
+    ],
+    "chiseling=normal,variant=black_granite_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_black_bricks"
+        }
+      }
+    ],
+    "chiseling=normal,variant=red_granite_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_red_bricks"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=black_granite": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_black_cobble"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=red_granite": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_red_cobble"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=black_granite_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_black_bricks_cracked"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=red_granite_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_red_bricks_cracked"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=black_granite": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_black_cobble_mossy"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=red_granite": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_red_cobble_mossy"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=black_granite_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_black_bricks_mossy"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=red_granite_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_red_bricks_mossy"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=black_granite": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_black_smooth"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=red_granite": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_red_smooth"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=black_granite_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_black_bricks_chiseled"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=red_granite_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/granite/granite_red_bricks_chiseled"
+        }
+      }
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/hermetic_casing.json b/src/main/resources/assets/gregtech/blockstates/hermetic_casing.json
index 1866f46a2e9..21033d6085f 100644
--- a/src/main/resources/assets/gregtech/blockstates/hermetic_casing.json
+++ b/src/main/resources/assets/gregtech/blockstates/hermetic_casing.json
@@ -75,5 +75,5 @@
       }
     }
   }
-  }
+}
 
diff --git a/src/main/resources/assets/gregtech/blockstates/item_pipe_large.json b/src/main/resources/assets/gregtech/blockstates/item_pipe_large.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/item_pipe_large.json
+++ b/src/main/resources/assets/gregtech/blockstates/item_pipe_large.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/item_pipe_large_restrictive.json b/src/main/resources/assets/gregtech/blockstates/item_pipe_large_restrictive.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/item_pipe_large_restrictive.json
+++ b/src/main/resources/assets/gregtech/blockstates/item_pipe_large_restrictive.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/item_pipe_normal.json b/src/main/resources/assets/gregtech/blockstates/item_pipe_normal.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/item_pipe_normal.json
+++ b/src/main/resources/assets/gregtech/blockstates/item_pipe_normal.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/item_pipe_normal_restrictive.json b/src/main/resources/assets/gregtech/blockstates/item_pipe_normal_restrictive.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/item_pipe_normal_restrictive.json
+++ b/src/main/resources/assets/gregtech/blockstates/item_pipe_normal_restrictive.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/item_pipe_small.json b/src/main/resources/assets/gregtech/blockstates/item_pipe_small.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/item_pipe_small.json
+++ b/src/main/resources/assets/gregtech/blockstates/item_pipe_small.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/item_pipe_small_restrictive.json b/src/main/resources/assets/gregtech/blockstates/item_pipe_small_restrictive.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/item_pipe_small_restrictive.json
+++ b/src/main/resources/assets/gregtech/blockstates/item_pipe_small_restrictive.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/log.json b/src/main/resources/assets/gregtech/blockstates/log.json
index fc02ae75a0a..3a26383af35 100644
--- a/src/main/resources/assets/gregtech/blockstates/log.json
+++ b/src/main/resources/assets/gregtech/blockstates/log.json
@@ -10,16 +10,27 @@
   },
   "variants": {
     "axis": {
-      "none": { "textures": { "end": "#side" } },
-      "x": { "x": 90, "y": 90 },
+      "none": {
+        "textures": {
+          "end": "#side"
+        }
+      },
+      "x": {
+        "x": 90,
+        "y": 90
+      },
       "y": {},
-      "z": { "x": 90 }
+      "z": {
+        "x": 90
+      }
     },
     "natural": {
       "true": {},
       "false": {}
     },
-    "inventory": [{}],
+    "inventory": [
+      {}
+    ],
     "variant": {
       "rubber_wood": {
         "textures": {
@@ -29,4 +40,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/machine.json b/src/main/resources/assets/gregtech/blockstates/machine.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/machine.json
+++ b/src/main/resources/assets/gregtech/blockstates/machine.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/mineral.json b/src/main/resources/assets/gregtech/blockstates/mineral.json
index d242f5ef3a1..3a0064b3514 100644
--- a/src/main/resources/assets/gregtech/blockstates/mineral.json
+++ b/src/main/resources/assets/gregtech/blockstates/mineral.json
@@ -7,85 +7,117 @@
     }
   },
   "variants": {
-    "chiseling=normal,variant=marble": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/marble/marble_stone"
-      }
-    }],
-    "chiseling=normal,variant=marble_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/marble/marble_bricks"
-      }
-    }],
-    "chiseling=normal,variant=basalt": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/basalt/basalt_stone"
-      }
-    }],
-    "chiseling=normal,variant=basalt_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/basalt/basalt_bricks"
-      }
-    }],
-    "chiseling=cracked,variant=marble": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/marble/marble_cobble"
-      }
-    }],
-    "chiseling=cracked,variant=marble_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/marble/marble_bricks_cracked"
-      }
-    }],
-    "chiseling=cracked,variant=basalt": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/basalt/basalt_cobble"
-      }
-    }],
-    "chiseling=cracked,variant=basalt_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/basalt/basalt_bricks_cracked"
-      }
-    }],
-    "chiseling=mossy,variant=marble": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/marble/marble_cobble_mossy"
-      }
-    }],
-    "chiseling=mossy,variant=marble_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/marble/marble_bricks_mossy"
-      }
-    }],
-    "chiseling=mossy,variant=basalt": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/basalt/basalt_cobble_mossy"
-      }
-    }],
-    "chiseling=mossy,variant=basalt_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/basalt/basalt_bricks_mossy"
-      }
-    }],
-    "chiseling=chiseled,variant=marble": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/marble/marble_smooth"
-      }
-    }],
-    "chiseling=chiseled,variant=marble_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/marble/marble_bricks_chiseled"
-      }
-    }],
-    "chiseling=chiseled,variant=basalt": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/basalt/basalt_smooth"
-      }
-    }],
-    "chiseling=chiseled,variant=basalt_bricks": [{
-      "textures": {
-        "all": "gregtech:blocks/stones/basalt/basalt_bricks_chiseled"
-      }
-    }]
+    "chiseling=normal,variant=marble": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/marble/marble_stone"
+        }
+      }
+    ],
+    "chiseling=normal,variant=marble_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/marble/marble_bricks"
+        }
+      }
+    ],
+    "chiseling=normal,variant=basalt": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/basalt/basalt_stone"
+        }
+      }
+    ],
+    "chiseling=normal,variant=basalt_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/basalt/basalt_bricks"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=marble": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/marble/marble_cobble"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=marble_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/marble/marble_bricks_cracked"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=basalt": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/basalt/basalt_cobble"
+        }
+      }
+    ],
+    "chiseling=cracked,variant=basalt_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/basalt/basalt_bricks_cracked"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=marble": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/marble/marble_cobble_mossy"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=marble_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/marble/marble_bricks_mossy"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=basalt": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/basalt/basalt_cobble_mossy"
+        }
+      }
+    ],
+    "chiseling=mossy,variant=basalt_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/basalt/basalt_bricks_mossy"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=marble": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/marble/marble_smooth"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=marble_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/marble/marble_bricks_chiseled"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=basalt": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/basalt/basalt_smooth"
+        }
+      }
+    ],
+    "chiseling=chiseled,variant=basalt_bricks": [
+      {
+        "textures": {
+          "all": "gregtech:blocks/stones/basalt/basalt_bricks_chiseled"
+        }
+      }
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/multiblock_casing.json b/src/main/resources/assets/gregtech/blockstates/multiblock_casing.json
index eb0348bf5d4..ff6d799fbc6 100644
--- a/src/main/resources/assets/gregtech/blockstates/multiblock_casing.json
+++ b/src/main/resources/assets/gregtech/blockstates/multiblock_casing.json
@@ -23,7 +23,6 @@
           "all": "gregtech:blocks/casings/pipe/machine_casing_grate"
         }
       },
-
       "assembler": {
         "textures": {
           "all": "gregtech:blocks/casings/mechanic/machine_casing_assembler"
@@ -34,7 +33,6 @@
           "all": "gregtech:blocks/casings/mechanic/machine_casing_assembly_line"
         }
       },
-
       "fusion": {
         "textures": {
           "all": "gregtech:blocks/casings/fusion/machine_casing_fusion"
diff --git a/src/main/resources/assets/gregtech/blockstates/transparent_casing.json b/src/main/resources/assets/gregtech/blockstates/transparent_casing.json
index f8a5711b990..0988360533d 100644
--- a/src/main/resources/assets/gregtech/blockstates/transparent_casing.json
+++ b/src/main/resources/assets/gregtech/blockstates/transparent_casing.json
@@ -7,7 +7,7 @@
     }
   },
   "variants": {
-      "variant": {
+    "variant": {
       "reinforced_glass": {
         "textures": {
           "all": "gregtech:blocks/casings/transparent/reinforced_glass"
diff --git a/src/main/resources/assets/gregtech/blockstates/turbine_casing.json b/src/main/resources/assets/gregtech/blockstates/turbine_casing.json
index 98f50a90fdf..51475ac8ba0 100644
--- a/src/main/resources/assets/gregtech/blockstates/turbine_casing.json
+++ b/src/main/resources/assets/gregtech/blockstates/turbine_casing.json
@@ -20,7 +20,6 @@
           "all": "gregtech:blocks/casings/gearbox/machine_casing_gearbox_titanium"
         }
       },
-
       "steel_turbine_casing": {
         "textures": {
           "all": "gregtech:blocks/casings/mechanic/machine_casing_turbine"
diff --git a/src/main/resources/assets/gregtech/blockstates/wire_double.json b/src/main/resources/assets/gregtech/blockstates/wire_double.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/wire_double.json
+++ b/src/main/resources/assets/gregtech/blockstates/wire_double.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/wire_hex.json b/src/main/resources/assets/gregtech/blockstates/wire_hex.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/wire_hex.json
+++ b/src/main/resources/assets/gregtech/blockstates/wire_hex.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/wire_octal.json b/src/main/resources/assets/gregtech/blockstates/wire_octal.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/wire_octal.json
+++ b/src/main/resources/assets/gregtech/blockstates/wire_octal.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/wire_quadruple.json b/src/main/resources/assets/gregtech/blockstates/wire_quadruple.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/wire_quadruple.json
+++ b/src/main/resources/assets/gregtech/blockstates/wire_quadruple.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/blockstates/wire_single.json b/src/main/resources/assets/gregtech/blockstates/wire_single.json
index 51469af1128..86cb52c5cc7 100644
--- a/src/main/resources/assets/gregtech/blockstates/wire_single.json
+++ b/src/main/resources/assets/gregtech/blockstates/wire_single.json
@@ -7,7 +7,11 @@
     }
   },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/block/overlay_model.json b/src/main/resources/assets/gregtech/models/block/overlay_model.json
index 08039a63bab..29fba7cee6f 100644
--- a/src/main/resources/assets/gregtech/models/block/overlay_model.json
+++ b/src/main/resources/assets/gregtech/models/block/overlay_model.json
@@ -2,28 +2,158 @@
   "parent": "block/block",
   "elements": [
     {
-      "from": [ 0, 0, 0 ],
-      "to": [ 16, 16, 16 ],
+      "from": [
+        0,
+        0,
+        0
+      ],
+      "to": [
+        16,
+        16,
+        16
+      ],
       "faces": {
-        "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#base_down", "cullface": "down" },
-        "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#base_up", "cullface": "up" },
-        "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#base_north", "cullface": "north" },
-        "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#base_south", "cullface": "south" },
-        "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#base_west", "cullface": "west" },
-        "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#base_east", "cullface": "east" }
+        "down": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#base_down",
+          "cullface": "down"
+        },
+        "up": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#base_up",
+          "cullface": "up"
+        },
+        "north": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#base_north",
+          "cullface": "north"
+        },
+        "south": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#base_south",
+          "cullface": "south"
+        },
+        "west": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#base_west",
+          "cullface": "west"
+        },
+        "east": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#base_east",
+          "cullface": "east"
+        }
       }
     },
     {
-      "from": [ 0, 0, 0 ],
-      "to": [ 16, 16, 16 ],
+      "from": [
+        0,
+        0,
+        0
+      ],
+      "to": [
+        16,
+        16,
+        16
+      ],
       "faces": {
-        "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay_down", "cullface": "down", "tintindex": 1 },
-        "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay_up", "cullface": "up", "tintindex": 1 },
-        "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay_north", "cullface": "north", "tintindex": 1 },
-        "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay_south", "cullface": "south", "tintindex": 1 },
-        "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay_west", "cullface": "west", "tintindex": 1 },
-        "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay_east", "cullface": "east", "tintindex": 1 }
+        "down": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#overlay_down",
+          "cullface": "down",
+          "tintindex": 1
+        },
+        "up": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#overlay_up",
+          "cullface": "up",
+          "tintindex": 1
+        },
+        "north": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#overlay_north",
+          "cullface": "north",
+          "tintindex": 1
+        },
+        "south": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#overlay_south",
+          "cullface": "south",
+          "tintindex": 1
+        },
+        "west": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#overlay_west",
+          "cullface": "west",
+          "tintindex": 1
+        },
+        "east": {
+          "uv": [
+            0,
+            0,
+            16,
+            16
+          ],
+          "texture": "#overlay_east",
+          "cullface": "east",
+          "tintindex": 1
+        }
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/block/tinted_cube.json b/src/main/resources/assets/gregtech/models/block/tinted_cube.json
index 2dc605f8af6..3cfc829e395 100644
--- a/src/main/resources/assets/gregtech/models/block/tinted_cube.json
+++ b/src/main/resources/assets/gregtech/models/block/tinted_cube.json
@@ -2,16 +2,48 @@
   "parent": "block/block",
   "elements": [
     {
-      "from": [ 0, 0, 0 ],
-      "to": [ 16, 16, 16 ],
+      "from": [
+        0,
+        0,
+        0
+      ],
+      "to": [
+        16,
+        16,
+        16
+      ],
       "faces": {
-        "down":  { "texture": "#down", "cullface": "down", "tintindex": 1 },
-        "up":    { "texture": "#up", "cullface": "up", "tintindex": 1 },
-        "north": { "texture": "#north", "cullface": "north", "tintindex": 1 },
-        "south": { "texture": "#south", "cullface": "south", "tintindex": 1 },
-        "west":  { "texture": "#west", "cullface": "west", "tintindex": 1 },
-        "east":  { "texture": "#east", "cullface": "east", "tintindex": 1 }
+        "down": {
+          "texture": "#down",
+          "cullface": "down",
+          "tintindex": 1
+        },
+        "up": {
+          "texture": "#up",
+          "cullface": "up",
+          "tintindex": 1
+        },
+        "north": {
+          "texture": "#north",
+          "cullface": "north",
+          "tintindex": 1
+        },
+        "south": {
+          "texture": "#south",
+          "cullface": "south",
+          "tintindex": 1
+        },
+        "west": {
+          "texture": "#west",
+          "cullface": "west",
+          "tintindex": 1
+        },
+        "east": {
+          "texture": "#east",
+          "cullface": "east",
+          "tintindex": 1
+        }
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/bolt.json
index 03010503396..0d8a6660e2b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/bolt",
-        "layer1": "gregtech:items/material_sets/bright/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/bolt",
+    "layer1": "gregtech:items/material_sets/bright/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/cell_plasma.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/cell_plasma.json
index fa83a3e91e4..e2c77e27216 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/cell_plasma.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/cell_plasma.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/cell_plasma",
-        "layer1": "gregtech:items/material_sets/bright/cell_plasma_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/cell_plasma",
+    "layer1": "gregtech:items/material_sets/bright/cell_plasma_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed.json
index a19ba53b95a..65269e79263 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/crushed",
-        "layer1": "gregtech:items/material_sets/bright/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/crushed",
+    "layer1": "gregtech:items/material_sets/bright/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_centrifuged.json
index 88074e957ef..3d824ff226d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_purified.json
index ab0bc155fc9..662b28ed856 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust.json
index 325d11dcf84..b9b922a18af 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/dust",
-        "layer1": "gregtech:items/material_sets/bright/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/dust",
+    "layer1": "gregtech:items/material_sets/bright/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_impure.json
index e6104c7013b..bda05c84178 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/dust_impure",
-        "layer1": "gregtech:items/material_sets/bright/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/dust_impure",
+    "layer1": "gregtech:items/material_sets/bright/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_pure.json
index 3a296ac6f70..40550b1653c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/dust_pure",
-        "layer1": "gregtech:items/material_sets/bright/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/dust_pure",
+    "layer1": "gregtech:items/material_sets/bright/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_small.json
index bdf03f438ae..6a3b6e08635 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/dust_small",
-        "layer1": "gregtech:items/material_sets/bright/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/dust_small",
+    "layer1": "gregtech:items/material_sets/bright/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_tiny.json
index 60229a74c78..03882306546 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/dust_tiny",
-        "layer1": "gregtech:items/material_sets/bright/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/dust_tiny",
+    "layer1": "gregtech:items/material_sets/bright/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/foil.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/foil.json
index 204b1ab8777..16bfe42eb4e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/foil.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/foil.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/foil"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/foil"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/gear.json
index c9d2ad8df93..c4ec63aaaf7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/gear.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/gear",
-        "layer1": "gregtech:items/material_sets/bright/gear_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/gear",
+    "layer1": "gregtech:items/material_sets/bright/gear_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/gear_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/gear_small.json
index 1b098001a29..48f90cb3135 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/gear_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/gear_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/gear_small",
-        "layer1": "gregtech:items/material_sets/bright/gear_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/gear_small",
+    "layer1": "gregtech:items/material_sets/bright/gear_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot.json
index 1a6991a27b7..8b24f71db4e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/ingot",
-        "layer1": "gregtech:items/material_sets/bright/ingot_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/ingot",
+    "layer1": "gregtech:items/material_sets/bright/ingot_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot_double.json
index bd3d4e9d426..ce8f0660297 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot_double.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/ingot_double",
-        "layer1": "gregtech:items/material_sets/bright/ingot_double_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/ingot_double",
+    "layer1": "gregtech:items/material_sets/bright/ingot_double_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot_hot.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot_hot.json
index 4f6f6604ef8..61b8985ec83 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot_hot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/ingot_hot.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/ingot_hot",
-        "layer1": "gregtech:items/material_sets/bright/ingot_hot_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/ingot_hot",
+    "layer1": "gregtech:items/material_sets/bright/ingot_hot_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/nugget.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/nugget.json
index c7ff24b2590..7f7a08c2d2a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/nugget.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/nugget.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/nugget",
-        "layer1": "gregtech:items/material_sets/bright/nugget_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/nugget",
+    "layer1": "gregtech:items/material_sets/bright/nugget_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate.json
index 88f19ea0750..44df3836245 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/plate",
-        "layer1": "gregtech:items/material_sets/bright/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/plate",
+    "layer1": "gregtech:items/material_sets/bright/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate_curved.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate_curved.json
index f8af4f922e8..a51d1c4821c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate_curved.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate_curved.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/plate_curved"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/plate_curved"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate_dense.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate_dense.json
index db44b9a9ae5..90aeaee35d9 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate_dense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/plate_dense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/plate_dense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/plate_dense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/ring.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/ring.json
index 4d04c8d8ee7..e29abe5e1a2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/ring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/ring.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/ring",
-        "layer1": "gregtech:items/material_sets/bright/ring_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/ring",
+    "layer1": "gregtech:items/material_sets/bright/ring_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/rotor.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/rotor.json
index b07b4aa4b8d..708ba08394e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/rotor.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/rotor.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/rotor"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/rotor"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/round.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/round.json
index 49ba95309ed..1c93c9bd93b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/round.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/round.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/round",
-        "layer1": "gregtech:items/material_sets/bright/round_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/round",
+    "layer1": "gregtech:items/material_sets/bright/round_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/screw.json
index d74608f5ecc..e4de8ea0042 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/spring.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/spring.json
index 2eaf30ec255..4f15f6a93a8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/spring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/spring.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/spring"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/spring"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/spring_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/spring_small.json
index c1a620f8b96..6abbef5b5f4 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/spring_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/spring_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/spring_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/spring_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/stick.json
index 00648776da7..6fea3435848 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/stick.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/stick",
-        "layer1": "gregtech:items/material_sets/bright/stick_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/stick",
+    "layer1": "gregtech:items/material_sets/bright/stick_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/stick_long.json
index 0fdd840029b..31a2ab29ae1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/stick_long.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/stick_long",
-        "layer1": "gregtech:items/material_sets/bright/stick_long_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/stick_long",
+    "layer1": "gregtech:items/material_sets/bright/stick_long_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/toolHeadSoldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/toolHeadSoldering.json
index d8dcf98bc93..7346d83a6e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/toolHeadSoldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/toolHeadSoldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/toolHeadSoldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/toolHeadSoldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_axe.json
index 213cdafb25d..1cf00178cf9 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_buzz_saw.json
index 5d13f04b052..3cbcc8a19ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_chainsaw.json
index 7426943081c..b5581308f33 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_drill.json
index 54da40d7766..1e9c7824105 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_file.json
index bbaf32958ea..53a8d3944d0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_hammer.json
index 2e4ddfd9390..66bf5d424a9 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_hoe.json
index 01bdb6e2161..30fd1770579 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_pickaxe.json
index 9d4c88bbe6a..0901dd29418 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_plow.json
index aaa976c89c6..a267664992e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_saw.json
index fa35e05bee6..8ec25593672 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_screwdriver.json
index e456feecdf3..5614fcd2504 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_sense.json
index 034fe9215ca..56b519af094 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_shovel.json
index d22509baf0d..a8d9cf63a62 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_soldering.json
index e4036f11586..7b36baf567b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_sword.json
index eba0caff72c..348e9673cb0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_universal_spade.json
index 8fd1d8ea341..bc144c47d10 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_wrench.json
index 800779b71ce..e2fab543daf 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/turbine_blade.json
index aac08381f3b..a7bb8eec20a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/wire_fine.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/wire_fine.json
index 6f618b67027..cea28755e71 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/bright/wire_fine.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/bright/wire_fine.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/bright/wire_fine",
-        "layer1": "gregtech:items/material_sets/bright/wire_fine_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/bright/wire_fine",
+    "layer1": "gregtech:items/material_sets/bright/wire_fine_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/bolt.json
index 8787cdb2026..73d75a93b73 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/bolt",
-        "layer1": "gregtech:items/material_sets/diamond/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/bolt",
+    "layer1": "gregtech:items/material_sets/diamond/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed.json
index b3cf292f498..cf7e8306543 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/crushed",
-        "layer1": "gregtech:items/material_sets/diamond/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/crushed",
+    "layer1": "gregtech:items/material_sets/diamond/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed_centrifuged.json
index 64161b00fcb..015e0cda50d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed_purified.json
index 7a76d35ddf6..fcf3fc0ea1d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust.json
index b94d395c141..cecc05b0f8d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/dust",
-        "layer1": "gregtech:items/material_sets/diamond/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/dust",
+    "layer1": "gregtech:items/material_sets/diamond/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_impure.json
index 0219840b330..b093c08e501 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/dust_impure",
-        "layer1": "gregtech:items/material_sets/diamond/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/dust_impure",
+    "layer1": "gregtech:items/material_sets/diamond/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_pure.json
index 140893962b5..cd7bb120e57 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/dust_pure",
-        "layer1": "gregtech:items/material_sets/diamond/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/dust_pure",
+    "layer1": "gregtech:items/material_sets/diamond/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_small.json
index 57dabd37aa4..1f012cf485d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/dust_small",
-        "layer1": "gregtech:items/material_sets/diamond/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/dust_small",
+    "layer1": "gregtech:items/material_sets/diamond/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_tiny.json
index ca5cf399d0a..1384d30d18d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/dust_tiny",
-        "layer1": "gregtech:items/material_sets/diamond/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/dust_tiny",
+    "layer1": "gregtech:items/material_sets/diamond/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gear.json
index d5fc1b4f164..34ac47fda3b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gear.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/gear",
-        "layer1": "gregtech:items/material_sets/diamond/gear_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/gear",
+    "layer1": "gregtech:items/material_sets/diamond/gear_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem.json
index 5053382df4f..3872174916a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/gem"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/gem"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_chipped.json
index 14b70d601a4..1ceca0a2086 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_chipped.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/gem_chipped"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/gem_chipped"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_exquisite.json
index 72a457f07b3..8d650364517 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_exquisite.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/gem_exquisite"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/gem_exquisite"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_flawed.json
index af091482219..c72783821df 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_flawed.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/gem_flawed"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/gem_flawed"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_flawless.json
index ee4d8c6f92f..cfe222fbd3e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/gem_flawless.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/gem_flawless"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/gem_flawless"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/lens.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/lens.json
index 171213e5067..cc91fddbae7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/lens.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/lens.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/lens",
-        "layer1": "gregtech:items/material_sets/diamond/lens_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/lens",
+    "layer1": "gregtech:items/material_sets/diamond/lens_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/plate.json
index 0e094e7e3af..c61ad633cea 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/plate.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/plate",
-        "layer1": "gregtech:items/material_sets/diamond/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/plate",
+    "layer1": "gregtech:items/material_sets/diamond/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/screw.json
index 0752acdb139..1a0b780d6db 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/stick.json
index e8e993508f1..1025c93a5ad 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/stick.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/stick",
-        "layer1": "gregtech:items/material_sets/diamond/stick_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/stick",
+    "layer1": "gregtech:items/material_sets/diamond/stick_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/stick_long.json
index aaa60d6bccb..8084c6baf9e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/stick_long.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/diamond/stick_long",
-        "layer1": "gregtech:items/material_sets/diamond/stick_long_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/diamond/stick_long",
+    "layer1": "gregtech:items/material_sets/diamond/stick_long_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_axe.json
index 67cc7bc20c7..0828be353ff 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_buzz_saw.json
index 5fc371f3f40..f669790c1ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_chainsaw.json
index 0c1dfbb4eff..12928a121bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_chainsaw.json
@@ -1,7 +1,6 @@
-
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_drill.json
index 3d2339b546a..0441927037c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_file.json
index e8a909a2557..9556453a7f0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_hammer.json
index a7521e0a288..5e0024b2286 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_hoe.json
index 8263f236cc8..e1c1570d1bd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_mallet.json
index 9c073d4b3c3..8e7a31b5833 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_pickaxe.json
index 716ab28cc60..a9ab73be1c3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_plow.json
index 993d48976e7..58fea490d6a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_saw.json
index 3a850489e29..1717093b1ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_screwdriver.json
index cf4367d7f60..10be70a3e90 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_sense.json
index ac27e5288d9..4587e52540d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_shovel.json
index b4db8462302..7b6e7a2f1b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_soldering.json
index 323a458f600..1b456d7d91f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_sword.json
index 7cde8e53f95..900fdf5bbfc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_universal_spade.json
index 4e8bb1e8142..0a75caa4178 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_wrench.json
index 59d27a6cd0d..a8df45406e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/turbine_blade.json
index 484c78075cc..e4f8466b3cd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/bolt.json
index d3cded26352..b9e6220e48e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/bolt.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/bolt"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/bolt"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/cell_plasma.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/cell_plasma.json
index eb5afec6088..8db77ea5549 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/cell_plasma.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/cell_plasma.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/cell_plasma",
-        "layer1": "gregtech:items/material_sets/dull/cell_plasma_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/cell_plasma",
+    "layer1": "gregtech:items/material_sets/dull/cell_plasma_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed.json
index faf38ba96e4..2b6f45578fd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/crushed",
-        "layer1": "gregtech:items/material_sets/dull/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/crushed",
+    "layer1": "gregtech:items/material_sets/dull/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed_centrifuged.json
index 5eb07c8cdfb..826899b724c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed_purified.json
index a4d35225ae6..f241a8100cc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust.json
index f3615b8f268..c958843f958 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/dust"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/dust"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_impure.json
index 75e77c1e910..31d445f21da 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/dust_impure",
-        "layer1": "gregtech:items/material_sets/dull/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/dust_impure",
+    "layer1": "gregtech:items/material_sets/dull/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_pure.json
index 9d45e9da1ca..7be200afca5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/dust_pure",
-        "layer1": "gregtech:items/material_sets/dull/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/dust_pure",
+    "layer1": "gregtech:items/material_sets/dull/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_small.json
index 2a8c0c7dbb4..e3e3aba6838 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/dust_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/dust_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_tiny.json
index d479fdd1122..a6a27922989 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_tiny.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/dust_tiny"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/dust_tiny"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/foil.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/foil.json
index f37519fff68..c638f06f208 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/foil.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/foil.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/foil"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/foil"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/gear.json
index 49afac6800f..5a77c0fed2f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/gear.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/gear"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/gear"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/gear_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/gear_small.json
index fb005508242..de1866c5827 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/gear_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/gear_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/gear_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/gear_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot.json
index b8a39f14ea5..393fd47ab01 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/ingot"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/ingot"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot_double.json
index 2b0fd197116..b0b95977e23 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot_double.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/ingot_double"
-    }
-}
\ No newline at end of file
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/ingot_double"
+  }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/nugget.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/nugget.json
index 7705f0fe68e..5d5305842af 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/nugget.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/nugget.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/nugget"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/nugget"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate.json
index 9a8d325dc9a..b23726ec8a6 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/plate"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/plate"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate_dense.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate_dense.json
index 153c14f01d3..ba7c7735f44 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate_dense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate_dense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/plate_dense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/plate_dense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate_double.json
index f1f36561a70..427e4185bde 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/plate_double.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/plate_double"
-    }
-}
\ No newline at end of file
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/plate_double"
+  }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/ring.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/ring.json
index 60fa9e2813d..17285c6be8f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/ring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/ring.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/ring"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/ring"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/rotor.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/rotor.json
index 3c016bb4b09..e779e228ab0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/rotor.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/rotor.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/rotor"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/rotor"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/round.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/round.json
index d2d70edc5eb..13d6a4ed1f8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/round.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/round.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/round"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/round"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/screw.json
index f8e56009eee..8844e8f80ae 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/spring.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/spring.json
index 511f54ac078..7aa110315ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/spring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/spring.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/spring"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/spring"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/spring_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/spring_small.json
index 5562b5b64ae..229d8db3062 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/spring_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/spring_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/spring_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/spring_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/stick.json
index 98628cb2e03..f120edccce5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/stick.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/stick"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/stick"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/stick_long.json
index 6afde8d8674..4b2b0eb4576 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/stick_long.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/stick_long"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/stick_long"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_axe.json
index 4930505790e..b6f32d100da 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_buzz_saw.json
index 2813ce74ab6..cf0d2de1fec 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_chainsaw.json
index 759a1dc8208..ea15d6de661 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_drill.json
index 2f4823f9d06..785eb7fc2f2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_file.json
index 6820d1a2a10..610fe7a9429 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_hammer.json
index d0a6844da8b..9bc8b3137c8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_hoe.json
index a19afe53edc..1fc1285576c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_mallet.json
index 709b4d847a6..ab6a892f32a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_pickaxe.json
index 5a5b888561a..a303005d047 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_plow.json
index 621ab8bd829..a8f6c09bcde 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_saw.json
index 65a6aa88dce..89472aee96e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_screwdriver.json
index f504d4e8d4c..062785386ad 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_sense.json
index c99b38cb603..7bcc94be512 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_shovel.json
index 4a320121003..daabf8e0b67 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_soldering.json
index 6e4150deff4..4bc87d7fdfa 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_sword.json
index aef017cdbf3..a940a3e9e9f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_universal_spade.json
index 5fb7200cea3..ea3fdc0f8c8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_wrench.json
index bc3d02f9ac6..3d351232a02 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/turbine_blade.json
index 45789a8eb6d..34d2ff14d1e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/wire_fine.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/wire_fine.json
index 87ade0f7e50..449a66d21f8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/wire_fine.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/wire_fine.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/dull/wire_fine",
-        "layer1": "gregtech:items/material_sets/dull/wire_fine_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/wire_fine",
+    "layer1": "gregtech:items/material_sets/dull/wire_fine_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/bolt.json
index 08886d4e9d1..ef9eadc4420 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/bolt",
-        "layer1": "gregtech:items/material_sets/emerald/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/bolt",
+    "layer1": "gregtech:items/material_sets/emerald/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed.json
index 7fbb72fae5b..3fe47cb2bfe 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/crushed",
-        "layer1": "gregtech:items/material_sets/emerald/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/crushed",
+    "layer1": "gregtech:items/material_sets/emerald/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed_centrifuged.json
index 414888263f0..ef284c4f1fe 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed_purified.json
index 112515b6324..94f4db0f05c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust.json
index 151e8da97f4..959b8e6926e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/dust",
-        "layer1": "gregtech:items/material_sets/emerald/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/dust",
+    "layer1": "gregtech:items/material_sets/emerald/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_impure.json
index 22fa143a7c4..fded9199e38 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/dust_impure",
-        "layer1": "gregtech:items/material_sets/emerald/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/dust_impure",
+    "layer1": "gregtech:items/material_sets/emerald/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_pure.json
index ad73552d949..055eb9835a8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/dust_pure",
-        "layer1": "gregtech:items/material_sets/emerald/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/dust_pure",
+    "layer1": "gregtech:items/material_sets/emerald/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_small.json
index b6dc1590af3..67cef8aeacc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/dust_small",
-        "layer1": "gregtech:items/material_sets/emerald/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/dust_small",
+    "layer1": "gregtech:items/material_sets/emerald/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_tiny.json
index 33a8f0ad0c7..db130b9bc8a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/dust_tiny",
-        "layer1": "gregtech:items/material_sets/emerald/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/dust_tiny",
+    "layer1": "gregtech:items/material_sets/emerald/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gear.json
index 4872e6d72f1..87148e1d9a1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gear.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/gear",
-        "layer1": "gregtech:items/material_sets/emerald/gear_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/gear",
+    "layer1": "gregtech:items/material_sets/emerald/gear_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem.json
index 8dfac2f1773..01d4b026f32 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/gem"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/gem"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_chipped.json
index 37254ef616c..74c0896a56c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_chipped.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/gem_chipped"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/gem_chipped"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_exquisite.json
index 84bcf422b80..2db6d1d8f37 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_exquisite.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/gem_exquisite"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/gem_exquisite"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_flawed.json
index 7260ebc1c81..e0cab4dcf06 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_flawed.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/gem_flawed"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/gem_flawed"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_flawless.json
index ef31fe678b2..32b0d26b0e0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/gem_flawless.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/gem_flawless"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/gem_flawless"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/lens.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/lens.json
index defbf94a42f..e9d336b0c7c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/lens.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/lens.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/lens",
-        "layer1": "gregtech:items/material_sets/emerald/lens_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/lens",
+    "layer1": "gregtech:items/material_sets/emerald/lens_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/plate.json
index ed433f396aa..51a669c812b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/plate.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/plate",
-        "layer1": "gregtech:items/material_sets/emerald/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/plate",
+    "layer1": "gregtech:items/material_sets/emerald/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/screw.json
index 34520066fc7..0d03435f476 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/stick.json
index 0a16a7cede0..5c21a297645 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/stick.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/stick",
-        "layer1": "gregtech:items/material_sets/emerald/stick_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/stick",
+    "layer1": "gregtech:items/material_sets/emerald/stick_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/stick_long.json
index 0e48cae4f5c..063947b7285 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/stick_long.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/emerald/stick_long",
-        "layer1": "gregtech:items/material_sets/emerald/stick_long_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/emerald/stick_long",
+    "layer1": "gregtech:items/material_sets/emerald/stick_long_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_axe.json
index 67cc7bc20c7..0828be353ff 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_buzz_saw.json
index 5fc371f3f40..f669790c1ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_chainsaw.json
index 20fd020cc9d..12928a121bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_drill.json
index 3d2339b546a..0441927037c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_file.json
index e8a909a2557..9556453a7f0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_hammer.json
index a7521e0a288..5e0024b2286 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_hoe.json
index 8263f236cc8..e1c1570d1bd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_mallet.json
index 9c073d4b3c3..8e7a31b5833 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_pickaxe.json
index 716ab28cc60..a9ab73be1c3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_plow.json
index 993d48976e7..58fea490d6a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_saw.json
index 3a850489e29..1717093b1ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_screwdriver.json
index cf4367d7f60..10be70a3e90 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_sense.json
index ac27e5288d9..4587e52540d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_shovel.json
index b4db8462302..7b6e7a2f1b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_soldering.json
index 323a458f600..1b456d7d91f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_sword.json
index 7cde8e53f95..900fdf5bbfc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_universal_spade.json
index 4e8bb1e8142..0a75caa4178 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_wrench.json
index 59d27a6cd0d..a8df45406e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/turbine_blade.json
index 484c78075cc..e4f8466b3cd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/cell_plasma.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/cell_plasma.json
index f89ba00f782..440fb236ae4 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/cell_plasma.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/cell_plasma.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/cell_plasma",
-        "layer1": "gregtech:items/material_sets/fine/cell_plasma_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/cell_plasma",
+    "layer1": "gregtech:items/material_sets/fine/cell_plasma_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed.json
index 3fe9e1187bb..e785f340acf 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/crushed",
-        "layer1": "gregtech:items/material_sets/fine/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/crushed",
+    "layer1": "gregtech:items/material_sets/fine/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed_centrifuged.json
index bc154889aaa..83fef5305d7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed_purified.json
index 439b78b4757..0e045beb6f8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust.json
index 235da7889ee..e3432c5ac49 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/dust"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/dust"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_impure.json
index a2e9621661d..8955495f71f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/dust_impure",
-        "layer1": "gregtech:items/material_sets/fine/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/dust_impure",
+    "layer1": "gregtech:items/material_sets/fine/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_pure.json
index cb5afa74abd..aa861a8342b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/dust_pure",
-        "layer1": "gregtech:items/material_sets/fine/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/dust_pure",
+    "layer1": "gregtech:items/material_sets/fine/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_small.json
index 77af2a06761..44db4be2226 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/dust_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/dust_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_tiny.json
index c1394f1481d..2a244177463 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/dust_tiny.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/dust_tiny"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/dust_tiny"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/gear.json
index 936f20e9182..2bbe8d50de7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/gear.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/gear"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/gear"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/gear_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/gear_small.json
index f17c6841742..bfac84bfe36 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/gear_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/gear_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/gear_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/gear_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/ingot.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/ingot.json
index a1ab8705329..273255a1848 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/ingot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/ingot.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/ingot"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/ingot"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/ingot_hot.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/ingot_hot.json
index a7a9a828c06..5b0eda1a11c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/ingot_hot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/ingot_hot.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/ingot_hot",
-        "layer1": "gregtech:items/material_sets/fine/ingot_hot_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/ingot_hot",
+    "layer1": "gregtech:items/material_sets/fine/ingot_hot_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/plate_dense.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/plate_dense.json
index e95209f170c..f6ca8efd572 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/plate_dense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/plate_dense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/plate_dense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/plate_dense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/spring_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/spring_small.json
index a9ae3269653..3d66b4bae32 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/spring_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/spring_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/spring_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/spring_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/stick_long.json
index e73a6693546..e639a0bfc4c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/stick_long.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/stick_long"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/stick_long"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/wire_fine.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/wire_fine.json
index f8eef121868..48ea2c9c10a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/wire_fine.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fine/wire_fine.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fine/wire_fine",
-        "layer1": "gregtech:items/material_sets/fine/wire_fine_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fine/wire_fine",
+    "layer1": "gregtech:items/material_sets/fine/wire_fine_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed.json
index 54b7b886f0b..e472aff8f70 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/flint/crushed",
-        "layer1": "gregtech:items/material_sets/flint/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/flint/crushed",
+    "layer1": "gregtech:items/material_sets/flint/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed_centrifuged.json
index 724c5afdb5b..914d15907e2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/flint/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/flint/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed_purified.json
index b9af730731d..e73877e8edc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/flint/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/flint/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust.json
index 7d9f381ea7f..cc1e8468126 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/flint/dust"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/flint/dust"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_impure.json
index f15af73866d..eb57303cb47 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/flint/dust_impure",
-        "layer1": "gregtech:items/material_sets/flint/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/flint/dust_impure",
+    "layer1": "gregtech:items/material_sets/flint/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_pure.json
index d4ce7ab199d..64d4c351f53 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/flint/dust_pure",
-        "layer1": "gregtech:items/material_sets/flint/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/flint/dust_pure",
+    "layer1": "gregtech:items/material_sets/flint/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_small.json
index 554fae0c091..575aa44b1c8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/flint/dust_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/flint/dust_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_tiny.json
index e22ce8360ae..68361c5eb98 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/dust_tiny.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/flint/dust_tiny"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/flint/dust_tiny"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/gem.json
index e9a80e2d6ea..f2f63916143 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/gem.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/flint/gem"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/flint/gem"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/plate.json
index f41d0bf8e25..8a4f93c2538 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/plate.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/flint/plate"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/flint/plate"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_axe.json
index 67cc7bc20c7..0828be353ff 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_buzz_saw.json
index 5fc371f3f40..f669790c1ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_chainsaw.json
index 20fd020cc9d..12928a121bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_drill.json
index 3d2339b546a..0441927037c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_file.json
index e8a909a2557..9556453a7f0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_hammer.json
index a7521e0a288..5e0024b2286 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_hoe.json
index 8263f236cc8..e1c1570d1bd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_mallet.json
index 9c073d4b3c3..8e7a31b5833 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_pickaxe.json
index 716ab28cc60..a9ab73be1c3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_plow.json
index 993d48976e7..58fea490d6a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_saw.json
index 3a850489e29..1717093b1ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_screwdriver.json
index cf4367d7f60..10be70a3e90 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_sense.json
index ac27e5288d9..4587e52540d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_shovel.json
index b4db8462302..7b6e7a2f1b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_soldering.json
index 323a458f600..1b456d7d91f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_sword.json
index 7cde8e53f95..900fdf5bbfc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_universal_spade.json
index 4e8bb1e8142..0a75caa4178 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_wrench.json
index 59d27a6cd0d..a8df45406e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/turbine_blade.json
index 484c78075cc..e4f8466b3cd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/flint/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fluid/cell_plasma.json b/src/main/resources/assets/gregtech/models/item/material_sets/fluid/cell_plasma.json
index 9599990daf6..fbf7ca3db65 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/fluid/cell_plasma.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/fluid/cell_plasma.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/fluid/cell_plasma",
-        "layer1": "gregtech:items/material_sets/fluid/cell_plasma_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/fluid/cell_plasma",
+    "layer1": "gregtech:items/material_sets/fluid/cell_plasma_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/bolt.json
index 92c0e756bb5..84c7ed579e2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/bolt",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/bolt",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed.json
index 3af1ca97253..be6c9f3530b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/crushed",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/crushed",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed_centrifuged.json
index cff090bca86..d910abfdc42 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed_purified.json
index 911ed33df92..f17ea085bc0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust.json
index a1f9ed68585..ee7e4931f37 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/dust",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/dust",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_impure.json
index d4740b14ccb..face6881f3c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/dust_impure",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/dust_impure",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_pure.json
index 04320830687..1b78a6ed244 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/dust_pure",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/dust_pure",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_small.json
index c06e358fc83..da5a236e7e3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/dust_small",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/dust_small",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_tiny.json
index 19680c669b3..45fbbc63830 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/dust_tiny",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/dust_tiny",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gear.json
index f0a67ff549d..e5dddff15b6 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gear.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/gear",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/gear_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/gear",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/gear_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem.json
index 6542d2815fd..632c142fd96 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/gem"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/gem"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_chipped.json
index fc63ec45e4e..2917cd0b148 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_chipped.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/gem_chipped"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/gem_chipped"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_exquisite.json
index dcc5e6c903f..0af27479c00 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_exquisite.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/gem_exquisite"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/gem_exquisite"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_flawed.json
index 39326df378a..11262f3a331 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_flawed.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/gem_flawed"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/gem_flawed"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_flawless.json
index becd137d61a..9ac1bb918d0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/gem_flawless.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/gem_flawless"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/gem_flawless"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/lens.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/lens.json
index 7ce628949a7..52c74bd25d6 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/lens.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/lens.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/lens",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/lens_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/lens",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/lens_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/plate.json
index 3d1e3852e14..e3ed6bb2cee 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/plate.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/plate",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/plate",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/screw.json
index a9fc7d5ed15..b46893091ff 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/stick.json
index 4941deaf5c8..75402166d5d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/stick.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/stick",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/stick_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/stick",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/stick_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/stick_long.json
index 3793aa9dba4..35eb9fe041f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/stick_long.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_horizontal/stick_long",
-        "layer1": "gregtech:items/material_sets/gem_horizontal/stick_long_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_horizontal/stick_long",
+    "layer1": "gregtech:items/material_sets/gem_horizontal/stick_long_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_axe.json
index 67cc7bc20c7..0828be353ff 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_buzz_saw.json
index 5fc371f3f40..f669790c1ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_chainsaw.json
index 20fd020cc9d..12928a121bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_drill.json
index 3d2339b546a..0441927037c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_file.json
index e8a909a2557..9556453a7f0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_hammer.json
index a7521e0a288..5e0024b2286 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_hoe.json
index 8263f236cc8..e1c1570d1bd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_mallet.json
index 9c073d4b3c3..8e7a31b5833 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_pickaxe.json
index 716ab28cc60..a9ab73be1c3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_plow.json
index 993d48976e7..58fea490d6a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_saw.json
index 3a850489e29..1717093b1ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_screwdriver.json
index cf4367d7f60..10be70a3e90 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_sense.json
index ac27e5288d9..4587e52540d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_shovel.json
index b4db8462302..7b6e7a2f1b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_soldering.json
index 323a458f600..1b456d7d91f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_sword.json
index 7cde8e53f95..900fdf5bbfc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_universal_spade.json
index 4e8bb1e8142..0a75caa4178 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_wrench.json
index 59d27a6cd0d..a8df45406e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/turbine_blade.json
index 484c78075cc..e4f8466b3cd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/bolt.json
index 59d80b08b6d..6127b28172f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/bolt",
-        "layer1": "gregtech:items/material_sets/gem_vertical/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/bolt",
+    "layer1": "gregtech:items/material_sets/gem_vertical/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed.json
index 3e8a4ff4588..67e315cb136 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/crushed",
-        "layer1": "gregtech:items/material_sets/gem_vertical/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/crushed",
+    "layer1": "gregtech:items/material_sets/gem_vertical/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed_centrifuged.json
index d177bcb8643..d2fbe53d3d7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed_purified.json
index 9601854b6e8..536174a79c0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust.json
index 8a0ba88bfbc..3fd0286003d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/dust",
-        "layer1": "gregtech:items/material_sets/gem_vertical/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/dust",
+    "layer1": "gregtech:items/material_sets/gem_vertical/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_impure.json
index 18921477db7..265b734cc69 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/dust_impure",
-        "layer1": "gregtech:items/material_sets/gem_vertical/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/dust_impure",
+    "layer1": "gregtech:items/material_sets/gem_vertical/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_pure.json
index 46737686c54..19b4e03add0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/dust_pure",
-        "layer1": "gregtech:items/material_sets/gem_vertical/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/dust_pure",
+    "layer1": "gregtech:items/material_sets/gem_vertical/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_small.json
index ec826549832..1de5d63e1a8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/dust_small",
-        "layer1": "gregtech:items/material_sets/gem_vertical/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/dust_small",
+    "layer1": "gregtech:items/material_sets/gem_vertical/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_tiny.json
index 9e9cfbe53e1..36c2f2c7a61 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/dust_tiny",
-        "layer1": "gregtech:items/material_sets/gem_vertical/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/dust_tiny",
+    "layer1": "gregtech:items/material_sets/gem_vertical/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gear.json
index 1d50e5b4d95..0f8adf7e21c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gear.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/gear",
-        "layer1": "gregtech:items/material_sets/gem_vertical/gear_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/gear",
+    "layer1": "gregtech:items/material_sets/gem_vertical/gear_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem.json
index a11ddf7922c..3d54da6ccbd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/gem"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/gem"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_chipped.json
index 24489fcecb1..2528b38a52b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_chipped.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/gem_chipped"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/gem_chipped"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_exquisite.json
index 003d22bb77c..b4e5946212d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_exquisite.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/gem_exquisite"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/gem_exquisite"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_flawed.json
index fba0c4395ee..90ecaef9e7e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_flawed.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/gem_flawed"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/gem_flawed"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_flawless.json
index 5f93bd64054..1ef198025b4 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/gem_flawless.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/gem_flawless"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/gem_flawless"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/lens.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/lens.json
index 97a1a3e7b56..31f37c086a3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/lens.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/lens.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/lens",
-        "layer1": "gregtech:items/material_sets/gem_vertical/lens_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/lens",
+    "layer1": "gregtech:items/material_sets/gem_vertical/lens_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/plate.json
index 7fee0f88084..457faed39b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/plate.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/plate",
-        "layer1": "gregtech:items/material_sets/gem_vertical/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/plate",
+    "layer1": "gregtech:items/material_sets/gem_vertical/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/screw.json
index 6385dd72c1d..2e6b3210acb 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/stick.json
index 1c5a22ff254..2cd9e46332b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/stick.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/stick",
-        "layer1": "gregtech:items/material_sets/gem_vertical/stick_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/stick",
+    "layer1": "gregtech:items/material_sets/gem_vertical/stick_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/stick_long.json
index 0d76d44d32e..cd9376d3eb1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/stick_long.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/gem_vertical/stick_long",
-        "layer1": "gregtech:items/material_sets/gem_vertical/stick_long_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/gem_vertical/stick_long",
+    "layer1": "gregtech:items/material_sets/gem_vertical/stick_long_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_axe.json
index 67cc7bc20c7..0828be353ff 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_buzz_saw.json
index 5fc371f3f40..f669790c1ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_chainsaw.json
index 20fd020cc9d..12928a121bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_drill.json
index 3d2339b546a..0441927037c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_file.json
index e8a909a2557..9556453a7f0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_hammer.json
index a7521e0a288..5e0024b2286 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_hoe.json
index 8263f236cc8..e1c1570d1bd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_mallet.json
index 9c073d4b3c3..8e7a31b5833 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_pickaxe.json
index 716ab28cc60..a9ab73be1c3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_plow.json
index 993d48976e7..58fea490d6a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_saw.json
index 3a850489e29..1717093b1ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_screwdriver.json
index cf4367d7f60..10be70a3e90 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_sense.json
index ac27e5288d9..4587e52540d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_shovel.json
index b4db8462302..7b6e7a2f1b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_soldering.json
index 323a458f600..1b456d7d91f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_sword.json
index 7cde8e53f95..900fdf5bbfc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_universal_spade.json
index 4e8bb1e8142..0a75caa4178 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_wrench.json
index 59d27a6cd0d..a8df45406e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/turbine_blade.json
index 484c78075cc..e4f8466b3cd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust.json
index f8cdb664df0..a24aeefc893 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/dust",
-        "layer1": "gregtech:items/material_sets/glass/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/dust",
+    "layer1": "gregtech:items/material_sets/glass/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust_small.json
index 9ec89fb74c5..542c53c71b1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/dust_small",
-        "layer1": "gregtech:items/material_sets/glass/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/dust_small",
+    "layer1": "gregtech:items/material_sets/glass/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust_tiny.json
index e9468e7d26d..bd24fdc4f24 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/dust_tiny",
-        "layer1": "gregtech:items/material_sets/glass/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/dust_tiny",
+    "layer1": "gregtech:items/material_sets/glass/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gear.json
index 81c5b96a65c..732cdc3fb75 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gear.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/gear",
-        "layer1": "gregtech:items/material_sets/glass/gear_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/gear",
+    "layer1": "gregtech:items/material_sets/glass/gear_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem.json
index 5c3a6b37055..bac79316dc1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/gem"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/gem"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_chipped.json
index fdb59354160..461ccd63453 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_chipped.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/gem_chipped"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/gem_chipped"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_exquisite.json
index 20d70f9f44d..2e73a7d10c7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_exquisite.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/gem_exquisite"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/gem_exquisite"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_flawed.json
index 2cbbff99a91..d833feabb39 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_flawed.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/gem_flawed"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/gem_flawed"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_flawless.json
index 2f067cb0d4b..3ed25f91b4f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/gem_flawless.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/gem_flawless"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/gem_flawless"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/ingot.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/ingot.json
index e6e455fd133..cfc3e529da9 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/ingot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/ingot.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/ingot",
-        "layer1": "gregtech:items/material_sets/glass/ingot_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/ingot",
+    "layer1": "gregtech:items/material_sets/glass/ingot_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/lens.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/lens.json
index 45c939a94eb..0eff7952eee 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/lens.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/lens.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/lens",
-        "layer1": "gregtech:items/material_sets/glass/lens_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/lens",
+    "layer1": "gregtech:items/material_sets/glass/lens_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/nugget.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/nugget.json
index 0e0b6287ec6..6b5589d91f2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/nugget.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/nugget.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/nugget"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/nugget"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/plate.json
index 3111ce09d41..fba7a981c1b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/plate.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/plate",
-        "layer1": "gregtech:items/material_sets/glass/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/plate",
+    "layer1": "gregtech:items/material_sets/glass/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/stick.json
index 02068a2ae32..3c5b29b595b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/stick.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/stick",
-        "layer1": "gregtech:items/material_sets/glass/stick_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/stick",
+    "layer1": "gregtech:items/material_sets/glass/stick_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/glass/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/glass/stick_long.json
index 8952a0652b6..47fc4d272c3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/glass/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/glass/stick_long.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/glass/stick_long",
-        "layer1": "gregtech:items/material_sets/glass/stick_long_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/glass/stick_long",
+    "layer1": "gregtech:items/material_sets/glass/stick_long_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/bolt.json
index 61e4a0ead84..8d4a1ef5e29 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/bolt",
-        "layer1": "gregtech:items/material_sets/lapis/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/bolt",
+    "layer1": "gregtech:items/material_sets/lapis/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed.json
index 02ae82148b4..fd299cb6c58 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/crushed",
-        "layer1": "gregtech:items/material_sets/lapis/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/crushed",
+    "layer1": "gregtech:items/material_sets/lapis/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed_centrifuged.json
index 40da8f5f76e..2eed39d12c7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed_purified.json
index 34b90f64842..d15376f2be1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust.json
index 4820be392c4..74ff941ef2e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/dust"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/dust"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_impure.json
index 50eaff81c52..92b9b451df8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/dust_impure",
-        "layer1": "gregtech:items/material_sets/lapis/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/dust_impure",
+    "layer1": "gregtech:items/material_sets/lapis/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_pure.json
index 3f52c4067f6..f281322cc4c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/dust_pure",
-        "layer1": "gregtech:items/material_sets/lapis/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/dust_pure",
+    "layer1": "gregtech:items/material_sets/lapis/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_small.json
index 06a0567f3ae..9cd7a132190 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/dust_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/dust_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_tiny.json
index cdd2a198753..e975b540e25 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/dust_tiny.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/dust_tiny"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/dust_tiny"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gear.json
index 533e08357ec..cc30d275ea8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gear.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/gear"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/gear"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem.json
index f33ca9b5966..1b01cf867a6 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/gem"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/gem"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_chipped.json
index 7b7c060c287..b4b468962f3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_chipped.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/gem_chipped"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/gem_chipped"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_exquisite.json
index d11b32609b5..5ebcb5301ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_exquisite.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/gem_exquisite"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/gem_exquisite"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_flawed.json
index bc5c3451e69..4baa787fb94 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_flawed.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/gem_flawed"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/gem_flawed"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_flawless.json
index 85f3dcf3745..87c8d193e75 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/gem_flawless.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/gem_flawless"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/gem_flawless"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/lens.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/lens.json
index f596060c8d2..012e537aca1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/lens.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/lens.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/lens",
-        "layer1": "gregtech:items/material_sets/lapis/lens_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/lens",
+    "layer1": "gregtech:items/material_sets/lapis/lens_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/plate.json
index 9bd84dd6b4d..58714ec5e59 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/plate.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/plate"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/plate"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/screw.json
index 4a817962695..2161e932ebb 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/stick.json
index 79961e07dbd..f922316f24a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/stick.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/stick"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/stick"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/stick_long.json
index d5ace87829e..cb40bc48da5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/stick_long.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lapis/stick_long"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lapis/stick_long"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed.json
index c0c0244941b..f0e2557ee2a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lignite/crushed",
-        "layer1": "gregtech:items/material_sets/lignite/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lignite/crushed",
+    "layer1": "gregtech:items/material_sets/lignite/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed_centrifuged.json
index 78e998e39d6..eff389fd2cd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed_centrifuged.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lignite/crushed_centrifuged",
-        "layer1": "gregtech:items/material_sets/lignite/crushed_centrifuged_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lignite/crushed_centrifuged",
+    "layer1": "gregtech:items/material_sets/lignite/crushed_centrifuged_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed_purified.json
index 50393836b41..3dc45840bdb 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/crushed_purified.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lignite/crushed_purified",
-        "layer1": "gregtech:items/material_sets/lignite/crushed_purified_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lignite/crushed_purified",
+    "layer1": "gregtech:items/material_sets/lignite/crushed_purified_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust.json
index 01ffa4c114f..42d0d610120 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lignite/dust",
-        "layer1": "gregtech:items/material_sets/lignite/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lignite/dust",
+    "layer1": "gregtech:items/material_sets/lignite/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_impure.json
index 1b33dfc7f01..d57ecd88180 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lignite/dust_impure",
-        "layer1": "gregtech:items/material_sets/lignite/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lignite/dust_impure",
+    "layer1": "gregtech:items/material_sets/lignite/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_pure.json
index 297e9ae0de4..fb19e236d96 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lignite/dust_pure",
-        "layer1": "gregtech:items/material_sets/lignite/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lignite/dust_pure",
+    "layer1": "gregtech:items/material_sets/lignite/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_small.json
index 69fabb59625..2a49c8644fe 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lignite/dust_small",
-        "layer1": "gregtech:items/material_sets/lignite/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lignite/dust_small",
+    "layer1": "gregtech:items/material_sets/lignite/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_tiny.json
index 07e00d2217d..c42b4d637b6 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lignite/dust_tiny",
-        "layer1": "gregtech:items/material_sets/lignite/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lignite/dust_tiny",
+    "layer1": "gregtech:items/material_sets/lignite/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem.json
index faca3dc1541..b04b6563018 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/lignite/gem"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/lignite/gem"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_chipped.json
index 5aa445aa90b..c5c7cded038 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_chipped.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/gem_chipped"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/gem_chipped"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_exquisite.json
index 72556a8c7e8..58d747caeca 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_exquisite.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/gem_exquisite"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/gem_exquisite"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_flawed.json
index 9f4acae4e12..af91bd60b96 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_flawed.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/gem_flawed"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/gem_flawed"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_flawless.json
index 0b44155c303..c0c3990fc26 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/gem_flawless.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/gem_flawless"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/gem_flawless"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/bolt.json
index 9dd28d175ab..74f01f0fb55 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/bolt",
-        "layer1": "gregtech:items/material_sets/magnetic/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/bolt",
+    "layer1": "gregtech:items/material_sets/magnetic/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed.json
index e452f378ea9..d51dc008ae5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/crushed",
-        "layer1": "gregtech:items/material_sets/magnetic/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/crushed",
+    "layer1": "gregtech:items/material_sets/magnetic/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed_centrifuged.json
index f78cd08fec9..7e0019b4b96 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed_centrifuged.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/crushed_centrifuged",
-        "layer1": "gregtech:items/material_sets/magnetic/crushed_centrifuged_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/crushed_centrifuged",
+    "layer1": "gregtech:items/material_sets/magnetic/crushed_centrifuged_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed_purified.json
index 83f46c16b3c..df3b1dbe26d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/crushed_purified.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/crushed_purified",
-        "layer1": "gregtech:items/material_sets/magnetic/crushed_purified_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/crushed_purified",
+    "layer1": "gregtech:items/material_sets/magnetic/crushed_purified_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust.json
index 1228c114e72..1413af7ed68 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/dust",
-        "layer1": "gregtech:items/material_sets/magnetic/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/dust",
+    "layer1": "gregtech:items/material_sets/magnetic/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_impure.json
index 9c1f31611fc..919334bd12b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/dust_impure",
-        "layer1": "gregtech:items/material_sets/magnetic/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/dust_impure",
+    "layer1": "gregtech:items/material_sets/magnetic/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_pure.json
index 40bfeb4728e..526845fb7d1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/dust_pure",
-        "layer1": "gregtech:items/material_sets/magnetic/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/dust_pure",
+    "layer1": "gregtech:items/material_sets/magnetic/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_small.json
index ca9c20e180a..1a0d9711d8c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/dust_small",
-        "layer1": "gregtech:items/material_sets/magnetic/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/dust_small",
+    "layer1": "gregtech:items/material_sets/magnetic/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_tiny.json
index 49c53313e9f..8a610fe3243 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/dust_tiny",
-        "layer1": "gregtech:items/material_sets/magnetic/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/dust_tiny",
+    "layer1": "gregtech:items/material_sets/magnetic/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/foil.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/foil.json
index eb8c0813ce1..4e8bbd3a599 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/foil.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/foil.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/foil",
-        "layer1": "gregtech:items/material_sets/magnetic/foil_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/foil",
+    "layer1": "gregtech:items/material_sets/magnetic/foil_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gear.json
index 9d9f88bb14a..a1527148b88 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gear.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/gear",
-        "layer1": "gregtech:items/material_sets/magnetic/gear_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/gear",
+    "layer1": "gregtech:items/material_sets/magnetic/gear_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gear_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gear_small.json
index 8999eb25c21..242ef336f6d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gear_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gear_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/gear_small",
-        "layer1": "gregtech:items/material_sets/magnetic/gear_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/gear_small",
+    "layer1": "gregtech:items/material_sets/magnetic/gear_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem.json
index 850b3d257c0..7d9ab98879c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/gem",
-        "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/gem",
+    "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_chipped.json
index f65bddabc9f..49c0fc617ca 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_chipped.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/gem_chipped",
-        "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/gem_chipped",
+    "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_exquisite.json
index 50b77a98227..f9dc95b018b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_exquisite.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/gem_exquisite",
-        "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/gem_exquisite",
+    "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_flawed.json
index ada813ae5e3..a66d3156648 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_flawed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/gem_flawed",
-        "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/gem_flawed",
+    "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_flawless.json
index f30972889ab..15724064b43 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/gem_flawless.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/gem_flawless",
-        "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/gem_flawless",
+    "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ingot.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ingot.json
index dfd7946b764..833329f4f96 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ingot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ingot.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/ingot",
-        "layer1": "gregtech:items/material_sets/magnetic/ingot_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/ingot",
+    "layer1": "gregtech:items/material_sets/magnetic/ingot_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ingot_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ingot_double.json
index 0339227957b..0037453f1e1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ingot_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ingot_double.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/ingot_double",
-        "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
-    }
-}
\ No newline at end of file
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/ingot_double",
+    "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
+  }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/nugget.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/nugget.json
index aeabc111a63..921a7346e22 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/nugget.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/nugget.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/nugget",
-        "layer1": "gregtech:items/material_sets/magnetic/nugget_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/nugget",
+    "layer1": "gregtech:items/material_sets/magnetic/nugget_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate.json
index 87b3867d276..d9253168be6 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/plate",
-        "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/plate",
+    "layer1": "gregtech:items/material_sets/magnetic/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_curved.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_curved.json
index 162bb8ce90b..4d6e290fc2e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_curved.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_curved.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/plate_curved",
-        "layer1": "gregtech:items/material_sets/magnetic/plate_curved_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/plate_curved",
+    "layer1": "gregtech:items/material_sets/magnetic/plate_curved_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_dense.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_dense.json
index f75bb8e6890..25b206b50a1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_dense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_dense.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/plate_dense",
-        "layer1": "gregtech:items/material_sets/magnetic/plate_dense_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/plate_dense",
+    "layer1": "gregtech:items/material_sets/magnetic/plate_dense_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_double.json
index a4e7b1b50f6..316558bb7a2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/plate_double.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/plate_double",
-        "layer1": "gregtech:items/material_sets/magnetic/plate_double_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/plate_double",
+    "layer1": "gregtech:items/material_sets/magnetic/plate_double_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ring.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ring.json
index 579c6137e10..91ace2fbaf0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/ring.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/ring",
-        "layer1": "gregtech:items/material_sets/magnetic/ring_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/ring",
+    "layer1": "gregtech:items/material_sets/magnetic/ring_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/rotor.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/rotor.json
index 583537cda4c..9404ce27902 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/rotor.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/rotor.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/rotor",
-        "layer1": "gregtech:items/material_sets/magnetic/rotor_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/rotor",
+    "layer1": "gregtech:items/material_sets/magnetic/rotor_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/round.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/round.json
index 3dcbf87e1c4..81895c1ca87 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/round.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/round.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/round",
-        "layer1": "gregtech:items/material_sets/magnetic/round_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/round",
+    "layer1": "gregtech:items/material_sets/magnetic/round_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/screw.json
index 931788c79b2..c287f230a84 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/screw.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/screw",
-        "layer1": "gregtech:items/material_sets/magnetic/screw_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/screw",
+    "layer1": "gregtech:items/material_sets/magnetic/screw_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/spring.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/spring.json
index 5020522796c..4637bc904f3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/spring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/spring.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/spring",
-        "layer1": "gregtech:items/material_sets/magnetic/spring_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/spring",
+    "layer1": "gregtech:items/material_sets/magnetic/spring_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/spring_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/spring_small.json
index 1b8059c984f..8753ac37c54 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/spring_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/spring_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/spring_small",
-        "layer1": "gregtech:items/material_sets/magnetic/spring_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/spring_small",
+    "layer1": "gregtech:items/material_sets/magnetic/spring_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/stick.json
index 0c11da3ae04..d4b1e6d4809 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/stick.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/stick",
-        "layer1": "gregtech:items/material_sets/magnetic/stick_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/stick",
+    "layer1": "gregtech:items/material_sets/magnetic/stick_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/stick_long.json
index 2be6babf295..16937640387 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/stick_long.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/stick_long",
-        "layer1": "gregtech:items/material_sets/magnetic/stick_long_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/stick_long",
+    "layer1": "gregtech:items/material_sets/magnetic/stick_long_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_axe.json
index 2e716f85e02..99919eb53ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_axe.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_axe",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_axe_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_axe",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_axe_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_buzz_saw.json
index 3ad08e86c62..0f8641fce76 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_buzz_saw.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_buzz_saw",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_buzz_saw_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_buzz_saw",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_buzz_saw_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_chainsaw.json
index b41575772cb..3c3137be9eb 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_chainsaw.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_chainsaw",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_chainsaw_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_chainsaw",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_chainsaw_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_drill.json
index df86f48b02f..5e2c1b6af7d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_drill.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_drill",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_drill_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_drill",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_drill_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_file.json
index e9ee29aee27..f647b66b208 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_file.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_file",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_file_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_file",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_file_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_hammer.json
index 34bbf7b7c44..0159e4c1b3d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_hammer.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_hammer",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_hammer_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_hammer",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_hammer_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_hoe.json
index e25d6d1b847..37145b7fba2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_hoe.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_hoe",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_hoe_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_hoe",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_hoe_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_mallet.json
index 3f3535e34ad..d8c8460c8a4 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_mallet.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_mallet",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_mallet_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_mallet",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_mallet_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_pickaxe.json
index c90d5c88665..a9014e78706 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_pickaxe.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_pickaxe",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_pickaxe_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_pickaxe",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_pickaxe_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_plow.json
index e57acf0197c..0622f419008 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_plow.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_plow",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_plow_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_plow",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_plow_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_saw.json
index 6a30046753b..df1aa8d032d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_saw.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_saw",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_saw_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_saw",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_saw_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_screwdriver.json
index 44b5ea74f1f..55c0cb2dff8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_screwdriver.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_screwdriver",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_screwdriver_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_screwdriver",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_screwdriver_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_sense.json
index dcbba0b04de..223b988f1fb 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_sense.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_sense",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_sense_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_sense",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_sense_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_shovel.json
index 0e29858bd80..f14d5ca1cc3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_shovel.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_shovel",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_shovel_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_shovel",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_shovel_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_soldering.json
index be5ee695652..58623e591e1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_sword.json
index a14e97906a5..c1f7ae53b05 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_sword.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_sword",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_sword_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_sword",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_sword_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_universal_spade.json
index 8bb3ea55dfb..b9e18bc6c38 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_universal_spade.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_universal_spade",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_universal_spade_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_universal_spade",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_universal_spade_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_wrench.json
index b9ea0499f90..cbbb95e000a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/tool_head_wrench.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/tool_head_wrench",
-        "layer1": "gregtech:items/material_sets/magnetic/tool_head_wrench_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/tool_head_wrench",
+    "layer1": "gregtech:items/material_sets/magnetic/tool_head_wrench_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/turbine_blade.json
index 32d493dde3b..8075292e1c0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/wire_fine.json b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/wire_fine.json
index 2dea732cb21..22e281467ee 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/wire_fine.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/magnetic/wire_fine.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/magnetic/wire_fine",
-        "layer1": "gregtech:items/material_sets/magnetic/wire_fine_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/magnetic/wire_fine",
+    "layer1": "gregtech:items/material_sets/magnetic/wire_fine_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/bolt.json
index 0f1d2723568..64f504d4524 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/bolt.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/bolt"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/bolt"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/cell_plasma.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/cell_plasma.json
index 2c12a5303f5..db84c547b08 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/cell_plasma.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/cell_plasma.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/cell_plasma",
-        "layer1": "gregtech:items/material_sets/metallic/cell_plasma_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/cell_plasma",
+    "layer1": "gregtech:items/material_sets/metallic/cell_plasma_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed.json
index 2d2b382b1dd..c625a549ab5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/crushed",
-        "layer1": "gregtech:items/material_sets/metallic/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/crushed",
+    "layer1": "gregtech:items/material_sets/metallic/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed_centrifuged.json
index ee48033e98a..cb5950e9936 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed_purified.json
index f381804a46e..7c489ab15fd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust.json
index d1d801857c5..d635f5dcc51 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/dust"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/dust"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_impure.json
index 900e993b756..9a24bc89e37 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/dust_impure",
-        "layer1": "gregtech:items/material_sets/metallic/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/dust_impure",
+    "layer1": "gregtech:items/material_sets/metallic/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_pure.json
index 5fc1767b891..8ad9954fb87 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/dust_pure",
-        "layer1": "gregtech:items/material_sets/metallic/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/dust_pure",
+    "layer1": "gregtech:items/material_sets/metallic/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_small.json
index 2adab0a73ce..0141effdabd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/dust_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/dust_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_tiny.json
index 22e862e2c0a..a59700860c1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/dust_tiny.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/dust_tiny"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/dust_tiny"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/foil.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/foil.json
index 2331cafec89..d1a5c89d51f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/foil.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/foil.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/foil"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/foil"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gear.json
index 70f2e2793e6..9df5d3d902a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gear.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/gear"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/gear"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gear_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gear_small.json
index 87a27ea4f4e..2bb5c9b4fd7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gear_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gear_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/gear_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/gear_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_chipped.json
index daadd7ae8f5..4f10cdc2390 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_chipped.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/gem_chipped"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/gem_chipped"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_exquisite.json
index 56251838165..d4c924bbc25 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_exquisite.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/gem_exquisite"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/gem_exquisite"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_flawed.json
index 53f35b79d69..8b2bfb35a62 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_flawed.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/gem_flawed"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/gem_flawed"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_flawless.json
index bb87ff6a920..924a00721c9 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/gem_flawless.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/gem_flawless"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/gem_flawless"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot.json
index f3bc1b9dbe6..247f895b1cb 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/ingot",
-        "layer1": "gregtech:items/material_sets/metallic/ingot_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/ingot",
+    "layer1": "gregtech:items/material_sets/metallic/ingot_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot_double.json
index 3b4248cfce6..319505a1d43 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot_double.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/ingot_double"
-    }
-}
\ No newline at end of file
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/ingot_double"
+  }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot_hot.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot_hot.json
index 182afe3d485..b98bfb6f753 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot_hot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ingot_hot.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/ingot_hot",
-        "layer1": "gregtech:items/material_sets/metallic/ingot_hot_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/ingot_hot",
+    "layer1": "gregtech:items/material_sets/metallic/ingot_hot_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/nugget.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/nugget.json
index 9167341e41d..c75fcf2a9a6 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/nugget.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/nugget.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/nugget"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/nugget"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate.json
index 7f9c4c9349b..f564968688f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/plate"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/plate"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_curved.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_curved.json
index 6849040b8a7..9f7c902cb09 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_curved.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_curved.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/plate_curved"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/plate_curved"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_dense.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_dense.json
index 3c400ad6e70..381f5661c92 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_dense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_dense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/plate_dense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/plate_dense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_double.json
index 10a986a1bca..5a34683dad7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/plate_double.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/plate_double"
-    }
-}
\ No newline at end of file
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/plate_double"
+  }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ring.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ring.json
index c32d83ffc07..ed4bc40d950 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ring.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/ring"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/ring"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/rotor.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/rotor.json
index 9f4c213fcc2..897cf9d0da9 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/rotor.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/rotor.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/rotor"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/rotor"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/round.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/round.json
index 97a4c2410a0..b80a2f4caa7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/round.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/round.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/round"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/round"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/screw.json
index 5e0b0201ff4..f45e73c6ee9 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/spring.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/spring.json
index 794fc16bae5..53d7d1940ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/spring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/spring.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/spring"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/spring"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/spring_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/spring_small.json
index d81c4eef849..ffeb8f244ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/spring_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/spring_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/spring_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/spring_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/stick.json
index 99f1938220d..55023b18e9a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/stick.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/stick"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/stick"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/stick_long.json
index 517d4edfb8d..90cffafff52 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/stick_long.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/stick_long"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/stick_long"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_axe.json
index 67cc7bc20c7..0828be353ff 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_buzz_saw.json
index 5fc371f3f40..f669790c1ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_chainsaw.json
index 20fd020cc9d..12928a121bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_drill.json
index 3d2339b546a..0441927037c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_file.json
index e8a909a2557..9556453a7f0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_hammer.json
index a7521e0a288..5e0024b2286 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_hoe.json
index 8263f236cc8..e1c1570d1bd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_mallet.json
index 9c073d4b3c3..8e7a31b5833 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_pickaxe.json
index 716ab28cc60..a9ab73be1c3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_plow.json
index 993d48976e7..58fea490d6a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_saw.json
index 3a850489e29..1717093b1ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_screwdriver.json
index cf4367d7f60..10be70a3e90 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_sense.json
index ac27e5288d9..4587e52540d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_shovel.json
index b4db8462302..7b6e7a2f1b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_soldering.json
index 323a458f600..1b456d7d91f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_sword.json
index 7cde8e53f95..900fdf5bbfc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_universal_spade.json
index 4e8bb1e8142..0a75caa4178 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_wrench.json
index 59d27a6cd0d..a8df45406e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/turbine_blade.json
index 484c78075cc..e4f8466b3cd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/wire_fine.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/wire_fine.json
index b18a457b848..e58d69fbe3a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/wire_fine.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/wire_fine.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/wire_fine",
-        "layer1": "gregtech:items/material_sets/metallic/wire_fine_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/wire_fine",
+    "layer1": "gregtech:items/material_sets/metallic/wire_fine_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/bolt.json
index 8b7f73dcdf1..e75e98c1ac4 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/bolt",
-        "layer1": "gregtech:items/material_sets/netherstar/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/bolt",
+    "layer1": "gregtech:items/material_sets/netherstar/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed.json
index 12d0661a8a9..b3d3418226d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/crushed",
-        "layer1": "gregtech:items/material_sets/netherstar/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/crushed",
+    "layer1": "gregtech:items/material_sets/netherstar/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed_centrifuged.json
index f0b0702d617..0d555c74edb 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed_purified.json
index 2a9fe34c2c4..2760f58634f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust.json
index 58de429cf3a..00bcf54a66d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/dust",
-        "layer1": "gregtech:items/material_sets/netherstar/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/dust",
+    "layer1": "gregtech:items/material_sets/netherstar/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_impure.json
index 36eedba8816..025c931a2de 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/dust_impure",
-        "layer1": "gregtech:items/material_sets/netherstar/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/dust_impure",
+    "layer1": "gregtech:items/material_sets/netherstar/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_pure.json
index 0904877a1d3..19696987b8a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/dust_pure",
-        "layer1": "gregtech:items/material_sets/netherstar/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/dust_pure",
+    "layer1": "gregtech:items/material_sets/netherstar/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_small.json
index 29bd8adb62f..79ca7b4af27 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/dust_small",
-        "layer1": "gregtech:items/material_sets/netherstar/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/dust_small",
+    "layer1": "gregtech:items/material_sets/netherstar/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_tiny.json
index e3deb2040d7..57ec630e572 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/dust_tiny",
-        "layer1": "gregtech:items/material_sets/netherstar/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/dust_tiny",
+    "layer1": "gregtech:items/material_sets/netherstar/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gear.json
index 3d1a39e8f5c..1d8bb704502 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gear.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/gear",
-        "layer1": "gregtech:items/material_sets/netherstar/gear_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/gear",
+    "layer1": "gregtech:items/material_sets/netherstar/gear_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem.json
index c589f1993de..47d4cc57bcc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/gem"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/gem"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_chipped.json
index 5aa445aa90b..c5c7cded038 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_chipped.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/gem_chipped"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/gem_chipped"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_exquisite.json
index 72556a8c7e8..58d747caeca 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_exquisite.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/gem_exquisite"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/gem_exquisite"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_flawed.json
index 9f4acae4e12..af91bd60b96 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_flawed.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/gem_flawed"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/gem_flawed"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_flawless.json
index 0b44155c303..c0c3990fc26 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/gem_flawless.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/gem_flawless"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/gem_flawless"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/lens.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/lens.json
index 689f408c32c..01fa0f30bcd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/lens.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/lens.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/lens",
-        "layer1": "gregtech:items/material_sets/netherstar/lens_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/lens",
+    "layer1": "gregtech:items/material_sets/netherstar/lens_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/plate.json
index 8f8dc8424c2..a37bd94a545 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/plate.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/plate",
-        "layer1": "gregtech:items/material_sets/netherstar/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/plate",
+    "layer1": "gregtech:items/material_sets/netherstar/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/screw.json
index a95aac1eefb..223b9035c23 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/stick.json
index 2cc67204cd2..536486cfdfc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/stick.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/stick",
-        "layer1": "gregtech:items/material_sets/netherstar/stick_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/stick",
+    "layer1": "gregtech:items/material_sets/netherstar/stick_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/stick_long.json
index 536252e77d7..31cb14998e4 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/stick_long.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/netherstar/stick_long"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/netherstar/stick_long"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_axe.json
index 67cc7bc20c7..0828be353ff 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_buzz_saw.json
index 5fc371f3f40..f669790c1ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_chainsaw.json
index 20fd020cc9d..12928a121bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_drill.json
index 3d2339b546a..0441927037c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_file.json
index e8a909a2557..9556453a7f0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_hammer.json
index a7521e0a288..5e0024b2286 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_hoe.json
index 8263f236cc8..e1c1570d1bd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_mallet.json
index 9c073d4b3c3..8e7a31b5833 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_pickaxe.json
index 716ab28cc60..a9ab73be1c3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_plow.json
index 993d48976e7..58fea490d6a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_saw.json
index 3a850489e29..1717093b1ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_screwdriver.json
index cf4367d7f60..10be70a3e90 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_sense.json
index ac27e5288d9..4587e52540d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_shovel.json
index b4db8462302..7b6e7a2f1b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_soldering.json
index 323a458f600..1b456d7d91f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_sword.json
index 7cde8e53f95..900fdf5bbfc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_universal_spade.json
index 4e8bb1e8142..0a75caa4178 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_wrench.json
index 59d27a6cd0d..a8df45406e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/turbine_blade.json
index 484c78075cc..e4f8466b3cd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/bolt.json
index dbde7a8897d..38dd4945db6 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/bolt",
-        "layer1": "gregtech:items/material_sets/opal/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/bolt",
+    "layer1": "gregtech:items/material_sets/opal/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed.json
index d86676042fd..1e47db5becc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/crushed",
-        "layer1": "gregtech:items/material_sets/opal/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/crushed",
+    "layer1": "gregtech:items/material_sets/opal/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed_centrifuged.json
index f34de21e370..e4d99947aef 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed_purified.json
index 7c635eacbf4..59ae6cbbd86 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust.json
index d3232e3aa80..709d9067384 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/dust",
-        "layer1": "gregtech:items/material_sets/opal/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/dust",
+    "layer1": "gregtech:items/material_sets/opal/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_impure.json
index 17cff6c84a4..cdfd03eae73 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/dust_impure",
-        "layer1": "gregtech:items/material_sets/opal/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/dust_impure",
+    "layer1": "gregtech:items/material_sets/opal/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_pure.json
index c39844f7914..3caad215679 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/dust_pure",
-        "layer1": "gregtech:items/material_sets/opal/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/dust_pure",
+    "layer1": "gregtech:items/material_sets/opal/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_small.json
index 2769bb0343d..28130b85755 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/dust_small",
-        "layer1": "gregtech:items/material_sets/opal/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/dust_small",
+    "layer1": "gregtech:items/material_sets/opal/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_tiny.json
index 1522b8426f7..f3145f16179 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/dust_tiny",
-        "layer1": "gregtech:items/material_sets/opal/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/dust_tiny",
+    "layer1": "gregtech:items/material_sets/opal/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem.json
index 1bd347c7bbd..78954f2e3da 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/gem",
-        "layer1": "gregtech:items/material_sets/opal/gem_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/gem",
+    "layer1": "gregtech:items/material_sets/opal/gem_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_chipped.json
index 14b6cf8a12f..a19184dc2cc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_chipped.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/gem_chipped",
-        "layer1": "gregtech:items/material_sets/opal/gem_chipped_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/gem_chipped",
+    "layer1": "gregtech:items/material_sets/opal/gem_chipped_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_exquisite.json
index e4955dc9e2d..5add3613a4c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_exquisite.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/gem_exquisite",
-        "layer1": "gregtech:items/material_sets/opal/gem_exquisite_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/gem_exquisite",
+    "layer1": "gregtech:items/material_sets/opal/gem_exquisite_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_flawed.json
index ca7910cd595..2466aadbce4 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_flawed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/gem_flawed",
-        "layer1": "gregtech:items/material_sets/opal/gem_flawed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/gem_flawed",
+    "layer1": "gregtech:items/material_sets/opal/gem_flawed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_flawless.json
index 4ddca658ed0..ba416c10f2c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/gem_flawless.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/gem_flawless",
-        "layer1": "gregtech:items/material_sets/opal/gem_flawless_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/gem_flawless",
+    "layer1": "gregtech:items/material_sets/opal/gem_flawless_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/lens.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/lens.json
index b8d7a0ce548..662e8e36c14 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/lens.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/lens.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/lens",
-        "layer1": "gregtech:items/material_sets/opal/lens_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/lens",
+    "layer1": "gregtech:items/material_sets/opal/lens_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/plate.json
index 10e0d654659..017fdde5e78 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/plate.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/plate",
-        "layer1": "gregtech:items/material_sets/opal/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/plate",
+    "layer1": "gregtech:items/material_sets/opal/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/stick.json
index adb7cb99653..c2c1e3dd6d5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/stick.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/stick",
-        "layer1": "gregtech:items/material_sets/opal/stick_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/stick",
+    "layer1": "gregtech:items/material_sets/opal/stick_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/stick_long.json
index 1fa93481abf..e772efe1158 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/stick_long.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/opal/stick_long",
-        "layer1": "gregtech:items/material_sets/opal/stick_long_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/opal/stick_long",
+    "layer1": "gregtech:items/material_sets/opal/stick_long_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_axe.json
index 67cc7bc20c7..0828be353ff 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_buzz_saw.json
index 5fc371f3f40..f669790c1ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_chainsaw.json
index 20fd020cc9d..12928a121bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_drill.json
index 3d2339b546a..0441927037c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_file.json
index e8a909a2557..9556453a7f0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_hammer.json
index a7521e0a288..5e0024b2286 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_hoe.json
index 8263f236cc8..e1c1570d1bd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_mallet.json
index 9c073d4b3c3..8e7a31b5833 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_pickaxe.json
index 716ab28cc60..a9ab73be1c3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_plow.json
index 993d48976e7..58fea490d6a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_saw.json
index 3a850489e29..1717093b1ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_screwdriver.json
index cf4367d7f60..10be70a3e90 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_sense.json
index ac27e5288d9..4587e52540d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_shovel.json
index b4db8462302..7b6e7a2f1b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_soldering.json
index 323a458f600..1b456d7d91f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_sword.json
index 7cde8e53f95..900fdf5bbfc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_universal_spade.json
index 4e8bb1e8142..0a75caa4178 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_wrench.json
index 59d27a6cd0d..a8df45406e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/turbine_blade.json
index 484c78075cc..e4f8466b3cd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/opal/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust.json
index 001419419fb..71bbc22b1ad 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/paper/dust"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/paper/dust"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_impure.json
index b1363557bec..422eb6f837d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/paper/dust_impure",
-        "layer1": "gregtech:items/material_sets/paper/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/paper/dust_impure",
+    "layer1": "gregtech:items/material_sets/paper/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_pure.json
index 37b8fd7d9f1..ab2f99d5a22 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/paper/dust_pure",
-        "layer1": "gregtech:items/material_sets/paper/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/paper/dust_pure",
+    "layer1": "gregtech:items/material_sets/paper/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_small.json
index a4ae71161ac..5391bda42c0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/paper/dust_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/paper/dust_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_tiny.json
index 325e09d5ba3..3d19c0dd50d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/paper/dust_tiny.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/paper/dust_tiny"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/paper/dust_tiny"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/paper/ring.json b/src/main/resources/assets/gregtech/models/item/material_sets/paper/ring.json
index c4d0c158d5b..4f2c3ba2315 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/paper/ring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/paper/ring.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/paper/ring"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/paper/ring"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust.json
index 1ab036253ed..c16aa163eb2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/powder/dust"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/powder/dust"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_impure.json
index 0ab6791f3ff..353cde834c6 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_impure.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/powder/dust_impure"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/powder/dust_impure"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_pure.json
index f0886d81379..a72fd1ab318 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_pure.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/powder/dust_pure"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/powder/dust_pure"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_small.json
index 91dbe13c41b..f352e66141b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/powder/dust_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/powder/dust_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_tiny.json
index ca72f4172c6..2e94ce17d1e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/powder/dust_tiny.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/powder/dust_tiny"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/powder/dust_tiny"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/bolt.json
index 7ea00aa0112..1ad32ece385 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/bolt",
-        "layer1": "gregtech:items/material_sets/quartz/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/bolt",
+    "layer1": "gregtech:items/material_sets/quartz/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed.json
index bb3e5aa4caf..3b4fcd49781 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/crushed",
-        "layer1": "gregtech:items/material_sets/quartz/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/crushed",
+    "layer1": "gregtech:items/material_sets/quartz/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed_centrifuged.json
index 37408dadcc4..73e8f69bfcc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed_purified.json
index 072892d28e2..fa95e9c4e95 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust.json
index d05f822eeb7..3a0b842331d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/dust"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/dust"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_impure.json
index 7324c5edcb2..b6734e33ed5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/dust_impure",
-        "layer1": "gregtech:items/material_sets/quartz/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/dust_impure",
+    "layer1": "gregtech:items/material_sets/quartz/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_pure.json
index 5c05192a417..c312ce52d35 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/dust_pure",
-        "layer1": "gregtech:items/material_sets/quartz/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/dust_pure",
+    "layer1": "gregtech:items/material_sets/quartz/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_small.json
index d9372192020..02862efc674 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/dust_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/dust_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_tiny.json
index a4e81048bec..9e2f6a8e8c6 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/dust_tiny.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/dust_tiny"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/dust_tiny"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gear.json
index 0d6322bbad1..2896dcaf45b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gear.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/gear"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/gear"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem.json
index c65ac2501da..927bae15fda 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/gem"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/gem"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_chipped.json
index cb31f099668..9423f724801 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_chipped.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/gem_chipped"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/gem_chipped"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_exquisite.json
index 24e6830ceb6..bd3e46390b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_exquisite.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/gem_exquisite"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/gem_exquisite"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_flawed.json
index 98e6bfd2d6c..b3d26da1b6a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_flawed.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/gem_flawed"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/gem_flawed"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_flawless.json
index 89e95188868..81c1aa83083 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/gem_flawless.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/gem_flawless"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/gem_flawless"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/lens.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/lens.json
index 94a1a82393b..09515474b17 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/lens.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/lens.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/lens",
-        "layer1": "gregtech:items/material_sets/quartz/lens_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/lens",
+    "layer1": "gregtech:items/material_sets/quartz/lens_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/plate.json
index c06bb7b8541..445def34909 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/plate.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/plate"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/plate"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/plate_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/plate_double.json
index a855878adde..87e7923a5ac 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/plate_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/plate_double.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/plate_double"
-    }
-}
\ No newline at end of file
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/plate_double"
+  }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/screw.json
index b47805bc13b..a6cc5b98b58 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/stick.json
index d5bd104496d..b13b936d132 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/stick.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/stick"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/stick"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/stick_long.json
index 238c6da91ae..f2e22be33f4 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/stick_long.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/quartz/stick_long"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/quartz/stick_long"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_axe.json
index 67cc7bc20c7..0828be353ff 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_buzz_saw.json
index 5fc371f3f40..f669790c1ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_chainsaw.json
index 20fd020cc9d..12928a121bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_drill.json
index 3d2339b546a..0441927037c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_file.json
index e8a909a2557..9556453a7f0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_hammer.json
index a7521e0a288..5e0024b2286 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_hoe.json
index 8263f236cc8..e1c1570d1bd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_mallet.json
index 9c073d4b3c3..8e7a31b5833 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_pickaxe.json
index 716ab28cc60..a9ab73be1c3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_plow.json
index 993d48976e7..58fea490d6a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_saw.json
index 3a850489e29..1717093b1ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_screwdriver.json
index cf4367d7f60..10be70a3e90 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_sense.json
index ac27e5288d9..4587e52540d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_shovel.json
index b4db8462302..7b6e7a2f1b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_soldering.json
index 323a458f600..1b456d7d91f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_sword.json
index 7cde8e53f95..900fdf5bbfc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_universal_spade.json
index 4e8bb1e8142..0a75caa4178 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_wrench.json
index 59d27a6cd0d..a8df45406e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/turbine_blade.json
index 484c78075cc..e4f8466b3cd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/bolt.json
index fb9a49fd5ed..fc0d32940f7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/bolt.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/bolt"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/bolt"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed.json
index f2f1853ed56..21ce3793101 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/crushed",
-        "layer1": "gregtech:items/material_sets/rough/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/crushed",
+    "layer1": "gregtech:items/material_sets/rough/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed_centrifuged.json
index 407c47db97e..c7077637a83 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed_purified.json
index 40fbf844c1a..eecb8a03d66 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust.json
index 5bb90183ebb..54654bbb3bb 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/dust",
-        "layer1": "gregtech:items/material_sets/rough/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/dust",
+    "layer1": "gregtech:items/material_sets/rough/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_impure.json
index 8753c2807a7..247210199a0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/dust_impure",
-        "layer1": "gregtech:items/material_sets/rough/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/dust_impure",
+    "layer1": "gregtech:items/material_sets/rough/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_pure.json
index 6b88c14c848..6a9012924e8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/dust_pure",
-        "layer1": "gregtech:items/material_sets/rough/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/dust_pure",
+    "layer1": "gregtech:items/material_sets/rough/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_small.json
index 020e043bfa9..2957b923f20 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/dust_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/dust_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_tiny.json
index 80486be4ad0..db39d1b5071 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/dust_tiny.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/dust_tiny"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/dust_tiny"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/foil.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/foil.json
index 26b5b35bbb2..bf7dd00bf26 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/foil.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/foil.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/foil"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/foil"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/gear.json
index fe877ed1c9a..87a3a7fd6f3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/gear.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/gear"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/gear"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/gear_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/gear_small.json
index 3cc5a6ab5d4..8888a5dee30 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/gear_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/gear_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/gear_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/gear_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/ingot.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/ingot.json
index 1101c93e6f3..e8e116ceb04 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/ingot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/ingot.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/ingot",
-        "layer1": "gregtech:items/material_sets/rough/ingot_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/ingot",
+    "layer1": "gregtech:items/material_sets/rough/ingot_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/ingot_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/ingot_double.json
index e55c5c02606..877eab0a82d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/ingot_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/ingot_double.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/ingot_double"
-    }
-}
\ No newline at end of file
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/ingot_double"
+  }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/nugget.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/nugget.json
index fcf98d4f2d8..01f9bbbeed1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/nugget.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/nugget.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/nugget"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/nugget"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate.json
index 36625c4f61e..556bc28d534 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/plate"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/plate"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_curved.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_curved.json
index 35738adf66e..d26aac7c70e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_curved.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_curved.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/plate_curved"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/plate_curved"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_dense.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_dense.json
index 08f3b1ed4e4..72109bcd686 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_dense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_dense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/plate_dense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/plate_dense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_double.json
index dc67f3fcbfb..8195786361d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/plate_double.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/plate_double"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/plate_double"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/ring.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/ring.json
index 4ba36a92fac..9be3ad59fed 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/ring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/ring.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/ring"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/ring"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/rotor.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/rotor.json
index 97adaeb5264..17fe1b50e4f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/rotor.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/rotor.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/rotor"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/rotor"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/round.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/round.json
index 598f30a75c3..ddbecdb7c30 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/round.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/round.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/round"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/round"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/screw.json
index 7436b6f5a85..e4f3aeae055 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/spring.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/spring.json
index d1a1b564c94..087913952d2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/spring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/spring.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/spring"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/spring"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/spring_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/spring_small.json
index 35d749d5bb6..2b9e94089f9 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/spring_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/spring_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/spring_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/spring_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/stick.json
index 3d41177deec..3d4e9cbfb05 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/stick.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/stick"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/stick"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/stick_long.json
index e7ce11aac4c..6ecc5eb186d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/stick_long.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/stick_long"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/stick_long"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_axe.json
index 2bc272541eb..aac2d522ba1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_buzz_saw.json
index 13fcc29358e..edb8d2b6730 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_chainsaw.json
index 19f734528dc..bb0b6b6d844 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_drill.json
index 85a26b57f2c..d2fc68e03f5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_file.json
index 5b7b7dc3ce2..a802bfd6376 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_hammer.json
index 491e3da62d8..229754a990f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_hoe.json
index 59bc269bf61..d64bb08683c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_mallet.json
index 589604764ff..6d7c25552bb 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_pickaxe.json
index 80f4ed58f45..515e955f03f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_plow.json
index dcf56029613..42074643e88 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_saw.json
index c7fb30d9de3..541ba0d6735 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_screwdriver.json
index 7db0b4f3b74..3da04afbee7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_sense.json
index 976c79a5841..b442e352e8d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_shovel.json
index 1c6ac1f44ce..1c4320645e5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_soldering.json
index cb301b50a56..d958fd0a24d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_sword.json
index 627063b15ba..fd437bd3b31 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_universal_spade.json
index b7b96beb902..f79bd17cb74 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_wrench.json
index 49bad191db7..1aa8116d713 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/turbine_blade.json
index 7beecc691ab..aa5aea8eddf 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/wire_fine.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/wire_fine.json
index a3fe0002bd6..70f85ab1414 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/wire_fine.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/rough/wire_fine.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/rough/wire_fine",
-        "layer1": "gregtech:items/material_sets/rough/wire_fine_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/rough/wire_fine",
+    "layer1": "gregtech:items/material_sets/rough/wire_fine_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/bolt.json
index 642fde4c998..711974194ea 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/bolt",
-        "layer1": "gregtech:items/material_sets/ruby/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/bolt",
+    "layer1": "gregtech:items/material_sets/ruby/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed.json
index d797af51e2a..9a6211c1c21 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/crushed",
-        "layer1": "gregtech:items/material_sets/ruby/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/crushed",
+    "layer1": "gregtech:items/material_sets/ruby/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed_centrifuged.json
index bc83edded17..5ca819d3df3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed_purified.json
index 63f25204fb0..392832e42fe 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust.json
index 94f31e8fa9e..5ed85bad5b9 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/dust",
-        "layer1": "gregtech:items/material_sets/ruby/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/dust",
+    "layer1": "gregtech:items/material_sets/ruby/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_impure.json
index ab94733e79a..a813710160e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/dust_impure",
-        "layer1": "gregtech:items/material_sets/ruby/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/dust_impure",
+    "layer1": "gregtech:items/material_sets/ruby/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_pure.json
index e513c538afb..de1c06d60a8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/dust_pure",
-        "layer1": "gregtech:items/material_sets/ruby/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/dust_pure",
+    "layer1": "gregtech:items/material_sets/ruby/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_small.json
index 57db719b73b..7236aaf56ec 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/dust_small",
-        "layer1": "gregtech:items/material_sets/ruby/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/dust_small",
+    "layer1": "gregtech:items/material_sets/ruby/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_tiny.json
index 5d7a6e68496..784c5dddcb1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/dust_tiny",
-        "layer1": "gregtech:items/material_sets/ruby/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/dust_tiny",
+    "layer1": "gregtech:items/material_sets/ruby/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem.json
index 18a0ef88f2c..0cfaef91324 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/gem"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/gem"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_chipped.json
index c7ffe0fb8bb..3854429f937 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_chipped.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_chipped.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/gem_chipped",
-        "layer1": "gregtech:items/material_sets/ruby/gem_chipped_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/gem_chipped",
+    "layer1": "gregtech:items/material_sets/ruby/gem_chipped_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_exquisite.json
index 05007d3eda2..46db8939974 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_exquisite.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_exquisite.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/gem_exquisite",
-        "layer1": "gregtech:items/material_sets/ruby/gem_exquisite_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/gem_exquisite",
+    "layer1": "gregtech:items/material_sets/ruby/gem_exquisite_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_flawed.json
index 5aa0dfc8d57..fdc69b27bc3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_flawed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_flawed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/gem_flawed",
-        "layer1": "gregtech:items/material_sets/ruby/gem_flawed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/gem_flawed",
+    "layer1": "gregtech:items/material_sets/ruby/gem_flawed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_flawless.json
index c5ca3c03b1a..6d9efd4c8e8 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_flawless.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/gem_flawless.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/gem_flawless",
-        "layer1": "gregtech:items/material_sets/ruby/gem_flawless_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/gem_flawless",
+    "layer1": "gregtech:items/material_sets/ruby/gem_flawless_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/lens.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/lens.json
index 52e32e7b921..1d956df1a6c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/lens.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/lens.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/lens",
-        "layer1": "gregtech:items/material_sets/ruby/lens_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/lens",
+    "layer1": "gregtech:items/material_sets/ruby/lens_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/plate.json
index 081535eda62..f7dbeea186f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/plate.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/plate",
-        "layer1": "gregtech:items/material_sets/ruby/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/plate",
+    "layer1": "gregtech:items/material_sets/ruby/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/screw.json
index e5bf4b83929..56a17f5adad 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/stick.json
index a5ea01c3c9c..a40a4507e30 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/stick.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/stick",
-        "layer1": "gregtech:items/material_sets/ruby/stick_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/stick",
+    "layer1": "gregtech:items/material_sets/ruby/stick_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/stick_long.json
index 4265f57e86a..b52f2d08d6b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/stick_long.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/ruby/stick_long",
-        "layer1": "gregtech:items/material_sets/ruby/stick_long_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/ruby/stick_long",
+    "layer1": "gregtech:items/material_sets/ruby/stick_long_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_axe.json
index 67cc7bc20c7..0828be353ff 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_buzz_saw.json
index 5fc371f3f40..f669790c1ce 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_chainsaw.json
index 20fd020cc9d..12928a121bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_drill.json
index 3d2339b546a..0441927037c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_file.json
index e8a909a2557..9556453a7f0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_hammer.json
index a7521e0a288..5e0024b2286 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_hoe.json
index 8263f236cc8..e1c1570d1bd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_mallet.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_mallet.json
index 9c073d4b3c3..8e7a31b5833 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_mallet.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_mallet.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_mallet"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_pickaxe.json
index 716ab28cc60..a9ab73be1c3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_plow.json
index 993d48976e7..58fea490d6a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_saw.json
index 3a850489e29..1717093b1ab 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_screwdriver.json
index cf4367d7f60..10be70a3e90 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_sense.json
index ac27e5288d9..4587e52540d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_shovel.json
index b4db8462302..7b6e7a2f1b5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_soldering.json
index 323a458f600..1b456d7d91f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_sword.json
index 7cde8e53f95..900fdf5bbfc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_universal_spade.json
index 4e8bb1e8142..0a75caa4178 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_wrench.json
index 59d27a6cd0d..a8df45406e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/turbine_blade.json
index 484c78075cc..e4f8466b3cd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/metallic/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed.json
index e5a3c68a1bf..e2fd230b3a0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/sand/crushed",
-        "layer1": "gregtech:items/material_sets/sand/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/sand/crushed",
+    "layer1": "gregtech:items/material_sets/sand/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed_centrifuged.json
index 3a2daa424b2..673326de9bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/sand/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/sand/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed_purified.json
index cb4b5f8f564..a67aef95436 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/sand/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/sand/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/sand/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust.json
index b59ba7d5972..155808ded7e 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/sand/dust",
-        "layer1": "gregtech:items/material_sets/sand/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/sand/dust",
+    "layer1": "gregtech:items/material_sets/sand/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_impure.json
index 2b6224031d6..cec2520c367 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/sand/dust_impure",
-        "layer1": "gregtech:items/material_sets/sand/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/sand/dust_impure",
+    "layer1": "gregtech:items/material_sets/sand/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_pure.json
index 60ea8a69ecc..fecc03ca268 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/sand/dust_pure",
-        "layer1": "gregtech:items/material_sets/sand/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/sand/dust_pure",
+    "layer1": "gregtech:items/material_sets/sand/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_small.json
index dda58517f61..49c48ce3193 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/sand/dust_small",
-        "layer1": "gregtech:items/material_sets/sand/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/sand/dust_small",
+    "layer1": "gregtech:items/material_sets/sand/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_tiny.json
index 3f3764174f6..8c22b6620a4 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/sand/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/sand/dust_tiny",
-        "layer1": "gregtech:items/material_sets/sand/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/sand/dust_tiny",
+    "layer1": "gregtech:items/material_sets/sand/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/bolt.json
index 03e9f45c832..4f297fc64ee 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/bolt",
-        "layer1": "gregtech:items/material_sets/shiny/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/bolt",
+    "layer1": "gregtech:items/material_sets/shiny/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/cell_plasma.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/cell_plasma.json
index 917fa6ae5d4..9edbb30a40a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/cell_plasma.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/cell_plasma.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/cell_plasma",
-        "layer1": "gregtech:items/material_sets/shiny/cell_plasma_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/cell_plasma",
+    "layer1": "gregtech:items/material_sets/shiny/cell_plasma_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed.json
index 9bdfed6dced..f22af10a1e9 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/crushed",
-        "layer1": "gregtech:items/material_sets/shiny/crushed_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/crushed",
+    "layer1": "gregtech:items/material_sets/shiny/crushed_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed_centrifuged.json
index 8240cfa2869..4368b09cf67 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed_centrifuged.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed_centrifuged.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/crushed_centrifuged"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/crushed_centrifuged"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed_purified.json
index a6562255cb4..ce6f68501d2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed_purified.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/crushed_purified.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/crushed_purified"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/crushed_purified"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust.json
index 23b370ba799..688b82454e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/dust",
-        "layer1": "gregtech:items/material_sets/shiny/dust_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/dust",
+    "layer1": "gregtech:items/material_sets/shiny/dust_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_impure.json
index 96a76bbd8ba..4c677fc68d4 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_impure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_impure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/dust_impure",
-        "layer1": "gregtech:items/material_sets/shiny/dust_impure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/dust_impure",
+    "layer1": "gregtech:items/material_sets/shiny/dust_impure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_pure.json
index 05df984c6f8..8fa9f51b2fb 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_pure.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_pure.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/dust_pure",
-        "layer1": "gregtech:items/material_sets/shiny/dust_pure_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/dust_pure",
+    "layer1": "gregtech:items/material_sets/shiny/dust_pure_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_small.json
index 90090d39fe3..a00263ce676 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/dust_small",
-        "layer1": "gregtech:items/material_sets/shiny/dust_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/dust_small",
+    "layer1": "gregtech:items/material_sets/shiny/dust_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_tiny.json
index af0f74b84f7..506c3e8e55a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/dust_tiny.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/dust_tiny",
-        "layer1": "gregtech:items/material_sets/shiny/dust_tiny_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/dust_tiny",
+    "layer1": "gregtech:items/material_sets/shiny/dust_tiny_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/foil.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/foil.json
index 7728f0b4c0d..9129219f908 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/foil.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/foil.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/foil"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/foil"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/gear.json
index c95162cf94a..9826d952760 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/gear.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/gear",
-        "layer1": "gregtech:items/material_sets/shiny/gear_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/gear",
+    "layer1": "gregtech:items/material_sets/shiny/gear_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/gear_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/gear_small.json
index bb723b3b1a1..817f1e445b3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/gear_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/gear_small.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/gear_small",
-        "layer1": "gregtech:items/material_sets/shiny/gear_small_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/gear_small",
+    "layer1": "gregtech:items/material_sets/shiny/gear_small_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot.json
index 82364482ac5..9ba6d271d2a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/ingot",
-        "layer1": "gregtech:items/material_sets/shiny/ingot_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/ingot",
+    "layer1": "gregtech:items/material_sets/shiny/ingot_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot_double.json
index 62584d30819..00e982db8a2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot_double.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/ingot_double",
-        "layer1": "gregtech:items/material_sets/shiny/ingot_double_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/ingot_double",
+    "layer1": "gregtech:items/material_sets/shiny/ingot_double_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot_hot.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot_hot.json
index 0e3d01fca70..f3c12849fca 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot_hot.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ingot_hot.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/ingot_hot",
-        "layer1": "gregtech:items/material_sets/shiny/ingot_hot_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/ingot_hot",
+    "layer1": "gregtech:items/material_sets/shiny/ingot_hot_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/nugget.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/nugget.json
index c6d811e5f09..5a4f2112139 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/nugget.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/nugget.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/nugget",
-        "layer1": "gregtech:items/material_sets/shiny/nugget_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/nugget",
+    "layer1": "gregtech:items/material_sets/shiny/nugget_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate.json
index d0535c52f60..eb68f3bf1ea 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/plate",
-        "layer1": "gregtech:items/material_sets/shiny/plate_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/plate",
+    "layer1": "gregtech:items/material_sets/shiny/plate_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate_curved.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate_curved.json
index 775bf104284..420f977d554 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate_curved.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate_curved.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/plate_curved"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/plate_curved"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate_dense.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate_dense.json
index aa5491884c4..e45e33c5d79 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate_dense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/plate_dense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/plate_dense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/plate_dense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ring.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ring.json
index b28b4a4cbfe..7c7b5d6ba0a 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ring.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/ring",
-        "layer1": "gregtech:items/material_sets/shiny/ring_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/ring",
+    "layer1": "gregtech:items/material_sets/shiny/ring_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/rotor.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/rotor.json
index ead94121e4d..72c1bd7b5b1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/rotor.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/rotor.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/rotor"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/rotor"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/round.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/round.json
index 020e6aac9b3..bcf953662a5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/round.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/round.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/round",
-        "layer1": "gregtech:items/material_sets/shiny/round_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/round",
+    "layer1": "gregtech:items/material_sets/shiny/round_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/screw.json
index adf791a4b0d..e1ecd2150d2 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/spring.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/spring.json
index 8a91ca3ffe5..5df3d63fde1 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/spring.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/spring.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/spring"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/spring"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/spring_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/spring_small.json
index 26149ead99a..9a5d4237bcf 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/spring_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/spring_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/spring_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/spring_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/stick.json
index 4b154b7c996..89941fb208d 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/stick.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/stick.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/stick",
-        "layer1": "gregtech:items/material_sets/shiny/stick_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/stick",
+    "layer1": "gregtech:items/material_sets/shiny/stick_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/stick_long.json
index 77d50efa245..71f92ad0009 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/stick_long.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/stick_long",
-        "layer1": "gregtech:items/material_sets/shiny/stick_long_overlay"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/stick_long",
+    "layer1": "gregtech:items/material_sets/shiny/stick_long_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/toolHeadSoldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/toolHeadSoldering.json
index 2eff0af228a..7d9849367bc 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/toolHeadSoldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/toolHeadSoldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/toolHeadSoldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/toolHeadSoldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_axe.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_axe.json
index 1cda01d2685..b34b1137633 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_axe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_axe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_axe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_axe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_buzz_saw.json
index eb33fd7104f..86dba1791e9 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_buzz_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_buzz_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_buzz_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_buzz_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_chainsaw.json
index e02b868795e..235b89b0815 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_chainsaw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_chainsaw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_chainsaw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_chainsaw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_drill.json
index 3a1637a8782..81e5ff5f57c 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_drill.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_drill.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_drill"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_drill"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_file.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_file.json
index 0a42b997817..23233e31374 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_file.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_file.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_file"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_file"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_hammer.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_hammer.json
index 313a4b8656c..ef250918094 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_hammer.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_hammer.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_hammer"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_hammer"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_hoe.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_hoe.json
index 9c549349adb..0aac5f3ee05 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_hoe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_hoe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_hoe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_hoe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_pickaxe.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_pickaxe.json
index 0dac547cf72..e5b80edb0d0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_pickaxe.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_pickaxe.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_pickaxe"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_pickaxe"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_plow.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_plow.json
index 544a6b78eed..8c041bd1c96 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_plow.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_plow.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_plow"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_plow"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_saw.json
index 5f069ff55ef..57a92f34d12 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_saw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_saw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_saw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_saw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_screwdriver.json
index dfcfd241c35..952204e8996 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_screwdriver.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_screwdriver"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_screwdriver"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_sense.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_sense.json
index c61ba6caf64..501ca7c26e3 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_sense.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_sense.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_sense"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_sense"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_shovel.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_shovel.json
index 66791e2f0ff..7cfe28e6703 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_shovel.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_shovel.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_shovel"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_shovel"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_soldering.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_soldering.json
index 947327713c4..7fb41af7411 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_soldering.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_soldering.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_soldering"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_soldering"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_sword.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_sword.json
index 5ebc2cba102..a21ef4efb1f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_sword.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_sword.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_sword"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_sword"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_universal_spade.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_universal_spade.json
index 92c99ec299b..440e70ded5b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_universal_spade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_universal_spade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_universal_spade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_universal_spade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_wrench.json
index 1ea5e4555d4..9c870e3f177 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_wrench.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/tool_head_wrench.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/tool_head_wrench"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/tool_head_wrench"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/turbine_blade.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/turbine_blade.json
index ccf8a508545..3b4440ed507 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/turbine_blade.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/turbine_blade.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/turbine_blade"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/turbine_blade"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/wire_fine.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/wire_fine.json
index 4df501c8e22..61e0998c0fe 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/wire_fine.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/wire_fine.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/shiny/wire_fine",
-        "layer1": "gregtech:items/material_sets/shiny/wire_fine_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/shiny/wire_fine",
+    "layer1": "gregtech:items/material_sets/shiny/wire_fine_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/smooth/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/smooth/dust_small.json
index 9b2e5421a09..cc6cf0315af 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/smooth/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/smooth/dust_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/smooth/dust_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/smooth/dust_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/smooth/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/smooth/dust_tiny.json
index 3733ebc3f7a..a3da7503260 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/smooth/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/smooth/dust_tiny.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/smooth/dust_tiny"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/smooth/dust_tiny"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/smooth/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/smooth/gear.json
index dc73217a007..af38bbf66a7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/smooth/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/smooth/gear.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/smooth/gear"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/smooth/gear"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/smooth/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/smooth/stick_long.json
index 5d1ce41e8c5..973304bf22b 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/smooth/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/smooth/stick_long.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/smooth/stick_long"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/smooth/stick_long"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/wood/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/wood/bolt.json
index 69bc8b1aaf4..0be17a9cbf5 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/wood/bolt.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/wood/bolt.json
@@ -1,7 +1,7 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/wood/bolt",
-        "layer1": "gregtech:items/material_sets/wood/bolt_overlay"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/wood/bolt",
+    "layer1": "gregtech:items/material_sets/wood/bolt_overlay"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust.json
index acb5a663656..670631304e7 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/wood/dust"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/wood/dust"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust_small.json
index aec0c2093d2..b38ba6990e0 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust_small.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust_small.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/wood/dust_small"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/wood/dust_small"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust_tiny.json
index 0ffc340be7c..d46340cbd94 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust_tiny.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/wood/dust_tiny.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/wood/dust_tiny"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/wood/dust_tiny"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/wood/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/wood/gear.json
index a3b48ff7d48..4106835b80f 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/wood/gear.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/wood/gear.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/wood/gear"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/wood/gear"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/wood/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/wood/plate.json
index e6f377e5a02..1478fccb552 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/wood/plate.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/wood/plate.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/wood/plate"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/wood/plate"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/wood/plate_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/wood/plate_double.json
index 8357fe0ce78..0d072a31f18 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/wood/plate_double.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/wood/plate_double.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/wood/plate_double"
-    }
-}
\ No newline at end of file
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/wood/plate_double"
+  }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/wood/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/wood/screw.json
index 673917167a7..1745978ab97 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/wood/screw.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/wood/screw.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/wood/screw"
-    }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/wood/screw"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/wood/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/wood/stick_long.json
index 60528e4e2a9..f85bf60a4fd 100644
--- a/src/main/resources/assets/gregtech/models/item/material_sets/wood/stick_long.json
+++ b/src/main/resources/assets/gregtech/models/item/material_sets/wood/stick_long.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "gregtech:items/material_sets/wood/stick_long"
-    }
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/wood/stick_long"
+  }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/1.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/1.json
index dcc3ad3ba13..00e73fdb10e 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/1.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/1.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.cluster/1"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/2.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/2.json
index 2a42e30ee36..e142f6851bf 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/2.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/2.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.cluster/2"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/3.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/3.json
index 995c89c8f5e..f1e9f04e22a 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/3.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/3.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.cluster/3"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/4.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/4.json
index c70a367a91e..abbc7140731 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/4.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/4.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.cluster/4"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/5.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/5.json
index 6eb1edd1ef9..b0948d57621 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/5.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/5.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.cluster/5"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/6.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/6.json
index 8b6cdeafe55..bb8ab8ff5b5 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/6.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/6.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.cluster/6"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/7.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/7.json
index 0cd90074e37..c9cd270c4d3 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/7.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/7.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.cluster/7"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/8.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/8.json
index c188078912a..d28209fb108 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/8.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.cluster/8.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.cluster/8"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/1.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/1.json
index 066691b22a6..247d78145d5 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/1.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/1.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.module/1"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/2.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/2.json
index 58475c878b5..91948546cb4 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/2.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/2.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.module/2"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/3.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/3.json
index 16502187715..11702f623a5 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/3.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/3.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.module/3"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/4.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/4.json
index 74f86016b40..74be7e9f844 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/4.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/4.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.module/4"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/5.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/5.json
index b7202da3dab..1c7cfaf7ce8 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/5.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/5.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.module/5"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/6.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/6.json
index 4702501dea5..83f4955da4c 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/6.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/6.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.module/6"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/7.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/7.json
index 8899f4f9ebe..993c20fd974 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/7.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/7.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.module/7"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/8.json b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/8.json
index 2e268b3d0e5..b9f6b4937cf 100644
--- a/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/8.json
+++ b/src/main/resources/assets/gregtech/models/item/metaitems/energy.module/8.json
@@ -1,7 +1,6 @@
-
 {
   "parent": "item/generated",
   "textures": {
     "layer0": "gregtech:items/metaitems/energy.module/8"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/models/item/tools/scoop.json b/src/main/resources/assets/gregtech/models/item/tools/scoop.json
index 823ca10d41f..7981a76851f 100644
--- a/src/main/resources/assets/gregtech/models/item/tools/scoop.json
+++ b/src/main/resources/assets/gregtech/models/item/tools/scoop.json
@@ -2,7 +2,7 @@
   "parent": "item/handheld",
   "textures": {
     "layer0": "gregtech:items/void",
-  	"layer1": "gregtech:items/tools/scoop",
+    "layer1": "gregtech:items/tools/scoop",
     "layer2": "gregtech:items/tools/scoop_overlay"
   }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/tools/screwdriver.json b/src/main/resources/assets/gregtech/models/item/tools/screwdriver.json
index b7d4a47b3fc..775bcd3aec6 100644
--- a/src/main/resources/assets/gregtech/models/item/tools/screwdriver.json
+++ b/src/main/resources/assets/gregtech/models/item/tools/screwdriver.json
@@ -2,6 +2,6 @@
   "parent": "item/handheld",
   "textures": {
     "layer0": "gregtech:items/tools/handle_screwdriver",
-  	"layer1": "gregtech:items/tools/screwdriver"
+    "layer1": "gregtech:items/tools/screwdriver"
   }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/tools/wire_cutter.json b/src/main/resources/assets/gregtech/models/item/tools/wire_cutter.json
index 55bd54e4336..f27f11c60e7 100644
--- a/src/main/resources/assets/gregtech/models/item/tools/wire_cutter.json
+++ b/src/main/resources/assets/gregtech/models/item/tools/wire_cutter.json
@@ -2,6 +2,6 @@
   "parent": "item/handheld",
   "textures": {
     "layer0": "gregtech:items/tools/wire_cutter_base",
-  	"layer1": "gregtech:items/tools/wire_cutter"
+    "layer1": "gregtech:items/tools/wire_cutter"
   }
 }
diff --git a/src/main/resources/assets/gregtech/models/item/tools/wrench.mv.json b/src/main/resources/assets/gregtech/models/item/tools/wrench.mv.json
index f4aa88488bb..a6b00cf9a43 100644
--- a/src/main/resources/assets/gregtech/models/item/tools/wrench.mv.json
+++ b/src/main/resources/assets/gregtech/models/item/tools/wrench.mv.json
@@ -2,6 +2,6 @@
   "parent": "item/handheld",
   "textures": {
     "layer0": "gregtech:items/tools/power_unit_mv",
-  	"layer1": "gregtech:items/tools/wrench_electric"
+    "layer1": "gregtech:items/tools/wrench_electric"
   }
 }
diff --git a/src/main/resources/assets/gregtech/worldgen/end/beryllium_vein.json b/src/main/resources/assets/gregtech/worldgen/end/beryllium_vein.json
index 86be6d6feea..984ee157807 100644
--- a/src/main/resources/assets/gregtech/worldgen/end/beryllium_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/end/beryllium_vein.json
@@ -3,14 +3,19 @@
   "density": 0.3,
   "max_height": 35,
   "min_height": 5,
-  "dimension_filter": ["name:the_end"],
+  "dimension_filter": [
+    "name:the_end"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "emerald"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [9, 9]
+    "radius": [
+      9,
+      9
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,11 +30,11 @@
           "weight": 30,
           "value": "ore:emerald"
         },
-		{
+        {
           "weight": 20,
           "value": "ore:thorium"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/end/lapis_vein.json b/src/main/resources/assets/gregtech/worldgen/end/lapis_vein.json
index e39e68385af..18e8102c159 100644
--- a/src/main/resources/assets/gregtech/worldgen/end/lapis_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/end/lapis_vein.json
@@ -3,14 +3,19 @@
   "density": 0.5,
   "max_height": 50,
   "min_height": 20,
-  "dimension_filter": ["name:the_end"],
+  "dimension_filter": [
+    "name:the_end"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "lapis"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [8, 9]
+    "radius": [
+      8,
+      9
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,15 +30,15 @@
           "weight": 20,
           "value": "ore:sodalite"
         },
-		{
+        {
           "weight": 35,
           "value": "ore:lapis"
         },
-		{
+        {
           "weight": 15,
           "value": "ore:calcite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/end/manganese_vein.json b/src/main/resources/assets/gregtech/worldgen/end/manganese_vein.json
index 9b529c896cf..9c875640693 100644
--- a/src/main/resources/assets/gregtech/worldgen/end/manganese_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/end/manganese_vein.json
@@ -3,14 +3,19 @@
   "density": 0.3,
   "max_height": 30,
   "min_height": 20,
-  "dimension_filter": ["name:the_end"],
+  "dimension_filter": [
+    "name:the_end"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "pyrolusite"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [8, 8]
+    "radius": [
+      8,
+      8
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,15 +30,15 @@
           "weight": 30,
           "value": "ore:spessartine"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:pyrolusite"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:tantalite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/end/molybdenum_vein.json b/src/main/resources/assets/gregtech/worldgen/end/molybdenum_vein.json
index 460c8f93ed5..11595320051 100644
--- a/src/main/resources/assets/gregtech/worldgen/end/molybdenum_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/end/molybdenum_vein.json
@@ -3,14 +3,19 @@
   "density": 0.5,
   "max_height": 30,
   "min_height": 20,
-  "dimension_filter": ["name:the_end"],
+  "dimension_filter": [
+    "name:the_end"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "molybdenite"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [8, 8]
+    "radius": [
+      8,
+      8
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,11 +30,11 @@
           "weight": 40,
           "value": "ore:molybdenite"
         },
-		    {
+        {
           "weight": 20,
           "value": "ore:powellite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/end/naquadah_vein.json b/src/main/resources/assets/gregtech/worldgen/end/naquadah_vein.json
index dae93649648..605f2cf7e30 100644
--- a/src/main/resources/assets/gregtech/worldgen/end/naquadah_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/end/naquadah_vein.json
@@ -3,14 +3,19 @@
   "density": 0.5,
   "max_height": 65,
   "min_height": 30,
-  "dimension_filter": ["name:the_end"],
+  "dimension_filter": [
+    "name:the_end"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "naquadah"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [20, 20]
+    "radius": [
+      20,
+      20
+    ]
   },
   "filler": {
     "type": "simple",
@@ -28,4 +33,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/end/nickel_vein.json b/src/main/resources/assets/gregtech/worldgen/end/nickel_vein.json
index b2a2e817574..6cc6ff4bf73 100644
--- a/src/main/resources/assets/gregtech/worldgen/end/nickel_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/end/nickel_vein.json
@@ -3,14 +3,19 @@
   "density": 0.4,
   "max_height": 45,
   "min_height": 10,
-  "dimension_filter": ["name:the_end"],
+  "dimension_filter": [
+    "name:the_end"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "nickel"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [7, 9]
+    "radius": [
+      7,
+      9
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,15 +30,15 @@
           "weight": 30,
           "value": "ore:nickel"
         },
-		    {
+        {
           "weight": 30,
           "value": "ore:cobaltite"
         },
-		    {
+        {
           "weight": 10,
           "value": "ore:pentlandite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/end/olivine_vein.json b/src/main/resources/assets/gregtech/worldgen/end/olivine_vein.json
index c5937e8bb6d..bbfa701be85 100644
--- a/src/main/resources/assets/gregtech/worldgen/end/olivine_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/end/olivine_vein.json
@@ -3,14 +3,19 @@
   "density": 0.3,
   "max_height": 50,
   "min_height": 10,
-  "dimension_filter": ["name:the_end"],
+  "dimension_filter": [
+    "name:the_end"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "olivine"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [8, 8]
+    "radius": [
+      8,
+      8
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,11 +30,11 @@
           "weight": 30,
           "value": "ore:magnesite"
         },
-		    {
+        {
           "weight": 30,
           "value": "ore:olivine"
         },
-		    {
+        {
           "weight": 10,
           "value": "ore:glauconite"
         },
@@ -40,4 +45,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/end/platinum_vein.json b/src/main/resources/assets/gregtech/worldgen/end/platinum_vein.json
index 028d4c582a0..013ae58902a 100644
--- a/src/main/resources/assets/gregtech/worldgen/end/platinum_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/end/platinum_vein.json
@@ -3,33 +3,38 @@
   "density": 0.6,
   "max_height": 50,
   "min_height": 35,
-  "dimension_filter": ["name:the_end"],
+  "dimension_filter": [
+    "name:the_end"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "palladium"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [8, 8]
+    "radius": [
+      8,
+      8
+    ]
   },
   "filler": {
     "type": "simple",
     "value": {
       "type": "weight_random",
       "values": [
-		  {
+        {
           "weight": 45,
           "value": "ore:cooperite"
         },
-		  {
+        {
           "weight": 35,
           "value": "ore:palladium"
         },
-		  {
+        {
           "weight": 20,
           "value": "ore:iridium"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/end/tungstate_vein.json b/src/main/resources/assets/gregtech/worldgen/end/tungstate_vein.json
index b496da9a35a..31e3988cb15 100644
--- a/src/main/resources/assets/gregtech/worldgen/end/tungstate_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/end/tungstate_vein.json
@@ -3,14 +3,19 @@
   "density": 0.4,
   "max_height": 50,
   "min_height": 20,
-  "dimension_filter": ["name:the_end"],
+  "dimension_filter": [
+    "name:the_end"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "tungstate"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [8, 8]
+    "radius": [
+      8,
+      8
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,11 +30,11 @@
           "weight": 20,
           "value": "ore:tungstate"
         },
-		{
+        {
           "weight": 20,
           "value": "ore:lithium"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/nether/chalcopyrite_vein.json b/src/main/resources/assets/gregtech/worldgen/nether/chalcopyrite_vein.json
index 9a1dc6c811b..a3a56db43d2 100644
--- a/src/main/resources/assets/gregtech/worldgen/nether/chalcopyrite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/nether/chalcopyrite_vein.json
@@ -3,14 +3,19 @@
   "density": 0.4,
   "max_height": 30,
   "min_height": 10,
-  "dimension_filter": ["is_nether"],
+  "dimension_filter": [
+    "is_nether"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "chalcopyrite"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [12, 12]
+    "radius": [
+      12,
+      12
+    ]
   },
   "filler": {
     "type": "simple",
@@ -21,19 +26,19 @@
           "weight": 30,
           "value": "ore:chalcopyrite"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:iron"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:pyrite"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:copper"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/nether/iron_vein.json b/src/main/resources/assets/gregtech/worldgen/nether/iron_vein.json
index b326950fbc6..989688c142e 100644
--- a/src/main/resources/assets/gregtech/worldgen/nether/iron_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/nether/iron_vein.json
@@ -3,21 +3,26 @@
   "density": 0.4,
   "max_height": 45,
   "min_height": 10,
-  "dimension_filter": ["is_nether"],
+  "dimension_filter": [
+    "is_nether"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "iron"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [9, 12]
+    "radius": [
+      9,
+      12
+    ]
   },
   "filler": {
     "type": "simple",
     "value": {
       "type": "weight_random",
       "values": [
-		{
+        {
           "weight": 30,
           "value": "ore:brown_limonite"
         },
@@ -25,15 +30,15 @@
           "weight": 30,
           "value": "ore:yellow_limonite"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:banded_iron"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:malachite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/nether/magnetite_vein.json b/src/main/resources/assets/gregtech/worldgen/nether/magnetite_vein.json
index fb982f86e88..05983b7a63f 100644
--- a/src/main/resources/assets/gregtech/worldgen/nether/magnetite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/nether/magnetite_vein.json
@@ -3,14 +3,19 @@
   "density": 0.3,
   "max_height": 120,
   "min_height": 50,
-  "dimension_filter": ["is_nether"],
+  "dimension_filter": [
+    "is_nether"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "magnetite"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [14, 17]
+    "radius": [
+      14,
+      17
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,15 +30,15 @@
           "weight": 15,
           "value": "ore:iron"
         },
-		{
+        {
           "weight": 15,
           "value": "ore:vanadium_magnetite"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:gold"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/nether/netherquartz_vein.json b/src/main/resources/assets/gregtech/worldgen/nether/netherquartz_vein.json
index 7d7b4a99ecd..743b0548c0f 100644
--- a/src/main/resources/assets/gregtech/worldgen/nether/netherquartz_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/nether/netherquartz_vein.json
@@ -3,14 +3,19 @@
   "density": 0.2,
   "max_height": 110,
   "min_height": 40,
-  "dimension_filter": ["is_nether"],
+  "dimension_filter": [
+    "is_nether"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "nether_quartz"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [18, 18]
+    "radius": [
+      18,
+      18
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,4 +29,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/nether/nickel_vein.json b/src/main/resources/assets/gregtech/worldgen/nether/nickel_vein.json
index 64e2ead28b9..227f4021008 100644
--- a/src/main/resources/assets/gregtech/worldgen/nether/nickel_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/nether/nickel_vein.json
@@ -3,14 +3,19 @@
   "density": 0.4,
   "max_height": 45,
   "min_height": 10,
-  "dimension_filter": ["is_nether"],
+  "dimension_filter": [
+    "is_nether"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "nickel"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [7, 9]
+    "radius": [
+      7,
+      9
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,15 +30,15 @@
           "weight": 30,
           "value": "ore:nickel"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:cobaltite"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:pentlandite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/nether/redstone_vein.json b/src/main/resources/assets/gregtech/worldgen/nether/redstone_vein.json
index 9a1c75b7a78..949a61010d0 100644
--- a/src/main/resources/assets/gregtech/worldgen/nether/redstone_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/nether/redstone_vein.json
@@ -3,14 +3,19 @@
   "density": 0.4,
   "max_height": 40,
   "min_height": 10,
-  "dimension_filter": ["is_nether"],
+  "dimension_filter": [
+    "is_nether"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "redstone"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [12, 12]
+    "radius": [
+      12,
+      12
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,7 +30,7 @@
           "weight": 20,
           "value": "ore:ruby"
         },
-		    {
+        {
           "weight": 20,
           "value": "ore:cinnabar"
         },
@@ -36,4 +41,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/nether/sulfur_vein.json b/src/main/resources/assets/gregtech/worldgen/nether/sulfur_vein.json
index 251329443e0..b726891c93b 100644
--- a/src/main/resources/assets/gregtech/worldgen/nether/sulfur_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/nether/sulfur_vein.json
@@ -3,14 +3,19 @@
   "density": 0.3,
   "max_height": 70,
   "min_height": 10,
-  "dimension_filter": ["is_nether"],
+  "dimension_filter": [
+    "is_nether"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "sulfur"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [16, 17]
+    "radius": [
+      16,
+      17
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,7 +30,7 @@
           "weight": 20,
           "value": "ore:pyrite"
         },
-		    {
+        {
           "weight": 20,
           "value": "ore:sphalerite"
         },
@@ -36,4 +41,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/nether/tetrahedrite_vein.json b/src/main/resources/assets/gregtech/worldgen/nether/tetrahedrite_vein.json
index 9bf6ddd5b48..623fe2131ea 100644
--- a/src/main/resources/assets/gregtech/worldgen/nether/tetrahedrite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/nether/tetrahedrite_vein.json
@@ -3,14 +3,19 @@
   "density": 0.3,
   "max_height": 120,
   "min_height": 70,
-  "dimension_filter": ["is_nether"],
+  "dimension_filter": [
+    "is_nether"
+  ],
   "vein_populator": {
     "type": "surface_rock",
     "material": "copper"
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [12, 13]
+    "radius": [
+      12,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
@@ -25,11 +30,11 @@
           "weight": 20,
           "value": "ore:copper"
         },
-		{
+        {
           "weight": 20,
           "value": "ore:stibnite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/apatite_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/apatite_vein.json
index e31eb0ea0fa..c1d3a38dfb1 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/apatite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/apatite_vein.json
@@ -8,7 +8,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 13]
+    "radius": [
+      13,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/basalt_sphere.json b/src/main/resources/assets/gregtech/worldgen/overworld/basalt_sphere.json
index 9544996b3d5..baed59cfedb 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/basalt_sphere.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/basalt_sphere.json
@@ -4,10 +4,12 @@
   "density": 1.0,
   "min_height": 10,
   "count_as_vein": false,
-
   "generator": {
     "type": "sphere",
-    "radius": [10, 20]
+    "radius": [
+      10,
+      20
+    ]
   },
   "filler": {
     "type": "ignore_bedrock",
@@ -25,4 +27,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/bauxite_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/bauxite_vein.json
index 8a35214b76f..71a74937102 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/bauxite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/bauxite_vein.json
@@ -8,7 +8,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [15, 17]
+    "radius": [
+      15,
+      17
+    ]
   },
   "filler": {
     "type": "simple",
@@ -34,4 +37,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/beryllium_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/beryllium_vein.json
index 468199ff02c..b84faa14ee6 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/beryllium_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/beryllium_vein.json
@@ -8,7 +8,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 13]
+    "radius": [
+      13,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
@@ -23,11 +26,11 @@
           "weight": 30,
           "value": "ore:emerald"
         },
-		    {
+        {
           "weight": 20,
           "value": "ore:thorium"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/black_granite_sphere.json b/src/main/resources/assets/gregtech/worldgen/overworld/black_granite_sphere.json
index 2101fb475ad..53f3c859fce 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/black_granite_sphere.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/black_granite_sphere.json
@@ -4,10 +4,12 @@
   "density": 1.0,
   "min_height": 10,
   "count_as_vein": false,
-
   "generator": {
     "type": "sphere",
-    "radius": [10, 20]
+    "radius": [
+      10,
+      20
+    ]
   },
   "filler": {
     "type": "ignore_bedrock",
@@ -25,4 +27,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/bornite_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/bornite_vein.json
index 854b5fdedeb..5c5b18c4377 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/bornite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/bornite_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [17, 19]
+    "radius": [
+      17,
+      19
+    ]
   },
   "filler": {
     "type": "simple",
@@ -20,19 +23,19 @@
           "weight": 30,
           "value": "ore:bornite"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:chalcocite"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:enargite"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:copper"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/chalcopyrite_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/chalcopyrite_vein.json
index 46aa56e1ce2..13331604c6f 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/chalcopyrite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/chalcopyrite_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [17, 19]
+    "radius": [
+      17,
+      19
+    ]
   },
   "filler": {
     "type": "simple",
@@ -20,19 +23,19 @@
           "weight": 30,
           "value": "ore:chalcopyrite"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:iron"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:pyrite"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:copper"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/coal_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/coal_vein.json
index b0aec7dc92b..31c5211e397 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/coal_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/coal_vein.json
@@ -8,7 +8,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [16, 16]
+    "radius": [
+      16,
+      16
+    ]
   },
   "filler": {
     "type": "simple",
@@ -26,4 +29,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/diamond_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/diamond_vein.json
index edf49a4628e..da3f884ef53 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/diamond_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/diamond_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 13]
+    "radius": [
+      13,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,11 +27,11 @@
           "weight": 20,
           "value": "ore:diamond"
         },
-		{
+        {
           "weight": 20,
           "value": "ore:coal"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/galena_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/galena_vein.json
index ec5bc4849ca..5592b7823d8 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/galena_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/galena_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 16]
+    "radius": [
+      13,
+      16
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,11 +27,11 @@
           "weight": 25,
           "value": "ore:silver"
         },
-		{
+        {
           "weight": 25,
           "value": "ore:lead"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/heavy_oil_sphere.json b/src/main/resources/assets/gregtech/worldgen/overworld/heavy_oil_sphere.json
index 74ff38895cb..f3838a1aa39 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/heavy_oil_sphere.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/heavy_oil_sphere.json
@@ -6,7 +6,6 @@
   "priority": -100,
   "count_as_vein": false,
   "generation_predicate": "any",
-
   "vein_populator": {
     "type": "fluid_spring",
     "chance": 0.40
@@ -17,7 +16,10 @@
   },
   "generator": {
     "type": "sphere",
-    "radius": [8, 12]
+    "radius": [
+      8,
+      12
+    ]
   },
   "filler": {
     "type": "ignore_bedrock",
@@ -31,4 +33,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/iron_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/iron_vein.json
index 4615b264ec6..075b808a9e6 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/iron_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/iron_vein.json
@@ -9,14 +9,17 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 13]
+    "radius": [
+      13,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
     "value": {
       "type": "weight_random",
       "values": [
-		{
+        {
           "weight": 30,
           "value": "ore:brown_limonite"
         },
@@ -24,15 +27,15 @@
           "weight": 30,
           "value": "ore:yellow_limonite"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:banded_iron"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:malachite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/lapis_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/lapis_vein.json
index 31cd5eba490..546a037432e 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/lapis_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/lapis_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 15]
+    "radius": [
+      13,
+      15
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,15 +27,15 @@
           "weight": 20,
           "value": "ore:sodalite"
         },
-		{
+        {
           "weight": 35,
           "value": "ore:lapis"
         },
-		{
+        {
           "weight": 15,
           "value": "ore:calcite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/light_oil_sphere.json b/src/main/resources/assets/gregtech/worldgen/overworld/light_oil_sphere.json
index 80e3ac465ac..10074cee263 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/light_oil_sphere.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/light_oil_sphere.json
@@ -6,7 +6,6 @@
   "priority": -100,
   "count_as_vein": false,
   "generation_predicate": "any",
-
   "vein_populator": {
     "type": "fluid_spring",
     "chance": 0.40
@@ -17,7 +16,10 @@
   },
   "generator": {
     "type": "sphere",
-    "radius": [10, 15]
+    "radius": [
+      10,
+      15
+    ]
   },
   "filler": {
     "type": "ignore_bedrock",
@@ -31,4 +33,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/lignitecoal_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/lignitecoal_vein.json
index e2701fc6e6a..6700792bc5b 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/lignitecoal_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/lignitecoal_vein.json
@@ -8,7 +8,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [19, 20]
+    "radius": [
+      19,
+      20
+    ]
   },
   "filler": {
     "type": "simple",
@@ -26,4 +29,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/magnetite_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/magnetite_vein.json
index f8c27bda9b8..a4e055baed9 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/magnetite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/magnetite_vein.json
@@ -8,7 +8,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [19, 22]
+    "radius": [
+      19,
+      22
+    ]
   },
   "filler": {
     "type": "simple",
@@ -23,15 +26,15 @@
           "weight": 15,
           "value": "ore:iron"
         },
-		{
+        {
           "weight": 15,
           "value": "ore:vanadium_magnetite"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:gold"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/manganese_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/manganese_vein.json
index 267068e283f..1b27d3aaff5 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/manganese_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/manganese_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 13]
+    "radius": [
+      13,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,15 +27,15 @@
           "weight": 30,
           "value": "ore:spessartine"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:pyrolusite"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:tantalite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/marble_sphere.json b/src/main/resources/assets/gregtech/worldgen/overworld/marble_sphere.json
index dc6840873f9..17d789aa0e1 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/marble_sphere.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/marble_sphere.json
@@ -4,10 +4,12 @@
   "density": 1.0,
   "min_height": 10,
   "count_as_vein": false,
-
   "generator": {
     "type": "sphere",
-    "radius": [10, 20]
+    "radius": [
+      10,
+      20
+    ]
   },
   "filler": {
     "type": "ignore_bedrock",
@@ -25,4 +27,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/medium_oil_sphere.json b/src/main/resources/assets/gregtech/worldgen/overworld/medium_oil_sphere.json
index 512321c8f95..e68733c3fe3 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/medium_oil_sphere.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/medium_oil_sphere.json
@@ -6,7 +6,6 @@
   "priority": -100,
   "count_as_vein": false,
   "generation_predicate": "any",
-
   "vein_populator": {
     "type": "fluid_spring",
     "chance": 0.40
@@ -17,7 +16,10 @@
   },
   "generator": {
     "type": "sphere",
-    "radius": [9, 13]
+    "radius": [
+      9,
+      13
+    ]
   },
   "filler": {
     "type": "ignore_bedrock",
@@ -31,4 +33,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/molybdenite_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/molybdenite_vein.json
index 9b048fb403e..1e42527aac3 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/molybdenite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/molybdenite_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 13]
+    "radius": [
+      13,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,11 +27,11 @@
           "weight": 40,
           "value": "ore:molybdenite"
         },
-		{
+        {
           "weight": 20,
           "value": "ore:powellite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/monazite_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/monazite_vein.json
index be8014e58bd..43abbef03a7 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/monazite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/monazite_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 13]
+    "radius": [
+      13,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,7 +27,7 @@
           "weight": 20,
           "value": "ore:monazite"
         },
-		    {
+        {
           "weight": 20,
           "value": "ore:neodymium"
         }
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/natural_gas_plate.json b/src/main/resources/assets/gregtech/worldgen/overworld/natural_gas_plate.json
index fae26067f46..37b013387b9 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/natural_gas_plate.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/natural_gas_plate.json
@@ -6,16 +6,24 @@
   "priority": -100,
   "count_as_vein": false,
   "generation_predicate": "any",
-
   "biome_modifier": {
     "type": "biome_dictionary",
     "sandy": 5
   },
   "generator": {
     "type": "plate",
-    "length": [20, 36],
-    "depth": [20, 36],
-    "height": [5, 10]
+    "length": [
+      20,
+      36
+    ],
+    "depth": [
+      20,
+      36
+    ],
+    "height": [
+      5,
+      10
+    ]
   },
   "filler": {
     "type": "ignore_bedrock",
@@ -29,4 +37,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/nickel_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/nickel_vein.json
index 858b5942cab..3a4b8ce5c16 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/nickel_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/nickel_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 14]
+    "radius": [
+      13,
+      14
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,15 +27,15 @@
           "weight": 30,
           "value": "ore:nickel"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:cobaltite"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:pentlandite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/olivine_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/olivine_vein.json
index 095b88c6abe..53bc10db35a 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/olivine_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/olivine_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 13]
+    "radius": [
+      13,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,15 +27,15 @@
           "weight": 30,
           "value": "ore:magnesite"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:olivine"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:glauconite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/pitchblende_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/pitchblende_vein.json
index f20afeb0269..27595a3de78 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/pitchblende_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/pitchblende_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 13]
+    "radius": [
+      13,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,11 +27,11 @@
           "weight": 40,
           "value": "ore:uraninite"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:uranium"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/platinum_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/platinum_vein.json
index fb3d38d6f7c..5ed14cd19f8 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/platinum_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/platinum_vein.json
@@ -9,26 +9,29 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 13]
+    "radius": [
+      13,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
     "value": {
       "type": "weight_random",
       "values": [
-		{
+        {
           "weight": 45,
           "value": "ore:platinum"
         },
-		{
+        {
           "weight": 35,
           "value": "ore:palladium"
         },
-		{
+        {
           "weight": 20,
           "value": "ore:iridium"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/quartz_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/quartz_vein.json
index 0ac9a79d2a7..212abe47161 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/quartz_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/quartz_vein.json
@@ -8,7 +8,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 17]
+    "radius": [
+      13,
+      17
+    ]
   },
   "filler": {
     "type": "simple",
@@ -34,4 +37,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/red_granite_sphere.json b/src/main/resources/assets/gregtech/worldgen/overworld/red_granite_sphere.json
index a620e734251..3c31af569ab 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/red_granite_sphere.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/red_granite_sphere.json
@@ -4,10 +4,12 @@
   "density": 1.0,
   "min_height": 10,
   "count_as_vein": false,
-
   "generator": {
     "type": "sphere",
-    "radius": [10, 20]
+    "radius": [
+      10,
+      20
+    ]
   },
   "filler": {
     "type": "ignore_bedrock",
@@ -25,4 +27,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/redstone_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/redstone_vein.json
index 95d6fe7be5b..fe55142fa50 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/redstone_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/redstone_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [17, 19]
+    "radius": [
+      17,
+      19
+    ]
   },
   "filler": {
     "type": "simple",
@@ -35,4 +38,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/salts_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/salts_vein.json
index 32ca98cc23c..cb0599b7c74 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/salts_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/salts_vein.json
@@ -8,7 +8,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [14, 17]
+    "radius": [
+      14,
+      17
+    ]
   },
   "filler": {
     "type": "simple",
@@ -23,15 +26,15 @@
           "weight": 35,
           "value": "ore:rock_salt"
         },
-		{
+        {
           "weight": 15,
           "value": "ore:lepidolite"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:spodumene"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/sapphire_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/sapphire_vein.json
index b6e1e6a92c2..021d86e31be 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/sapphire_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/sapphire_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [16, 17]
+    "radius": [
+      16,
+      17
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,15 +27,15 @@
           "weight": 30,
           "value": "ore:pyrope"
         },
-		{
+        {
           "weight": 30,
           "value": "ore:sapphire"
         },
-		{
+        {
           "weight": 10,
           "value": "ore:green_sapphire"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/soapstone_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/soapstone_vein.json
index 5b732e959cb..fba00d5773b 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/soapstone_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/soapstone_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [14, 16]
+    "radius": [
+      14,
+      16
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,15 +27,15 @@
           "weight": 25,
           "value": "ore:talc"
         },
-		{
+        {
           "weight": 25,
           "value": "ore:glauconite"
         },
-		{
+        {
           "weight": 25,
           "value": "ore:pentlandite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/tenorite_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/tenorite_vein.json
index c94d3dc3165..0c398e216da 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/tenorite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/tenorite_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [17, 18]
+    "radius": [
+      17,
+      18
+    ]
   },
   "filler": {
     "type": "simple",
@@ -31,4 +34,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/tetrahedrite_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/tetrahedrite_vein.json
index 67f2dbf353b..59282db3e4f 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/tetrahedrite_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/tetrahedrite_vein.json
@@ -10,10 +10,12 @@
     "type": "biome_dictionary",
     "mountain": 20
   },
-
   "generator": {
     "type": "ellipsoid",
-    "radius": [17, 18]
+    "radius": [
+      17,
+      18
+    ]
   },
   "filler": {
     "type": "simple",
@@ -28,11 +30,11 @@
           "weight": 20,
           "value": "ore:copper"
         },
-		    {
+        {
           "weight": 20,
           "value": "ore:stibnite"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/tin_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/tin_vein.json
index 008fcf04b6b..aa2839a2678 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/tin_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/tin_vein.json
@@ -8,7 +8,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [17, 19]
+    "radius": [
+      17,
+      19
+    ]
   },
   "filler": {
     "type": "simple",
@@ -26,4 +29,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/gregtech/worldgen/overworld/tungstate_vein.json b/src/main/resources/assets/gregtech/worldgen/overworld/tungstate_vein.json
index 84f20f0caec..7a38ff146dd 100644
--- a/src/main/resources/assets/gregtech/worldgen/overworld/tungstate_vein.json
+++ b/src/main/resources/assets/gregtech/worldgen/overworld/tungstate_vein.json
@@ -9,7 +9,10 @@
   },
   "generator": {
     "type": "ellipsoid",
-    "radius": [13, 13]
+    "radius": [
+      13,
+      13
+    ]
   },
   "filler": {
     "type": "simple",
@@ -24,11 +27,11 @@
           "weight": 20,
           "value": "ore:tungstate"
         },
-		{
+        {
           "weight": 20,
           "value": "ore:lithium"
         }
       ]
     }
   }
-}
\ No newline at end of file
+}