From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- .../GT_MetaTileEntity_BasicHull_Bronze.java | 45 - .../GT_MetaTileEntity_BasicHull_BronzeBricks.java | 53 - .../GT_MetaTileEntity_BasicHull_Steel.java | 47 - .../GT_MetaTileEntity_BasicHull_SteelBricks.java | 53 - .../GT_MetaTileEntity_Hatch_CraftingInput_ME.java | 1040 ------------- ...T_MetaTileEntity_Hatch_CraftingInput_Slave.java | 262 ---- .../GT_MetaTileEntity_Hatch_InputBus_ME.java | 887 ----------- .../machines/GT_MetaTileEntity_Hatch_Input_ME.java | 949 ------------ .../GT_MetaTileEntity_Hatch_OutputBus_ME.java | 380 ----- .../GT_MetaTileEntity_Hatch_Output_ME.java | 443 ------ .../machines/IRecipeProcessingAwareHatch.java | 7 +- .../tileentities/machines/MTEBasicHullBronze.java | 43 + .../machines/MTEBasicHullBronzeBricks.java | 46 + .../tileentities/machines/MTEBasicHullSteel.java | 46 + .../machines/MTEBasicHullSteelBricks.java | 46 + .../machines/MTEHatchCraftingInputME.java | 1039 +++++++++++++ .../machines/MTEHatchCraftingInputSlave.java | 260 ++++ .../tileentities/machines/MTEHatchInputBusME.java | 886 +++++++++++ .../tileentities/machines/MTEHatchInputME.java | 949 ++++++++++++ .../tileentities/machines/MTEHatchOutputBusME.java | 378 +++++ .../tileentities/machines/MTEHatchOutputME.java | 443 ++++++ .../GT_MetaTileEntity_AdvSeismicProspector.java | 309 ---- .../basic/GT_MetaTileEntity_BetterJukebox.java | 702 --------- .../basic/GT_MetaTileEntity_Boxinator.java | 229 --- .../machines/basic/GT_MetaTileEntity_Charger.java | 110 -- .../basic/GT_MetaTileEntity_IndustrialApiary.java | 1555 -------------------- .../basic/GT_MetaTileEntity_Massfabricator.java | 241 --- ..._MetaTileEntity_MicrowaveEnergyTransmitter.java | 495 ------- .../machines/basic/GT_MetaTileEntity_Miner.java | 407 ----- .../basic/GT_MetaTileEntity_MonsterRepellent.java | 182 --- .../basic/GT_MetaTileEntity_PotionBrewer.java | 225 --- .../machines/basic/GT_MetaTileEntity_Pump.java | 846 ----------- .../basic/GT_MetaTileEntity_Replicator.java | 130 -- .../basic/GT_MetaTileEntity_RockBreaker.java | 169 --- .../machines/basic/GT_MetaTileEntity_Scanner.java | 425 ------ .../basic/GT_MetaTileEntity_Teleporter.java | 601 -------- .../basic/GT_MetaTileEntity_TurboCharger.java | 146 -- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 470 ------ .../machines/basic/MTEAdvSeismicProspector.java | 307 ++++ .../machines/basic/MTEBetterJukebox.java | 701 +++++++++ .../tileentities/machines/basic/MTEBoxinator.java | 231 +++ .../tileentities/machines/basic/MTECharger.java | 107 ++ .../machines/basic/MTEIndustrialApiary.java | 1554 +++++++++++++++++++ .../machines/basic/MTEMassfabricator.java | 241 +++ .../basic/MTEMicrowaveEnergyTransmitter.java | 474 ++++++ .../tileentities/machines/basic/MTEMiner.java | 406 +++++ .../machines/basic/MTEMonsterRepellent.java | 182 +++ .../machines/basic/MTEPotionBrewer.java | 224 +++ .../tileentities/machines/basic/MTEPump.java | 846 +++++++++++ .../tileentities/machines/basic/MTEReplicator.java | 130 ++ .../machines/basic/MTERockBreaker.java | 169 +++ .../tileentities/machines/basic/MTEScanner.java | 425 ++++++ .../tileentities/machines/basic/MTETeleporter.java | 586 ++++++++ .../machines/basic/MTETurboCharger.java | 145 ++ .../machines/basic/MTEWorldAccelerator.java | 470 ++++++ ...GT_MetaTileEntity_LongDistancePipelineBase.java | 415 ------ ...T_MetaTileEntity_LongDistancePipelineFluid.java | 125 -- ...GT_MetaTileEntity_LongDistancePipelineItem.java | 214 --- .../long_distance/MTELongDistancePipelineBase.java | 412 ++++++ .../MTELongDistancePipelineFluid.java | 124 ++ .../long_distance/MTELongDistancePipelineItem.java | 213 +++ .../GT_MetaTileEntity_AbstractMultiFurnace.java | 48 - .../multi/GT_MetaTileEntity_AssemblyLine.java | 495 ------- .../GT_MetaTileEntity_BrickedBlastFurnace.java | 155 -- .../multi/GT_MetaTileEntity_Charcoal_Pit.java | 312 ---- .../multi/GT_MetaTileEntity_Cleanroom.java | 527 ------- .../GT_MetaTileEntity_ConcreteBackfiller1.java | 53 - .../GT_MetaTileEntity_ConcreteBackfiller2.java | 54 - .../GT_MetaTileEntity_ConcreteBackfillerBase.java | 265 ---- .../multi/GT_MetaTileEntity_DieselEngine.java | 416 ------ .../multi/GT_MetaTileEntity_DistillationTower.java | 369 ----- .../multi/GT_MetaTileEntity_DrillerBase.java | 952 ------------ .../GT_MetaTileEntity_ElectricBlastFurnace.java | 401 ----- .../GT_MetaTileEntity_ExtremeDieselEngine.java | 237 --- .../multi/GT_MetaTileEntity_FusionComputer.java | 676 --------- .../multi/GT_MetaTileEntity_FusionComputer1.java | 103 -- .../multi/GT_MetaTileEntity_FusionComputer2.java | 103 -- .../multi/GT_MetaTileEntity_FusionComputer3.java | 103 -- .../multi/GT_MetaTileEntity_HeatExchanger.java | 400 ----- .../GT_MetaTileEntity_ImplosionCompressor.java | 163 -- ...eEntity_IndustrialElectromagneticSeparator.java | 467 ------ .../GT_MetaTileEntity_IndustrialExtractor.java | 293 ---- .../GT_MetaTileEntity_IndustrialLaserEngraver.java | 615 -------- .../GT_MetaTileEntity_IntegratedOreFactory.java | 829 ----------- .../multi/GT_MetaTileEntity_LargeBoiler.java | 504 ------- .../GT_MetaTileEntity_LargeBoiler_Bronze.java | 96 -- .../multi/GT_MetaTileEntity_LargeBoiler_Steel.java | 96 -- .../GT_MetaTileEntity_LargeBoiler_Titanium.java | 96 -- ...T_MetaTileEntity_LargeBoiler_TungstenSteel.java | 96 -- .../GT_MetaTileEntity_LargeChemicalReactor.java | 298 ---- .../GT_MetaTileEntity_LargeFluidExtractor.java | 419 ------ .../multi/GT_MetaTileEntity_LargeTurbine.java | 492 ------- .../multi/GT_MetaTileEntity_LargeTurbine_Gas.java | 220 --- ...GT_MetaTileEntity_LargeTurbine_GasAdvanced.java | 219 --- .../GT_MetaTileEntity_LargeTurbine_HPSteam.java | 232 --- .../GT_MetaTileEntity_LargeTurbine_Plasma.java | 391 ----- .../GT_MetaTileEntity_LargeTurbine_Steam.java | 273 ---- .../multi/GT_MetaTileEntity_MultiAutoclave.java | 425 ------ .../multi/GT_MetaTileEntity_MultiCanner.java | 314 ---- .../multi/GT_MetaTileEntity_MultiFurnace.java | 377 ----- .../multi/GT_MetaTileEntity_MultiLathe.java | 377 ----- .../multi/GT_MetaTileEntity_NanoForge.java | 467 ------ .../multi/GT_MetaTileEntity_OilCracker.java | 423 ------ .../multi/GT_MetaTileEntity_OilDrill1.java | 53 - .../multi/GT_MetaTileEntity_OilDrill2.java | 55 - .../multi/GT_MetaTileEntity_OilDrill3.java | 55 - .../multi/GT_MetaTileEntity_OilDrill4.java | 55 - .../multi/GT_MetaTileEntity_OilDrillBase.java | 489 ------ .../multi/GT_MetaTileEntity_OilDrillInfinite.java | 87 -- .../multi/GT_MetaTileEntity_OreDrillingPlant1.java | 60 - .../multi/GT_MetaTileEntity_OreDrillingPlant2.java | 60 - .../multi/GT_MetaTileEntity_OreDrillingPlant3.java | 60 - .../multi/GT_MetaTileEntity_OreDrillingPlant4.java | 60 - .../GT_MetaTileEntity_OreDrillingPlantBase.java | 794 ---------- .../multi/GT_MetaTileEntity_PCBFactory.java | 1290 ---------------- .../multi/GT_MetaTileEntity_PlasmaForge.java | 1263 ---------------- .../GT_MetaTileEntity_PrimitiveBlastFurnace.java | 521 ------- .../multi/GT_MetaTileEntity_ProcessingArray.java | 550 ------- .../multi/GT_MetaTileEntity_PyrolyseOven.java | 263 ---- .../GT_MetaTileEntity_TranscendentPlasmaMixer.java | 389 ----- .../multi/GT_MetaTileEntity_VacuumFreezer.java | 163 -- .../multi/GT_MetaTileEntity_WormholeGenerator.java | 1119 -------------- .../machines/multi/MTEAbstractMultiFurnace.java | 48 + .../machines/multi/MTEAssemblyLine.java | 494 +++++++ .../machines/multi/MTEBrickedBlastFurnace.java | 154 ++ .../machines/multi/MTECharcoalPit.java | 311 ++++ .../tileentities/machines/multi/MTECleanroom.java | 527 +++++++ .../machines/multi/MTEConcreteBackfiller1.java | 53 + .../machines/multi/MTEConcreteBackfiller2.java | 54 + .../machines/multi/MTEConcreteBackfillerBase.java | 264 ++++ .../machines/multi/MTEDieselEngine.java | 415 ++++++ .../machines/multi/MTEDistillationTower.java | 360 +++++ .../machines/multi/MTEDrillerBase.java | 951 ++++++++++++ .../machines/multi/MTEElectricBlastFurnace.java | 397 +++++ .../machines/multi/MTEExtremeDieselEngine.java | 237 +++ .../machines/multi/MTEFusionComputer.java | 673 +++++++++ .../machines/multi/MTEFusionComputer1.java | 103 ++ .../machines/multi/MTEFusionComputer2.java | 103 ++ .../machines/multi/MTEFusionComputer3.java | 103 ++ .../machines/multi/MTEHeatExchanger.java | 396 +++++ .../machines/multi/MTEImplosionCompressor.java | 162 ++ .../MTEIndustrialElectromagneticSeparator.java | 465 ++++++ .../machines/multi/MTEIndustrialExtractor.java | 289 ++++ .../machines/multi/MTEIndustrialLaserEngraver.java | 605 ++++++++ .../machines/multi/MTEIntegratedOreFactory.java | 827 +++++++++++ .../machines/multi/MTELargeBoiler.java | 503 +++++++ .../machines/multi/MTELargeBoilerBronze.java | 96 ++ .../machines/multi/MTELargeBoilerSteel.java | 96 ++ .../machines/multi/MTELargeBoilerTitanium.java | 96 ++ .../multi/MTELargeBoilerTungstenSteel.java | 96 ++ .../machines/multi/MTELargeChemicalReactor.java | 291 ++++ .../machines/multi/MTELargeFluidExtractor.java | 418 ++++++ .../machines/multi/MTELargeTurbine.java | 490 ++++++ .../machines/multi/MTELargeTurbineGas.java | 220 +++ .../machines/multi/MTELargeTurbineGasAdvanced.java | 219 +++ .../machines/multi/MTELargeTurbineHPSteam.java | 232 +++ .../machines/multi/MTELargeTurbinePlasma.java | 389 +++++ .../machines/multi/MTELargeTurbineSteam.java | 273 ++++ .../machines/multi/MTEMultiAutoclave.java | 419 ++++++ .../machines/multi/MTEMultiCanner.java | 310 ++++ .../machines/multi/MTEMultiFurnace.java | 373 +++++ .../tileentities/machines/multi/MTEMultiLathe.java | 369 +++++ .../tileentities/machines/multi/MTENanoForge.java | 466 ++++++ .../tileentities/machines/multi/MTEOilCracker.java | 413 ++++++ .../tileentities/machines/multi/MTEOilDrill1.java | 53 + .../tileentities/machines/multi/MTEOilDrill2.java | 55 + .../tileentities/machines/multi/MTEOilDrill3.java | 55 + .../tileentities/machines/multi/MTEOilDrill4.java | 55 + .../machines/multi/MTEOilDrillBase.java | 489 ++++++ .../machines/multi/MTEOilDrillInfinite.java | 87 ++ .../machines/multi/MTEOreDrillingPlant1.java | 60 + .../machines/multi/MTEOreDrillingPlant2.java | 60 + .../machines/multi/MTEOreDrillingPlant3.java | 60 + .../machines/multi/MTEOreDrillingPlant4.java | 60 + .../machines/multi/MTEOreDrillingPlantBase.java | 793 ++++++++++ .../tileentities/machines/multi/MTEPCBFactory.java | 1287 ++++++++++++++++ .../machines/multi/MTEPlasmaForge.java | 1260 ++++++++++++++++ .../machines/multi/MTEPrimitiveBlastFurnace.java | 521 +++++++ .../machines/multi/MTEProcessingArray.java | 549 +++++++ .../machines/multi/MTEPyrolyseOven.java | 259 ++++ .../machines/multi/MTETranscendentPlasmaMixer.java | 387 +++++ .../machines/multi/MTEVacuumFreezer.java | 162 ++ .../machines/multi/MTEWormholeGenerator.java | 1118 ++++++++++++++ .../GT_MetaTileEntity_BlackHoleCompressor.java | 539 ------- .../GT_MetaTileEntity_HIPCompressor.java | 525 ------- .../compressor/GT_MetaTileEntity_HeatSensor.java | 188 --- .../GT_MetaTileEntity_IndustrialCompressor.java | 244 --- .../GT_MetaTileEntity_NeutroniumCompressor.java | 261 ---- .../multi/compressor/MTEBlackHoleCompressor.java | 534 +++++++ .../multi/compressor/MTEHIPCompressor.java | 515 +++++++ .../machines/multi/compressor/MTEHeatSensor.java | 188 +++ .../multi/compressor/MTEIndustrialCompressor.java | 239 +++ .../multi/compressor/MTENeutroniumCompressor.java | 257 ++++ .../machines/multi/drone/DroneConnection.java | 34 +- .../multi/drone/GT_MetaTileEntity_DroneCentre.java | 917 ------------ .../GT_MetaTileEntity_Hatch_DroneDownLink.java | 329 ----- .../machines/multi/drone/MTEDroneCentre.java | 913 ++++++++++++ .../multi/drone/MTEHatchDroneDownLink.java | 324 ++++ ...etaTileEntity_Hatch_DegasifierControlHatch.java | 122 -- .../GT_MetaTileEntity_LensHousing.java | 52 - .../GT_MetaTileEntity_LensIndicator.java | 117 -- .../GT_MetaTileEntity_PurificationPlant.java | 740 ---------- .../GT_MetaTileEntity_PurificationUnitBase.java | 805 ---------- ...T_MetaTileEntity_PurificationUnitClarifier.java | 333 ----- ..._MetaTileEntity_PurificationUnitDegasifier.java | 832 ----------- ...etaTileEntity_PurificationUnitFlocculation.java | 489 ------ ...T_MetaTileEntity_PurificationUnitOzonation.java | 299 ---- ...leEntity_PurificationUnitParticleExtractor.java | 566 ------- ...etaTileEntity_PurificationUnitPhAdjustment.java | 611 -------- ...etaTileEntity_PurificationUnitPlasmaHeater.java | 566 ------- ...MetaTileEntity_PurificationUnitUVTreatment.java | 526 ------- .../purification/GT_MetaTileEntity_pHSensor.java | 192 --- .../multi/purification/LinkedPurificationUnit.java | 15 +- .../purification/MTEHatchDegasifierControl.java | 121 ++ .../multi/purification/MTEHatchLensHousing.java | 52 + .../multi/purification/MTEHatchLensIndicator.java | 117 ++ .../multi/purification/MTEHatchPHSensor.java | 192 +++ .../multi/purification/MTEPurificationPlant.java | 739 ++++++++++ .../MTEPurificationUnitBaryonicPerfection.java | 565 +++++++ .../purification/MTEPurificationUnitBase.java | 805 ++++++++++ .../purification/MTEPurificationUnitClarifier.java | 332 +++++ .../purification/MTEPurificationUnitDegasser.java | 830 +++++++++++ .../MTEPurificationUnitFlocculation.java | 488 ++++++ .../purification/MTEPurificationUnitOzonation.java | 298 ++++ .../MTEPurificationUnitPhAdjustment.java | 608 ++++++++ .../MTEPurificationUnitPlasmaHeater.java | 565 +++++++ .../MTEPurificationUnitUVTreatment.java | 521 +++++++ .../multi/purification/PurifiedWaterHelpers.java | 4 +- .../machines/multiblock/AdvChemicalProcessor.java | 38 +- .../tileentities/machines/multiblock/CokeOven.java | 14 +- .../machines/multiblock/DistillationTower.java | 22 +- .../machines/multiblock/LaserEngraver.java | 24 +- .../machines/multiblock/LayeredCokeBattery.java | 14 +- .../machines/multiblock/Macerator.java | 6 +- .../multiblock/logic/CokeOvenProcessingLogic.java | 16 +- .../GT_MetaTileEntity_AlloySmelter_Bronze.java | 139 -- .../GT_MetaTileEntity_AlloySmelter_Steel.java | 139 -- .../steam/GT_MetaTileEntity_Compressor_Bronze.java | 134 -- .../steam/GT_MetaTileEntity_Compressor_Steel.java | 134 -- .../steam/GT_MetaTileEntity_Extractor_Bronze.java | 134 -- .../steam/GT_MetaTileEntity_Extractor_Steel.java | 134 -- .../GT_MetaTileEntity_ForgeHammer_Bronze.java | 202 --- .../steam/GT_MetaTileEntity_ForgeHammer_Steel.java | 202 --- .../steam/GT_MetaTileEntity_Furnace_Bronze.java | 161 -- .../steam/GT_MetaTileEntity_Furnace_Steel.java | 159 -- .../steam/GT_MetaTileEntity_Macerator_Bronze.java | 189 --- .../steam/GT_MetaTileEntity_Macerator_Steel.java | 188 --- .../machines/steam/MTESteamAlloySmelterBronze.java | 139 ++ .../machines/steam/MTESteamAlloySmelterSteel.java | 139 ++ .../machines/steam/MTESteamCompressorBronze.java | 134 ++ .../machines/steam/MTESteamCompressorSteel.java | 134 ++ .../machines/steam/MTESteamExtractorBronze.java | 134 ++ .../machines/steam/MTESteamExtractorSteel.java | 134 ++ .../machines/steam/MTESteamForgeHammerBronze.java | 202 +++ .../machines/steam/MTESteamForgeHammerSteel.java | 202 +++ .../machines/steam/MTESteamFurnaceBronze.java | 161 ++ .../machines/steam/MTESteamFurnaceSteel.java | 159 ++ .../machines/steam/MTESteamMaceratorBronze.java | 189 +++ .../machines/steam/MTESteamMaceratorSteel.java | 188 +++ 259 files changed, 44427 insertions(+), 44658 deletions(-) delete mode 100644 src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/MTEBasicHullBronze.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/MTEBasicHullBronzeBricks.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/MTEBasicHullSteel.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/MTEBasicHullSteelBricks.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputME.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputSlave.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/MTEHatchInputBusME.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/MTEHatchInputME.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_BetterJukebox.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_TurboCharger.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEBetterJukebox.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEBoxinator.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTECharger.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEIndustrialApiary.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEMassfabricator.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEMicrowaveEnergyTransmitter.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEMiner.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEMonsterRepellent.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEPotionBrewer.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEReplicator.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTERockBreaker.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEScanner.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTETeleporter.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTETurboCharger.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineFluid.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineItem.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineFluid.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineItem.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AbstractMultiFurnace.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialExtractor.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeFluidExtractor.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiAutoclave.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiLathe.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill4.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_WormholeGenerator.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEAbstractMultiFurnace.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEBrickedBlastFurnace.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTECleanroom.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfiller1.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfiller2.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfillerBase.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEDieselEngine.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEDistillationTower.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEDrillerBase.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEExtremeDieselEngine.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer1.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer2.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer3.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEHeatExchanger.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEImplosionCompressor.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialExtractor.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoiler.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerBronze.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerSteel.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerTitanium.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerTungstenSteel.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeChemicalReactor.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOilCracker.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill1.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill2.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill3.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill4.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillBase.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillInfinite.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant1.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant2.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant3.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant4.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEPrimitiveBlastFurnace.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEProcessingArray.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEPyrolyseOven.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEVacuumFreezer.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_BlackHoleCompressor.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_HIPCompressor.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_HeatSensor.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_IndustrialCompressor.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_NeutroniumCompressor.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEHIPCompressor.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEHeatSensor.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEIndustrialCompressor.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTENeutroniumCompressor.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_DroneCentre.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_Hatch_DroneDownLink.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEHatchDroneDownLink.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_Hatch_DegasifierControlHatch.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_LensHousing.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_LensIndicator.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationPlant.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitBase.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitClarifier.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitDegasifier.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitFlocculation.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitOzonation.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitParticleExtractor.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_pHSensor.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchDegasifierControl.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchLensHousing.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchLensIndicator.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchPHSensor.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBase.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitFlocculation.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java delete mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamAlloySmelterBronze.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamAlloySmelterSteel.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamCompressorBronze.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamCompressorSteel.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamExtractorBronze.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamExtractorSteel.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamForgeHammerBronze.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamForgeHammerSteel.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamFurnaceBronze.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamFurnaceSteel.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorBronze.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorSteel.java (limited to 'src/main/java/gregtech/common/tileentities/machines') diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java deleted file mode 100644 index 252cc6a5b8..0000000000 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java +++ /dev/null @@ -1,45 +0,0 @@ -package gregtech.common.tileentities.machines; - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull_NonElectric; -import gregtech.api.render.TextureFactory; - -public class GT_MetaTileEntity_BasicHull_Bronze extends GT_MetaTileEntity_BasicHull_NonElectric { - - public GT_MetaTileEntity_BasicHull_Bronze(int aID, String aName, String aNameRegional, int aTier, - String aDescription) { - super(aID, aName, aNameRegional, aTier, aDescription); - } - - public GT_MetaTileEntity_BasicHull_Bronze(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - public GT_MetaTileEntity_BasicHull_Bronze(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_BasicHull_Bronze(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - @Override - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - ITexture[][][] rTextures = new ITexture[3][17][]; - for (byte i = -1; i < 16; i = (byte) (i + 1)) { - rTextures[0][(i + 1)] = new ITexture[] { - TextureFactory.of(Textures.BlockIcons.MACHINE_BRONZE_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[1][(i + 1)] = new ITexture[] { - TextureFactory.of(Textures.BlockIcons.MACHINE_BRONZE_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[2][(i + 1)] = new ITexture[] { - TextureFactory.of(Textures.BlockIcons.MACHINE_BRONZE_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - } - return rTextures; - } -} diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java deleted file mode 100644 index ee788ba8c0..0000000000 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java +++ /dev/null @@ -1,53 +0,0 @@ -package gregtech.common.tileentities.machines; - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull_NonElectric; -import gregtech.api.render.TextureFactory; - -public class GT_MetaTileEntity_BasicHull_BronzeBricks extends GT_MetaTileEntity_BasicHull_NonElectric { - - public GT_MetaTileEntity_BasicHull_BronzeBricks(int aID, String aName, String aNameRegional, int aTier, - String aDescription) { - super(aID, aName, aNameRegional, aTier, aDescription); - } - - public GT_MetaTileEntity_BasicHull_BronzeBricks(String aName, int aTier, String aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - public GT_MetaTileEntity_BasicHull_BronzeBricks(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_BasicHull_BronzeBricks( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); - } - - @Override - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - ITexture[][][] rTextures = new ITexture[3][17][]; - for (byte i = -1; i < 16; i = (byte) (i + 1)) { - ITexture[] tmp0 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[0][(i + 1)] = tmp0; - ITexture[] tmp1 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[1][(i + 1)] = tmp1; - ITexture[] tmp2 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[2][(i + 1)] = tmp2; - } - return rTextures; - } -} diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java deleted file mode 100644 index 85e461bf47..0000000000 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java +++ /dev/null @@ -1,47 +0,0 @@ -package gregtech.common.tileentities.machines; - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull_NonElectric; -import gregtech.api.render.TextureFactory; - -public class GT_MetaTileEntity_BasicHull_Steel extends GT_MetaTileEntity_BasicHull_NonElectric { - - public GT_MetaTileEntity_BasicHull_Steel(int aID, String aName, String aNameRegional, int aTier, - String aDescription) { - super(aID, aName, aNameRegional, aTier, aDescription); - } - - public GT_MetaTileEntity_BasicHull_Steel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - public GT_MetaTileEntity_BasicHull_Steel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_BasicHull_Steel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - @Override - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - ITexture[][][] rTextures = new ITexture[3][17][]; - for (byte i = -1; i < 16; i = (byte) (i + 1)) { - ITexture[] tmp0 = { - TextureFactory.of(Textures.BlockIcons.MACHINE_STEEL_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[0][(i + 1)] = tmp0; - ITexture[] tmp1 = { - TextureFactory.of(Textures.BlockIcons.MACHINE_STEEL_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[1][(i + 1)] = tmp1; - ITexture[] tmp2 = { - TextureFactory.of(Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[2][(i + 1)] = tmp2; - } - return rTextures; - } -} diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java deleted file mode 100644 index cd5f547d22..0000000000 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java +++ /dev/null @@ -1,53 +0,0 @@ -package gregtech.common.tileentities.machines; - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull_NonElectric; -import gregtech.api.render.TextureFactory; - -public class GT_MetaTileEntity_BasicHull_SteelBricks extends GT_MetaTileEntity_BasicHull_NonElectric { - - public GT_MetaTileEntity_BasicHull_SteelBricks(int aID, String aName, String aNameRegional, int aTier, - String aDescription) { - super(aID, aName, aNameRegional, aTier, aDescription); - } - - public GT_MetaTileEntity_BasicHull_SteelBricks(String aName, int aTier, String aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - public GT_MetaTileEntity_BasicHull_SteelBricks(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_BasicHull_SteelBricks( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); - } - - @Override - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - ITexture[][][] rTextures = new ITexture[3][17][]; - for (byte i = -1; i < 16; i = (byte) (i + 1)) { - ITexture[] tmp0 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_STEELBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[0][(i + 1)] = tmp0; - ITexture[] tmp1 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_STEELBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[1][(i + 1)] = tmp1; - ITexture[] tmp2 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[2][(i + 1)] = tmp2; - } - return rTextures; - } -} diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java deleted file mode 100644 index 09f12904d7..0000000000 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java +++ /dev/null @@ -1,1040 +0,0 @@ -package gregtech.common.tileentities.machines; - -import static gregtech.api.enums.GT_Values.TIER_COLORS; -import static gregtech.api.enums.GT_Values.VN; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_CRAFTING_INPUT_BUFFER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_CRAFTING_INPUT_BUS; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; - -import javax.annotation.Nullable; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.event.ForgeEventFactory; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import org.apache.commons.lang3.ArrayUtils; -import org.jetbrains.annotations.NotNull; - -import com.glodblock.github.common.item.ItemFluidPacket; -import com.google.common.collect.ImmutableList; -import com.gtnewhorizons.modularui.api.math.Alignment; -import com.gtnewhorizons.modularui.api.math.Size; -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import com.gtnewhorizons.modularui.common.widget.ButtonWidget; -import com.gtnewhorizons.modularui.common.widget.SlotGroup; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import appeng.api.AEApi; -import appeng.api.implementations.ICraftingPatternItem; -import appeng.api.implementations.IPowerChannelState; -import appeng.api.networking.GridFlags; -import appeng.api.networking.IGridNode; -import appeng.api.networking.crafting.ICraftingPatternDetails; -import appeng.api.networking.crafting.ICraftingProvider; -import appeng.api.networking.crafting.ICraftingProviderHelper; -import appeng.api.networking.events.MENetworkCraftingPatternChange; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.security.IActionHost; -import appeng.api.networking.security.MachineSource; -import appeng.api.storage.IMEMonitor; -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.util.AECableType; -import appeng.api.util.DimensionalCoord; -import appeng.api.util.IInterfaceViewable; -import appeng.core.AppEng; -import appeng.core.sync.GuiBridge; -import appeng.helpers.ICustomNameObject; -import appeng.items.misc.ItemEncodedPattern; -import appeng.items.tools.quartz.ToolQuartzCuttingKnife; -import appeng.me.GridAccessException; -import appeng.me.helpers.AENetworkProxy; -import appeng.me.helpers.IGridProxyable; -import appeng.util.IWideReadableNumberConverter; -import appeng.util.Platform; -import appeng.util.ReadableNumberConverter; -import gregtech.GT_Mod; -import gregtech.api.enums.ItemList; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.interfaces.IConfigurationCircuitSupport; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.modularui.IAddGregtechLogo; -import gregtech.api.interfaces.modularui.IAddUIWidgets; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; -import gregtech.api.util.extensions.ArrayExt; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; - -public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_Hatch_InputBus - implements IConfigurationCircuitSupport, IAddGregtechLogo, IAddUIWidgets, IPowerChannelState, ICraftingProvider, - IGridProxyable, IDualInputHatch, ICustomNameObject, IInterfaceViewable { - - // Each pattern slot in the crafting input hatch has its own internal inventory - public static class PatternSlot implements IDualInputInventory { - - public interface SharedItemGetter { - - ItemStack[] getSharedItem(); - } - - private final ItemStack pattern; - private final ICraftingPatternDetails patternDetails; - private final List itemInventory; - private final List fluidInventory; - private final SharedItemGetter sharedItemGetter; - - public PatternSlot(ItemStack pattern, World world, SharedItemGetter getter) { - this.pattern = pattern; - this.patternDetails = ((ICraftingPatternItem) Objects.requireNonNull(pattern.getItem())) - .getPatternForItem(pattern, world); - this.itemInventory = new ArrayList<>(); - this.fluidInventory = new ArrayList<>(); - this.sharedItemGetter = getter; - } - - public PatternSlot(ItemStack pattern, NBTTagCompound nbt, World world, SharedItemGetter getter) { - this.pattern = pattern; - this.patternDetails = ((ICraftingPatternItem) Objects.requireNonNull(pattern.getItem())) - .getPatternForItem(pattern, world); - this.itemInventory = new ArrayList<>(); - this.fluidInventory = new ArrayList<>(); - this.sharedItemGetter = getter; - NBTTagList inv = nbt.getTagList("inventory", Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < inv.tagCount(); i++) { - NBTTagCompound tagItemStack = inv.getCompoundTagAt(i); - ItemStack item = GT_Utility.loadItem(tagItemStack); - if (item != null) { - if (item.stackSize > 0) { - itemInventory.add(item); - } - } else { - GT_Mod.GT_FML_LOGGER.warn( - "An error occurred while loading contents of ME Crafting Input Bus. This item has been voided: " - + tagItemStack); - } - } - NBTTagList fluidInv = nbt.getTagList("fluidInventory", Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < fluidInv.tagCount(); i++) { - NBTTagCompound tagFluidStack = fluidInv.getCompoundTagAt(i); - FluidStack fluid = FluidStack.loadFluidStackFromNBT(tagFluidStack); - if (fluid != null) { - if (fluid.amount > 0) { - fluidInventory.add(fluid); - } - } else { - GT_Mod.GT_FML_LOGGER.warn( - "An error occurred while loading contents of ME Crafting Input Bus. This fluid has been voided: " - + tagFluidStack); - } - } - } - - public boolean hasChanged(ItemStack newPattern, World world) { - return newPattern == null - || (!ItemStack.areItemStacksEqual(pattern, newPattern) && !this.patternDetails.equals( - ((ICraftingPatternItem) Objects.requireNonNull(pattern.getItem())) - .getPatternForItem(newPattern, world))); - } - - public void updateSlotItems() { - for (int i = itemInventory.size() - 1; i >= 0; i--) { - ItemStack itemStack = itemInventory.get(i); - if (itemStack == null || itemStack.stackSize <= 0) { - itemInventory.remove(i); -