From 311ab89f93558233a40079f7cb16605b141b5346 Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Sun, 12 Dec 2021 19:38:06 +0100 Subject: Move sources and resources --- .../xmod/gregtech/common/Meta_GT_Proxy.java | 631 ------------ .../xmod/gregtech/common/StaticFields59.java | 303 ------ .../common/blocks/GTPP_Block_Machines.java | 534 ---------- .../gregtech/common/blocks/GTPP_Item_Machines.java | 229 ----- .../common/blocks/GregtechMetaCasingBlocks.java | 78 -- .../common/blocks/GregtechMetaCasingBlocks2.java | 89 -- .../common/blocks/GregtechMetaCasingBlocks3.java | 366 ------- .../common/blocks/GregtechMetaCasingBlocks4.java | 115 --- .../common/blocks/GregtechMetaCasingBlocks5.java | 83 -- .../blocks/GregtechMetaCasingBlocksAbstract.java | 150 --- .../common/blocks/GregtechMetaCasingItems.java | 10 - .../common/blocks/GregtechMetaItemCasings1.java | 36 - .../blocks/GregtechMetaItemCasingsAbstract.java | 61 -- .../blocks/GregtechMetaSpecialMachineCasings.java | 81 -- .../blocks/GregtechMetaSpecialMultiCasings.java | 103 -- .../blocks/GregtechMetaTieredCasingBlocks1.java | 110 -- .../common/blocks/fluid/GregtechFluidHandler.java | 111 --- .../blocks/textures/CasingTextureHandler.java | 82 -- .../blocks/textures/CasingTextureHandler2.java | 57 -- .../blocks/textures/CasingTextureHandler3.java | 68 -- .../textures/TexturesCentrifugeMultiblock.java | 166 ---- .../common/blocks/textures/TexturesGregtech58.java | 443 --------- .../common/blocks/textures/TexturesGregtech59.java | 444 --------- .../blocks/textures/TexturesGrinderMultiblock.java | 150 --- .../common/blocks/textures/TexturesGtBlock.java | 652 ------------ .../blocks/textures/TexturesGtCutomCovers.java | 32 - .../common/blocks/textures/TexturesGtTools.java | 61 -- .../turbine/LargeTurbineTextureHandler.java | 318 ------ .../common/blueprint/Blueprint_Generic_3x3.java | 87 -- .../gregtech/common/blueprint/Blueprint_LFTR.java | 137 --- .../xmod/gregtech/common/covers/CoverManager.java | 102 -- .../common/covers/GTPP_Cover_Overflow.java | 247 ----- .../common/covers/GTPP_Cover_Overflow_Item.java | 182 ---- .../common/covers/GTPP_Cover_ToggleVisual.java | 186 ---- .../gregtech/common/helpers/ChargingHelper.java | 429 -------- .../gregtech/common/helpers/CraftingHelper.java | 42 - .../common/helpers/FlotationRecipeHandler.java | 79 -- .../gregtech/common/helpers/GT_MethodHelper.java | 80 -- .../common/helpers/MachineUpdateHandler.java | 42 - .../gregtech/common/helpers/TreeFarmHelper.java | 1033 ------------------- .../common/helpers/VolumetricFlaskHelper.java | 188 ---- .../helpers/autocrafter/AC_Helper_Container.java | 118 --- .../helpers/autocrafter/AC_Helper_Utils.java | 80 -- .../common/helpers/tesseract/TesseractHelper.java | 263 ----- .../common/helpers/treefarm/TreeGenerator.java | 386 -------- .../gregtech/common/items/MetaCustomCoverItem.java | 225 ----- .../common/items/MetaGeneratedGregtechItems.java | 453 --------- .../common/items/MetaGeneratedGregtechTools.java | 101 -- .../items/behaviours/Behaviour_Choocher.java | 88 -- .../behaviours/Behaviour_Electric_Lighter.java | 220 ---- .../common/items/behaviours/Behaviour_Grinder.java | 94 -- .../items/behaviours/Behaviour_Prospecting_Ex.java | 123 --- .../common/items/covers/MetaItemCoverCasings.java | 40 - .../gregtech/common/render/GTPP_CapeRenderer.java | 517 ---------- .../gregtech/common/render/GTPP_FlaskRenderer.java | 94 -- .../common/render/GTPP_Render_MachineBlock.java | 659 ------------ .../requirements/RequirementsBasicCubic.java | 11 - .../GT_MetaTileEntity_TesseractGenerator.java | 730 -------------- .../GT_MetaTileEntity_TesseractTerminal.java | 581 ----------- .../generators/GT_MetaTileEntity_Boiler_Base.java | 296 ------ .../generators/GT_MetaTileEntity_Boiler_HV.java | 56 -- .../generators/GT_MetaTileEntity_Boiler_LV.java | 52 - .../generators/GT_MetaTileEntity_Boiler_MV.java | 52 - .../generators/GT_MetaTileEntity_Boiler_Solar.java | 194 ---- .../generators/GT_MetaTileEntity_RfConvertor.java | 348 ------- .../GT_MetaTileEntity_SemiFluidGenerator.java | 171 ---- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 153 --- .../GregtechMetaTileEntityGeothermalGenerator.java | 151 --- .../GregtechMetaTileEntityRocketFuelGenerator.java | 142 --- .../GregtechMetaTileEntitySolarGenerator.java | 187 ---- .../generators/GregtechMetaTileEntity_RTG.java | 390 -------- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 50 - .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 59 -- .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 58 -- .../creative/GregtechMetaCreativeEnergyBuffer.java | 229 ----- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 328 ------ .../GregtechMetaAtmosphericReconditioner.java | 789 --------------- .../machines/basic/GregtechMetaCondensor.java | 174 ---- .../basic/GregtechMetaGarbageCollector.java | 323 ------ .../basic/GregtechMetaPollutionCreator.java | 386 -------- .../basic/GregtechMetaPollutionDetector.java | 439 -------- .../basic/GregtechMetaTileEntityChunkLoader.java | 394 -------- ...GregtechMetaTileEntityThaumcraftResearcher.java | 204 ---- .../basic/GregtechMetaTileEntity_BasicWasher.java | 71 -- .../GregtechMetaTileEntity_ChemicalReactor.java | 666 ------------- ...regtechMetaTileEntity_CompactFusionReactor.java | 702 ------------- .../basic/GregtechMetaTileEntity_PocketFusion.java | 704 ------------- .../GregtechMetaTileEntity_ReactorColdTrap.java | 67 -- ...egtechMetaTileEntity_ReactorProcessingUnit.java | 67 -- .../basic/GregtechMetaWirelessCharger.java | 560 ----------- .../machines/multi/misc/GMTE_AmazonPackager.java | 323 ------ .../multi/misc/GregtechMTE_TeslaTower.java | 479 --------- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 403 -------- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 320 ------ ...regtechMetaTileEntity_IndustrialCentrifuge.java | 263 ----- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 230 ----- ...echMetaTileEntity_IndustrialCuttingMachine.java | 234 ----- ...regtechMetaTileEntity_IndustrialDehydrator.java | 415 -------- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 193 ---- .../GregtechMetaTileEntity_IndustrialExtruder.java | 260 ----- ...GregtechMetaTileEntity_IndustrialMacerator.java | 259 ----- .../GregtechMetaTileEntity_IndustrialMixer.java | 257 ----- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 541 ---------- ...regtechMetaTileEntity_IndustrialPlatePress.java | 242 ----- .../GregtechMetaTileEntity_IndustrialSifter.java | 225 ----- .../GregtechMetaTileEntity_IndustrialSinter.java | 268 ----- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 224 ----- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 261 ----- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 335 ------- .../GregtechMetaTileEntity_IndustrialWireMill.java | 206 ---- .../GregtechMetaTileEntity_IronBlastFurnace.java | 403 -------- .../processing/GregtechMetaTileEntity_IsaMill.java | 666 ------------- .../GregtechMetaTileEntity_SpargeTower.java | 414 -------- .../GregtechMetaTileEntity_Adv_AssemblyLine.java | 629 ------------ ...egtechMetaTileEntity_Adv_DistillationTower.java | 481 --------- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 484 --------- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 153 --- .../GregtechMetaTileEntity_Adv_Implosion.java | 207 ---- .../GregtechMetaTileEntity_SteamMacerator.java | 165 --- .../multi/production/GT4Entity_AutoCrafter.java | 656 ------------ .../multi/production/GT4Entity_ThermalBoiler.java | 354 ------- .../GregtechMTE_ElementalDuplicator.java | 744 -------------- .../production/GregtechMTE_FastNeutronReactor.java | 231 ----- .../production/GregtechMTE_FrothFlotationCell.java | 449 --------- .../production/GregtechMTE_LargeNaqReactor.java | 501 ---------- .../production/GregtechMTE_MiniFusionPlant.java | 386 -------- .../production/GregtechMTE_NuclearReactor.java | 523 ---------- .../GregtechMetaTileEntityGeneratorArray.java | 521 ---------- .../production/GregtechMetaTileEntityTreeFarm.java | 332 ------- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 336 ------- .../GregtechMetaTileEntity_Cyclotron.java | 481 --------- ...egtechMetaTileEntity_IndustrialFishingPond.java | 623 ------------ .../GregtechMetaTileEntity_LargeRocketEngine.java | 629 ------------ ...techMetaTileEntity_LargeSemifluidGenerator.java | 341 ------- .../GregtechMetaTileEntity_MassFabricator.java | 425 -------- .../GregtechMetaTileEntity_Refinery.java | 238 ----- .../GregtechMetaTileEntity_SolarTower.java | 702 ------------- .../algae/GregtechMTE_AlgaePondBase.java | 486 --------- ...gtechMetaTileEntity_BedrockMiningPlatform1.java | 46 - ...gtechMetaTileEntity_BedrockMiningPlatform2.java | 46 - ...chMetaTileEntity_BedrockMiningPlatformBase.java | 683 ------------- .../chemplant/GregtechMTE_ChemicalPlant.java | 1046 -------------------- .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 179 ---- .../turbines/GT_MTE_LargeTurbine_Steam.java | 189 ---- .../GregtechMetaTileEntity_LargerTurbineBase.java | 663 ------------- .../storage/GregtechMetaTileEntity_MultiTank.java | 621 ------------ ...chMetaTileEntity_PowerSubStationController.java | 657 ------------ .../tileentities/misc/TileEntitySolarHeater.java | 348 ------- .../GT_MetaTileEntity_ConnectableCrate.java | 574 ----------- .../storage/GT_MetaTileEntity_TieredChest.java | 199 ---- .../storage/GT_MetaTileEntity_TieredTank.java | 160 --- .../storage/GregtechMetaEnergyBuffer.java | 421 -------- .../storage/GregtechMetaSafeBlock.java | 62 -- .../GT_MetaTileEntity_InfiniteItemHolder.java | 105 -- .../storage/shelving/GT4Entity_Shelf.java | 359 ------- .../shelving/GT4Entity_Shelf_Compartment.java | 39 - .../storage/shelving/GT4Entity_Shelf_Desk.java | 45 - .../shelving/GT4Entity_Shelf_FileCabinet.java | 55 - .../storage/shelving/GT4Entity_Shelf_Iron.java | 41 - .../storage/shelving/GT4Entity_Shelf_Large.java | 266 ----- .../common/tools/TOOL_Gregtech_AngleGrinder.java | 199 ---- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 180 ---- .../common/tools/TOOL_Gregtech_Choocher.java | 196 ---- .../tools/TOOL_Gregtech_ElectricButcherKnife.java | 192 ---- .../tools/TOOL_Gregtech_ElectricLighter.java | 166 ---- .../common/tools/TOOL_Gregtech_ElectricSnips.java | 97 -- 166 files changed, 47974 deletions(-) delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_Generic_3x3.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_LFTR.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java deleted file mode 100644 index 091ee734e6..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java +++ /dev/null @@ -1,631 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.util.*; - -import org.apache.commons.lang3.ArrayUtils; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; -import gregtech.api.enums.*; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.util.*; -import gregtech.common.GT_Proxy; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.minecraft.FormattedTooltipString; -import gtPlusPlus.core.handler.AchievementHandler; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.*; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity; -import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.BaseCustomPower_MTE; -import gtPlusPlus.xmod.gregtech.common.covers.CoverManager; -import gtPlusPlus.xmod.gregtech.common.helpers.MachineUpdateHandler; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator; -import ic2.core.init.BlocksItems; -import ic2.core.init.InternalName; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -public class Meta_GT_Proxy { - - static { - Logger.INFO("GT_PROXY - initialized."); - sDoesVolumetricFlaskExist = ReflectionUtils.doesClassExist("gregtech.common.items.GT_VolumetricFlask"); - } - - public static List GT_BlockIconload = new ArrayList<>(); - public static List GT_ItemIconload = new ArrayList<>(); - - public static AutoMap GT_ValidHeatingCoilMetas = new AutoMap(); - - private static Class sBaseMetaTileEntityClass; - private static Class sBaseMetaTileEntityClass2; - - public static AchievementHandler mAssemblyAchievements; - - public static final Map mCustomGregtechMetaTooltips = new LinkedHashMap(); - - /** - * Does this feature exist within GT? Saves loading useless content if not. - */ - public static final boolean sDoesVolumetricFlaskExist; - - @SideOnly(Side.CLIENT) - public static IIconRegister sBlockIcons, sItemIcons; - - public Meta_GT_Proxy() { - - } - - public static Block sBlockMachines; - - public static void preInit() { - - //New GT++ Block, yay! (Progress) - //sBlockMachines = new GTPP_Block_Machines(); - fixIC2FluidNames(); - - GT_Log.out.println("GT++ Mod: Register TileEntities."); - BaseMetaTileEntity tBaseMetaTileEntity = constructBaseMetaTileEntity(); - BaseMetaTileEntity tBaseMetaTileEntity2 = constructBaseMetaTileEntityCustomPower(); - - GT_Log.out.println("GT++ Mod: Testing BaseMetaTileEntity."); - if (tBaseMetaTileEntity == null || tBaseMetaTileEntity2 == null) { - GT_Log.out.println("GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft."); - throw new RuntimeException(""); - } - - //Gotta set it here so that we don't try call gregtech too early. - //Must set on the correct side - - if (ReflectionUtils.doesFieldExist(GT_Proxy.class, "gt6Pipe")) { - StaticFields59.mGT6StylePipes = (boolean) StaticFields59.getFieldFromGregtechProxy("gt6Pipe"); - } - else { - StaticFields59.mGT6StylePipes = false; - } - - GT_Log.out.println("GT++ Mod: Registering the BaseMetaTileEntity."); - GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity_GTPP"); - GameRegistry.registerTileEntity(tBaseMetaTileEntity2.getClass(), "BaseMetaTileEntity_GTPP2"); - CoverManager.generateCustomCovers(); - } - - public static void init() { - setValidHeatingCoilMetas(); - PollutionUtils.setPollutionFluids(); - fixIC2FluidNames(); - Utils.registerEvent(new MachineUpdateHandler()); - } - - public static void postInit() { - mAssemblyAchievements = new AchievementHandler(); - fixIC2FluidNames(); - - // Finalise TAE - TAE.finalizeTAE(); - } - - @SuppressWarnings("deprecation") - public static void fixIC2FluidNames() { - //Fix IC2 Hot Water name - try { - String aNewHeatedWaterName = "Heated Water"; - Logger.INFO("Renaming [IC2 Hotspring Water] --> ["+aNewHeatedWaterName+"].");LanguageRegistry.instance().addStringLocalization("fluidHotWater", "Heated Water"); - LanguageRegistry.instance().addStringLocalization("fluidHotWater", aNewHeatedWaterName); - LanguageRegistry.instance().addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName); - GT_LanguageManager.addStringLocalization("fluidHotWater", aNewHeatedWaterName); - GT_LanguageManager.addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName); - - Block b = BlocksItems.getFluidBlock(InternalName.fluidHotWater); - if (b != null) { - LanguageRegistry.addName(ItemUtils.getSimpleStack(b), aNewHeatedWaterName); - LanguageRegistry.instance().addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName); - GT_LanguageManager.addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName); - } - Fluid f = BlocksItems.getFluid(InternalName.fluidHotWater); - if (f != null) { - LanguageRegistry.instance().addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName); - GT_LanguageManager.addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName); - int aDam = FluidRegistry.getFluidID(f); - ItemStack s = ItemList.Display_Fluid.getWithDamage(1, aDam); - if (s != null) { - LanguageRegistry.addName(s, aNewHeatedWaterName); - } - } - - String[] aLangs = new String[] { - "de_DE", - "en_US", - "en_GB", - "en_IC", - "es_AR", - "es_ES", - "es_MX", - "es_UY", - "es_VE", - "fr_CA", - "fr_FR", - "it_IT", - "ko_KR", - "pt_BR", - "pt_PT", - "ru_RU", - "sv_SE", - "tr_TR", - "zh_CN", - "zh_TW", - }; - String[] aLangValues = new String[] { - "Erhitztes Wasser", - "Heated Water", - "Heated Water", - "Heated Water", - "Agua caliente", - "Agua caliente", - "Agua caliente", - "Agua caliente", - "Agua caliente", - "Eau chauffée", - "Eau chauffée", - "Acqua riscaldata", - "온수", - "Água aquecida", - "Água aquecida", - "Вода с подогревом", - "Uppvärmt vatten", - "Isıtılmış Su", - "热水", - "热水", - - }; - for (int i=0;i aFreezerMapRebaked = new AutoMap(); - AutoMap aRemovedRecipes = new AutoMap(); - - //Find recipes containing Plasma and map them - for (GT_Recipe y : GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mRecipeList) { - if (y.mFluidInputs.length > 0) { - for (FluidStack r : y.mFluidInputs) { - if (r.getUnlocalizedName().toLowerCase().contains("plasma")) { - aRemovedRecipes.put(y); - continue; - } - } - aFreezerMapRebaked.put(y); - } - } - - AutoMap aNewRecipes = new AutoMap(); - int aAtomicMass = 0; - int aAtomicTier = 0; - - final FluidStack NULL_PLASMA = Materials._NULL.getPlasma(1); - - for (String s : ELEMENT.NAMES) { - - aAtomicMass++; - aAtomicTier = (aAtomicMass/30)+1; - FluidStack aMoltenFluid = null; - FluidStack aPlasma = null; - - //Try Get Material via Gregtech - Materials aGregMaterial = MaterialUtils.getMaterial(s); - if (aGregMaterial != null) { - aMoltenFluid = aGregMaterial.getMolten(1); - if (aMoltenFluid == null) { - aMoltenFluid = aGregMaterial.getFluid(1); - if (aMoltenFluid == null) { - aMoltenFluid = aGregMaterial.getGas(1); - if (aMoltenFluid == null) { - aMoltenFluid = aGregMaterial.getSolid(1); - } - } - } - aPlasma = aGregMaterial.getPlasma(100); - } - - //Just wildcard values - if (aMoltenFluid == null || aPlasma == null) { - if (aMoltenFluid == null) { - aMoltenFluid = FluidUtils.getWildcardFluidStack(s, 1); - } - if (aPlasma == null) { - aPlasma = FluidUtils.getFluidStack("plasma."+s.toLowerCase(), 1); - } - } - - //Skip this material - if (aMoltenFluid == null || aPlasma == null || aPlasma.isFluidEqual(NULL_PLASMA)) { - Logger.INFO("Could not generate Advanced Vacuum Freezer recipe. Cooling "+s+" plasma. Molten Form Exists? "+(aMoltenFluid != null)+" | Plasma Exists? "+(aPlasma != null)); - continue; - } - else { - //Build a new plasma recipe - int aTotalTickTime = (20 * 1 + (aAtomicMass)); - GTPP_Recipe aTempRecipe = new GTPP_Recipe(true, - new ItemStack[] {}, - new ItemStack[] {}, - null, - new int[] {10000}, - new FluidStack[] { - aPlasma, - FluidUtils.getFluidStack("cryotheum", aTotalTickTime) - }, - new FluidStack[] { - aMoltenFluid - }, - aTotalTickTime, - (int) GT_Values.V[4+aAtomicTier], - aAtomicMass); - - //Add it to the map if it's valid - if (aTempRecipe != null) { - aNewRecipes.put(aTempRecipe); - } - } - - } - - - //Add the new recipes to the map we will rebake over the original - for (GTPP_Recipe w : aNewRecipes) { - aFreezerMapRebaked.put(w); - } - - //Best not touch the original map if we don't have a valid map to override it with. - if (aFreezerMapRebaked.size() > 0) { - - int aOriginalCount = GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mRecipeList.size(); - - //Empty the original map - GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mRecipeList.clear(); - - //Rebake the real map - for (GT_Recipe w : aFreezerMapRebaked) { - GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mRecipeList.add(w); - } - - return GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mRecipeList.size() >= aOriginalCount; - } - - return false; - } - - public static TileEntity constructCustomGregtechMetaTileEntityByMeta(int aMeta) { - if (aMeta == 12) { - return Meta_GT_Proxy.constructBaseMetaTileEntityCustomPower(); - } - else { - return Meta_GT_Proxy.constructBaseMetaTileEntity(); - } - } - - public static BaseCustomTileEntity constructBaseMetaTileEntity() { - if (sBaseMetaTileEntityClass == null) { - try { - sBaseMetaTileEntityClass = BaseCustomTileEntity.class; - return (BaseCustomTileEntity) BaseCustomTileEntity.class.newInstance(); - } catch (Throwable arg1) { - try { - Constructor g = BaseCustomTileEntity.class.getConstructors()[0]; - g.setAccessible(true); - return (BaseCustomTileEntity) g.newInstance(); - } catch (InstantiationException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException | SecurityException e) { - } - } - } - try { - return (BaseCustomTileEntity) ((BaseCustomTileEntity) sBaseMetaTileEntityClass.newInstance()); - } catch (Throwable arg0) { - arg0.printStackTrace(GT_Log.err); - try { - Constructor g = BaseCustomTileEntity.class.getConstructors()[0]; - g.setAccessible(true); - return (BaseCustomTileEntity) g.newInstance(); - } catch (InstantiationException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException | SecurityException e) { - GT_Log.err - .println("GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft."); - e.printStackTrace(GT_Log.err); - throw new RuntimeException(e); - } - } - } - - public static BaseCustomPower_MTE constructBaseMetaTileEntityCustomPower() { - if (sBaseMetaTileEntityClass2 == null) { - try { - sBaseMetaTileEntityClass2 = BaseCustomPower_MTE.class; - return (BaseCustomPower_MTE) BaseCustomPower_MTE.class.newInstance(); - } catch (Throwable arg1) { - try { - Constructor g = BaseCustomPower_MTE.class.getConstructors()[0]; - g.setAccessible(true); - return (BaseCustomPower_MTE) g.newInstance(); - } catch (InstantiationException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException | SecurityException e) { - // e.printStackTrace(); - } - } - } - - try { - return (BaseCustomPower_MTE) ((BaseCustomPower_MTE) sBaseMetaTileEntityClass2.newInstance()); - } catch (Throwable arg0) { - arg0.printStackTrace(GT_Log.err); - try { - Constructor g = BaseCustomPower_MTE.class.getConstructors()[0]; - g.setAccessible(true); - return (BaseCustomPower_MTE) g.newInstance(); - } catch (InstantiationException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException | SecurityException e) { - GT_Log.err - .println("GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft."); - e.printStackTrace(GT_Log.err); - throw new RuntimeException(e); - } - } - } - - - - - - public static boolean setTileEntityClassAsBlacklistedInWorldAccelerator(String aClassName) { - if (CORE.GTNH) { - Class aMainModClass = ReflectionUtils.getClass("com.dreammaster.main.MainRegistry"); - Class aCoreModConfig = ReflectionUtils.getClass("com.dreammaster.config"); - if (aMainModClass != null && aCoreModConfig != null) { - Field aCoreConfig = ReflectionUtils.getField(aMainModClass, "CoreConfig"); - if (aCoreConfig != null) { - Field aBlackList = ReflectionUtils.getField(aCoreModConfig, "BlacklistedTileEntiyClassNames"); - Object aInstance = ReflectionUtils.getFieldValue(aCoreConfig); - if (aBlackList != null && aInstance != null) { - String[] aBlackListValue = (String[]) ReflectionUtils.getFieldValue(aBlackList, aInstance); - if (aBlackListValue != null) { - aBlackListValue = ArrayUtils.add(aBlackListValue, aClassName); - ReflectionUtils.setField(aInstance, aBlackList, aBlackListValue); - return true; - } - } - } - } - } - else { - GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames = ArrayUtils.add(GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames, aClassName); - return true; - } - return false; - } - - - - public static void setValidHeatingCoilMetas() { - for (int i = 0; i <= 6; i++ ) { - GT_ValidHeatingCoilMetas.put(i); - } - if (CORE.GTNH) { - for (int i = 7; i <= 8; i++ ) { - GT_ValidHeatingCoilMetas.put(i); - } - } - } - - public static boolean areWeUsingGregtech5uExperimental(){ - final int version = GregTech_API.VERSION; - if ((version == 508) || (version == 507)){ - return false; - } - else if (version == 509){ - return true; - } - else { - return false; - } - } - - static GT_Proxy[] mProxies = new GT_Proxy[2]; - - /** - * @deprecated Use {@link StaticFields59#getFieldFromGregtechProxy(boolean,String)} instead - */ - public static Object getFieldFromGregtechProxy(boolean client, String fieldName) { - return StaticFields59.getFieldFromGregtechProxy(client, fieldName); - } - - public static void setCustomGregtechTooltip(String aNbtTagName, FormattedTooltipString aData) { - mCustomGregtechMetaTooltips.put(aNbtTagName, aData); - } - - public static void conStructGtTileBlockTooltip(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean par4) { - try { - int tDamage = aStack.getItemDamage(); - if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) { - return; - } - - if (GregTech_API.METATILEENTITIES[tDamage] != null) { - IGregTechTileEntity tTileEntity = GregTech_API.METATILEENTITIES[tDamage].getBaseMetaTileEntity(); - if (tTileEntity.getDescription() != null) { - int i = 0; - for (String tDescription : tTileEntity.getDescription()) { - if (GT_Utility.isStringValid(tDescription)) { - if(tDescription.contains("%%%")){ - String[] tString = tDescription.split("%%%"); - if(tString.length>=2){ - StringBuffer tBuffer = new StringBuffer(); - Object tRep[] = new String[tString.length / 2]; - for (int j = 0; j < tString.length; j++) - if (j % 2 == 0) tBuffer.append(tString[j]); - else {tBuffer.append(" %s"); tRep[j / 2] = tString[j];} - aList.add(String.format(GT_LanguageManager.addStringLocalization("TileEntity_DESCRIPTION_" + tDamage + "_Index_" + i++, tBuffer.toString(), !GregTech_API.sPostloadFinished), tRep)); - } - }else{String tTranslated = GT_LanguageManager.addStringLocalization("TileEntity_DESCRIPTION_" + tDamage + "_Index_" + i++, tDescription, !GregTech_API.sPostloadFinished ); - aList.add(tTranslated.equals("") ? tDescription : tTranslated);} - }else i++; - } - } - - - - if (tTileEntity.getEUCapacity() > 0L) { - - final long tVoltage = tTileEntity.getInputVoltage(); - byte tTier = (byte) ((byte) Math.max(1, GT_Utility.getTier(tVoltage))); - - //Custom handling - if (tDamage < 30500 && tDamage >= 30400) { - int aOffset = tDamage - 30400; - if ((aOffset) <= 10) { - tTier -= 2; - aList.add(EnumChatFormatting.BOLD+"16"+" Fuse Slots"+EnumChatFormatting.GRAY); - aList.add("Per each fuse, you may insert "+EnumChatFormatting.YELLOW+(GT_Values.V[tTier])+EnumChatFormatting.GRAY+" EU/t"); - aList.add("However this "+EnumChatFormatting.ITALIC+EnumChatFormatting.RED+"MUST"+EnumChatFormatting.GRAY+" be in a single Amp"); - aList.add("This machine can accept upto a single amp of "+GT_Values.VN[Math.min(tTier+2, 12)]+" as a result"); - aList.add(GT_LanguageManager.addStringLocalization("TileEntity_Breaker_Loss", "Breaker Loss: "+EnumChatFormatting.RED+""+(GT_Values.V[Math.max(tTier-1, 0)]/10)+EnumChatFormatting.GRAY+" EU/t", !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY); - } - - - aList.add(GT_LanguageManager.addStringLocalization("TileEntity_Special_Power_1", EnumChatFormatting.RED+"Special Power Handling, please read manual", !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY); - //aList.add(GT_LanguageManager.addStringLocalization("TileEntity_BreakerBox_2", EnumChatFormatting.RED+"Special Power Handling, please read manual", !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY); - //aList.add(GT_LanguageManager.addStringLocalization("TileEntity_BreakerBox_3", EnumChatFormatting.RED+"Special Power Handling, please read manual", !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY); - } - - - if (tTileEntity.getInputVoltage() > 0L) { - String inA = "0"; - if (tTileEntity.getInputAmperage() >= 1L) { - inA = " at " + EnumChatFormatting.YELLOW + tTileEntity.getInputAmperage() + EnumChatFormatting.GRAY +" Amps"; - } - else { - inA = " at " + EnumChatFormatting.WHITE + tTileEntity.getInputAmperage() + EnumChatFormatting.GRAY +" Amps"; - } - String a1 = "Voltage IN: "+EnumChatFormatting.GREEN + tTileEntity.getInputVoltage() - + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getInputVoltage())] + ")" - + EnumChatFormatting.GRAY + inA; - aList.add(a1); - } - - if (tTileEntity.getOutputVoltage() > 0L) { - String outA = "0"; - if (tTileEntity.getOutputAmperage() >= 1L) { - outA = " at " + EnumChatFormatting.YELLOW + tTileEntity.getOutputAmperage() + EnumChatFormatting.GRAY +" Amps"; - } - else { - outA = " at " + EnumChatFormatting.WHITE + tTileEntity.getOutputAmperage() + EnumChatFormatting.GRAY +" Amps"; - } - String a1 = "Voltage OUT: "+EnumChatFormatting.GREEN + tTileEntity.getOutputVoltage() - + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getOutputVoltage())] + ")" - + EnumChatFormatting.GRAY + outA; - aList.add(a1); - } - - - if (tTileEntity.getOutputVoltage() > 0L) { - aList.add(GT_LanguageManager.addStringLocalization("TileEntity_Lossess_EU", "Transmission Loss: "+EnumChatFormatting.DARK_BLUE+""+(tDamage < 30500 && tDamage >= 30400 ? 0 : 1), !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY); - } - - if (tTileEntity.getEUCapacity() > 0) { - aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE2", - "Internal Capacity: ", !GregTech_API.sPostloadFinished) + EnumChatFormatting.BLUE - + tTileEntity.getEUCapacity() + EnumChatFormatting.GRAY + " EU"); - } - } - - /*if (tTileEntity.getEUCapacity() > 0L) { - if (tTileEntity.getInputVoltage() > 0L) { - aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getInputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getInputVoltage())] + ")" + EnumChatFormatting.GRAY); - } - if (tTileEntity.getOutputVoltage() > 0L) { - aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getOutputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getOutputVoltage())] + ")" + EnumChatFormatting.GRAY); - } - if (tTileEntity.getOutputAmperage() > 1L) { - aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.YELLOW + tTileEntity.getOutputAmperage() + EnumChatFormatting.GRAY); - } - aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.BLUE + tTileEntity.getEUCapacity() + EnumChatFormatting.GRAY); - }*/ - - } - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - if (aNBT.getBoolean("mMuffler")) { - aList.add(GT_LanguageManager.addStringLocalization("GT_TileEntity_MUFFLER", "has Muffler Upgrade", !GregTech_API.sPostloadFinished )); - } - if (aNBT.getBoolean("mSteamConverter")) { - aList.add(GT_LanguageManager.addStringLocalization("GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade", !GregTech_API.sPostloadFinished )); - } - int tAmount = 0; - if ((tAmount = aNBT.getByte("mSteamTanks")) > 0) { - aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("GT_TileEntity_STEAMTANKS", "Steam Tank Upgrades", !GregTech_API.sPostloadFinished )); - } - - FluidStack afluid = net.minecraftforge.fluids.FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid")); - if (afluid != null) { - int tFluidAmount = afluid.amount; - if (tFluidAmount > 0) { - aList.add(GT_LanguageManager.addStringLocalization("GT_TileEntity_FLUIDTANK", "Tank Fluid: "+tFluidAmount+"L "+afluid.getLocalizedName()+"", !GregTech_API.sPostloadFinished )); - } - } - - } - - //Add Custom Here - - //Add Custom Tooltips - for (String s : mCustomGregtechMetaTooltips.keySet()) { - if (aNBT.hasKey(s)) { - String aTip = mCustomGregtechMetaTooltips.get(s).getTooltip(aNBT.getString(s)); - aList.add(aTip); - } - } - - //Add GT++ Stuff - - if (tDamage >= 30400 && tDamage < 30500) { - aList.add(EnumChatFormatting.UNDERLINE+"Special GT++ Machine"); - } - if ((tDamage >= 750 && tDamage < 1000) || (tDamage >= 30000 && tDamage < 31000)) { - aList.add(CORE.GT_Tooltip); - } - - - } catch (Throwable e) { - e.printStackTrace(GT_Log.err); - } - } - -} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java deleted file mode 100644 index 44c580fe4f..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java +++ /dev/null @@ -1,303 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import gregtech.GT_Mod; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.Textures.BlockIcons; -import gregtech.api.interfaces.ITexture; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.common.GT_Proxy; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.reflect.ProxyFinder; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -public class StaticFields59 { - - - public static boolean mGT6StylePipes; - - public static final Field mGtBlockCasings5; - public static final Field mPreventableComponents; - public static final Field mDisabledItems; - public static final Field mMultiblockChemicalRecipes; - public static final Field mPyrolyseRecipes; - public static final Field mDescriptionArray; - public static final Field mCasingTexturePages; - public static final Field mAssLineVisualMapNEI; - public static final GT_Recipe_Map sAssemblylineVisualRecipes; - - public static final Method mCalculatePollutionReduction; - public static final Method mAddFurnaceRecipe; - - private static final Map mMaterialCache = new LinkedHashMap(); - - - //OrePrefixes - - static { - Logger.INFO("[SH] Creating Static Helper for various fields which require reflective access."); - - mGtBlockCasings5 = getField(GregTech_API.class, "sBlockCasings5"); - Logger.INFO("[SH] Got Field: sBlockCasings5"); - mPreventableComponents = getField(OrePrefixes.class, "mPreventableComponents"); - Logger.INFO("[SH] Got Field: mPreventableComponents"); - mDisabledItems = getField(OrePrefixes.class, "mDisabledItems"); - Logger.INFO("[SH] Got Field: mDisabledItems"); - mDescriptionArray = getField(GT_MetaTileEntity_TieredMachineBlock.class, "mDescriptionArray"); - Logger.INFO("[SH] Got Field: mDescriptionArray"); - mCasingTexturePages = getField(BlockIcons.class, "casingTexturePages"); - Logger.INFO("[SH] Got Field: casingTexturePages"); - - mAssLineVisualMapNEI = getField(GT_Recipe_Map.class, "sAssemblylineVisualRecipes"); - Logger.INFO("[SH] Got Field: mAssLineVisualMapNEI"); - GT_Recipe_Map aTemp; - if (mAssLineVisualMapNEI != null) { - try { - aTemp = (GT_Recipe_Map) mAssLineVisualMapNEI.get(null); - Logger.INFO("[SH] Got Field: sAssemblylineVisualRecipes"); - } catch (IllegalArgumentException | IllegalAccessException e) { - aTemp = null; - } - } else { - aTemp = null; - } - - sAssemblylineVisualRecipes = aTemp; - - mMultiblockChemicalRecipes = getField(GT_Recipe_Map.class, "sMultiblockChemicalRecipes"); - Logger.INFO("[SH] Got Field: sMultiblockChemicalRecipes"); - if (ReflectionUtils.doesFieldExist(GT_Recipe.GT_Recipe_Map.class, "sPyrolyseRecipes")) { - mPyrolyseRecipes = getField(GT_Recipe_Map.class, "sPyrolyseRecipes"); - Logger.INFO("[SH] Got Field: sPyrolyseRecipes"); - } - else { - mPyrolyseRecipes = null; - } - - mCalculatePollutionReduction = getMethod(GT_MetaTileEntity_Hatch_Muffler.class, "calculatePollutionReduction", - int.class); - Logger.INFO("[SH] Got Method: calculatePollutionReduction"); - - // Yep... - if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - mAddFurnaceRecipe = getMethod(GT_ModHandler.class, "addSmeltingAndAlloySmeltingRecipe", ItemStack.class, - ItemStack.class); - Logger.INFO("[SH] Got Method: addSmeltingAndAlloySmeltingRecipe"); - } else { - mAddFurnaceRecipe = getMethod(GT_ModHandler.class, "addSmeltingAndAlloySmeltingRecipe", ItemStack.class, - ItemStack.class, boolean.class); - Logger.INFO("[SH] Got Method: addSmeltingAndAlloySmeltingRecipe"); - } - - } - - public static synchronized final Block getBlockCasings5() { - try { - return (Block) mGtBlockCasings5.get(GregTech_API.class); - } catch (IllegalArgumentException | IllegalAccessException e) { - return null; - } - } - - public static int calculatePollutionReducation(GT_MetaTileEntity_Hatch_Muffler h, int i) { - try { - return (int) mCalculatePollutionReduction.invoke(h, i); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - return 0; - } - } - - public static Field getField(Class a, String b) { - return ReflectionUtils.getField(a, b); - } - - public static Method getMethod(Class a, String b, Class... params) { - return ReflectionUtils.getMethod(a, b, params); - } - - public static synchronized final Collection getOrePrefixesBooleanDisabledItems() { - try { - return (Collection) mDisabledItems.get(OrePrefixes.class); - } catch (IllegalArgumentException | IllegalAccessException e) { - return new ArrayList(); - } - } - - - public static synchronized final List geOrePrefixesBooleanPreventableComponents() { - try { - return (List) mPreventableComponents.get(OrePrefixes.class); - } catch (IllegalArgumentException | IllegalAccessException e) { - return new ArrayList(); - } - } - - public static synchronized final GT_Recipe_Map getLargeChemicalReactorRecipeMap() { - try { - return (GT_Recipe_Map) mMultiblockChemicalRecipes.get(null); - } catch (IllegalArgumentException | IllegalAccessException e) { - return null; - } - } - - public static synchronized final GT_Recipe_Map getPyrolyseRecipeMap() { - try { - return mPyrolyseRecipes != null ? (GT_Recipe_Map) mPyrolyseRecipes.get(null) : null; - } catch (IllegalArgumentException | IllegalAccessException e) { - return null; - } - } - - public static Materials getMaterial(String aMaterialName) { - Materials m = mMaterialCache.get(aMaterialName); - if (m != null) { - return m; - } - else { - m = Materials.get(aMaterialName); - if (m != null) { - mMaterialCache.put(aMaterialName, m); - return m; - } - return null; - } - } - - public static String[] getDescriptionArray(GT_MetaTileEntity_TieredMachineBlock aTile) { - try { - return (String[]) mDescriptionArray.get(aTile); - } catch (IllegalArgumentException | IllegalAccessException e) { - return new String[] {aTile.mDescription}; - } - } - - public static ITexture getCasingTexturePages(int a, int b) { - try { - ITexture[][] g = (ITexture[][]) mCasingTexturePages.get(null); - if (g != null) { - return g[a][b]; - } - } - catch (Throwable t) { - - } - return null; - } - - - public static Object getFieldFromGregtechProxy(String fieldName) { - return getFieldFromGregtechProxy(Utils.isServer() ? false : true, fieldName); - } - - public static Object getFieldFromGregtechProxy(boolean client, String fieldName) { - Object proxyGT; - - if (Meta_GT_Proxy.mProxies[0] != null && client) { - proxyGT = Meta_GT_Proxy.mProxies[0]; - } else if (Meta_GT_Proxy.mProxies[1] != null && !client) { - proxyGT = Meta_GT_Proxy.mProxies[1]; - } else { - try { - proxyGT = (client ? ProxyFinder.getClientProxy(GT_Mod.instance) - : ProxyFinder.getServerProxy(GT_Mod.instance)); - } catch (final ReflectiveOperationException e1) { - proxyGT = null; - Logger.INFO("Failed to obtain instance of GT " + (client ? "Client" : "Server") + " proxy."); - } - if (Meta_GT_Proxy.mProxies[0] == null && client) { - Meta_GT_Proxy.mProxies[0] = (GT_Proxy) proxyGT; - } else if (Meta_GT_Proxy.mProxies[1] == null && !client) { - Meta_GT_Proxy.mProxies[1] = (GT_Proxy) proxyGT; - } - } - - if (proxyGT != null && proxyGT instanceof GT_Proxy) { - try { - return ReflectionUtils.getField(proxyGT.getClass(), fieldName).get(proxyGT); - } catch (IllegalArgumentException | IllegalAccessException e) { - } - } - return null; - } - - - - public static int getTierForCoil(Block aBlock, int aMeta) { - if (aBlock == G