From 7d1f51a8937e0a86486267437d444696e81e8aa0 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:04:28 +0200 Subject: Buildscript + Spotless (#318) * Convert AES.java to readable class * Buildscript * Spotless --- .../gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java | 11 +- .../xmod/bartcrops/HANDLER_CropsPlusPlus.java | 22 +- .../xmod/bartcrops/LoaderOfTheCrops.java | 188 +- .../bartcrops/abstracts/BaseAestheticCrop.java | 55 +- .../xmod/bartcrops/abstracts/BaseCrop.java | 79 +- .../bartcrops/abstracts/BaseHarvestableCrop.java | 106 +- .../xmod/bartcrops/crops/Crop_Force.java | 86 +- .../gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java | 90 +- .../java/gtPlusPlus/xmod/bartworks/BW_Utils.java | 141 +- .../gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java | 335 +- .../xmod/bop/blocks/BOP_Block_Registrator.java | 490 +- .../xmod/bop/blocks/base/LeavesBase.java | 180 +- .../gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 122 +- .../xmod/bop/blocks/base/SaplingBase.java | 338 +- .../xmod/bop/blocks/pine/LeavesPineTree.java | 39 +- .../xmod/bop/blocks/pine/LogPineTree.java | 32 +- .../xmod/bop/blocks/pine/SaplingPineTree.java | 75 +- .../blocks/rainforest/LeavesRainforestTree.java | 29 +- .../bop/blocks/rainforest/LogRainforestTree.java | 32 +- .../blocks/rainforest/SaplingRainforestTree.java | 99 +- .../xmod/bop/creative/MiscUtilsBOPTab.java | 21 +- .../bop/world/features/trees/WorldGenPineTree.java | 316 +- .../features/trees/WorldGenRainForestTree_Ex.java | 468 +- .../java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java | 11 +- .../xmod/computronics/HANDLER_Computronics.java | 81 +- .../xmod/eio/handler/HandlerTooltip_EIO.java | 127 +- .../gtPlusPlus/xmod/eio/material/MaterialEIO.java | 216 +- .../java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 186 +- .../forestry/bees/blocks/BlockDenseBeeHouse.java | 13 +- .../forestry/bees/blocks/FR_BlockRegistry.java | 30 +- .../xmod/forestry/bees/custom/CustomCombs.java | 119 +- .../forestry/bees/custom/GTPP_Bee_Definition.java | 1414 ++--- .../xmod/forestry/bees/custom/GTPP_Bees.java | 306 +- .../bees/custom/GTPP_Branch_Definition.java | 128 +- .../xmod/forestry/bees/custom/ItemCustomComb.java | 434 +- .../xmod/forestry/bees/gui/ContainerBeeHouse.java | 34 +- .../xmod/forestry/bees/gui/GuiBeeHouse.java | 55 +- .../xmod/forestry/bees/handler/GTPP_CombType.java | 93 +- .../xmod/forestry/bees/handler/GTPP_DropType.java | 53 +- .../forestry/bees/handler/GTPP_PollenType.java | 89 +- .../forestry/bees/handler/GTPP_PropolisType.java | 43 +- .../bees/inventory/InventoryDenseBeeHouse.java | 146 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 173 +- .../xmod/forestry/bees/items/FR_StringUtil.java | 31 +- .../xmod/forestry/bees/items/MB_FrameType.java | 252 +- .../xmod/forestry/bees/items/MB_ItemFrame.java | 251 +- .../xmod/forestry/bees/items/output/GTPP_Comb.java | 221 +- .../xmod/forestry/bees/items/output/GTPP_Drop.java | 185 +- .../forestry/bees/items/output/GTPP_Pollen.java | 117 +- .../forestry/bees/items/output/GTPP_Propolis.java | 123 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 286 +- .../bees/registry/GTPP_AlleleBeeSpecies.java | 67 +- .../forestry/bees/registry/GTPP_BeeDefinition.java | 498 +- .../forestry/bees/registry/GTPP_Bee_Mutation.java | 39 +- .../xmod/forestry/bees/registry/GTPP_Bees.java | 63 +- .../bees/registry/GTPP_BranchDefinition.java | 10 +- .../bees/tileentities/TileDenseBeeHouse.java | 127 +- .../xmod/galacticraft/HANDLER_GalactiCraft.java | 49 +- .../galacticraft/handler/HandlerTooltip_GC.java | 132 +- .../xmod/galacticraft/util/GalacticUtils.java | 294 +- .../gtPlusPlus/xmod/goodgenerator/GG_Utils.java | 90 +- .../java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 1112 ++-- .../xmod/gregtech/api/energy/IC2ElectricItem.java | 85 +- .../api/energy/IC2ElectricItemManager.java | 140 +- .../xmod/gregtech/api/enums/CustomGtTextures.java | 142 +- .../xmod/gregtech/api/enums/CustomOrePrefix.java | 230 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 2068 ++++---- .../gregtech/api/enums/GregtechOreDictNames.java | 33 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 3476 +++++++++---- .../gregtech/api/enums/GregtechTextureSet.java | 298 +- .../xmod/gregtech/api/enums/GregtechTextures.java | 351 +- .../gregtech/api/enums/GregtechToolDictNames.java | 11 +- .../gregtech/api/gui/CONTAINER_AdvancedBoiler.java | 53 +- .../xmod/gregtech/api/gui/CONTAINER_Cyclotron.java | 49 +- .../xmod/gregtech/api/gui/CONTAINER_DataHatch.java | 38 +- .../gregtech/api/gui/CONTAINER_DeluxeTank.java | 110 +- .../api/gui/CONTAINER_Hatch_Muffler_Advanced.java | 86 +- .../api/gui/CONTAINER_IndustrialCentrifuge.java | 55 +- .../api/gui/CONTAINER_IronBlastFurnace.java | 41 +- .../xmod/gregtech/api/gui/CONTAINER_MatterFab.java | 137 +- .../api/gui/CONTAINER_MetaTileMachineLong.java | 470 +- .../gregtech/api/gui/CONTAINER_MultiMachine.java | 493 +- .../CONTAINER_MultiMachine_NoPlayerInventory.java | 24 +- .../api/gui/CONTAINER_PowerSubStation.java | 139 +- .../xmod/gregtech/api/gui/CONTAINER_SafeBlock.java | 160 +- .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 143 +- .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 167 +- .../gregtech/api/gui/CONTAINER_SuperChest.java | 103 +- .../gregtech/api/gui/CONTAINER_TreeFarmer.java | 109 +- .../xmod/gregtech/api/gui/GUI_AdvancedBoiler.java | 10 +- .../xmod/gregtech/api/gui/GUI_Cyclotron.java | 35 +- .../xmod/gregtech/api/gui/GUI_DataHatch.java | 18 +- .../xmod/gregtech/api/gui/GUI_DeluxeTank.java | 56 +- .../api/gui/GUI_Hatch_Muffler_Advanced.java | 71 +- .../gregtech/api/gui/GUI_IndustrialCentrifuge.java | 121 +- .../gregtech/api/gui/GUI_IronBlastFurnace.java | 58 +- .../xmod/gregtech/api/gui/GUI_MatterFab.java | 143 +- .../xmod/gregtech/api/gui/GUI_MultiMachine.java | 612 ++- .../gregtech/api/gui/GUI_MultiMachine_Default.java | 42 +- .../gregtech/api/gui/GUI_Multi_Basic_Slotted.java | 130 +- .../xmod/gregtech/api/gui/GUI_PowerSubStation.java | 218 +- .../xmod/gregtech/api/gui/GUI_SafeBlock.java | 79 +- .../xmod/gregtech/api/gui/GUI_SolarGenerator.java | 71 +- .../xmod/gregtech/api/gui/GUI_SteamCondenser.java | 84 +- .../xmod/gregtech/api/gui/GUI_SuperChest.java | 55 +- .../xmod/gregtech/api/gui/GUI_TreeFarmer.java | 76 +- .../xmod/gregtech/api/gui/SyncedLong.java | 2 +- .../xmod/gregtech/api/gui/SyncedValueManager.java | 1 - .../GT_Container_ElectricAutoWorkbench.java | 210 +- .../GT_Container_ElectricInventoryManager.java | 509 +- .../GT_GUIContainer_ElectricAutoWorkbench.java | 84 +- .../GT_GUIContainer_ElectricInventoryManager.java | 218 +- .../api/gui/basic/CONTAINER_PollutionCleaner.java | 168 +- .../api/gui/basic/GT_Container_CropHarvestor.java | 326 +- .../gui/basic/GT_GUIContainer_CropHarvestor.java | 118 +- .../api/gui/basic/GUI_PollutionCleaner.java | 115 +- .../gui/computer/GT_Container_ComputerCube.java | 734 ++- .../GT_Container_RedstoneCircuitBlock.java | 293 +- .../gui/computer/GT_GUIContainer_ComputerCube.java | 349 +- .../GT_GUIContainer_RedstoneCircuitBlock.java | 187 +- .../gui/fluidreactor/Container_FluidReactor.java | 318 +- .../api/gui/fluidreactor/GUI_FluidReactor.java | 220 +- .../api/gui/hatches/CONTAINER_1by1_Turbine.java | 67 +- .../gregtech/api/gui/hatches/CONTAINER_2by2.java | 5 +- .../gregtech/api/gui/hatches/CONTAINER_4by4.java | 5 +- .../gui/hatches/CONTAINER_HatchNbtConsumable.java | 198 +- .../gregtech/api/gui/hatches/GUI_1by1_Turbine.java | 10 +- .../xmod/gregtech/api/gui/hatches/GUI_2by2.java | 18 +- .../xmod/gregtech/api/gui/hatches/GUI_4by4.java | 18 +- .../api/gui/hatches/GUI_HatchNbtConsumable.java | 52 +- .../hatches/charge/CONTAINER_Electric_2by2.java | 17 +- .../hatches/charge/CONTAINER_Electric_4by4.java | 14 +- .../api/gui/hatches/charge/GUI_Electric_2by2.java | 22 +- .../api/gui/hatches/charge/GUI_Electric_4by4.java | 23 +- .../api/gui/power/CONTAINER_BasicTank.java | 89 +- .../xmod/gregtech/api/gui/power/GUI_BasicTank.java | 46 +- .../workbench/GT_Container_AdvancedWorkbench.java | 206 +- .../workbench/GT_Container_BronzeWorkbench.java | 202 +- .../GT_GUIContainer_AdvancedWorkbench.java | 123 +- .../workbench/GT_GUIContainer_BronzeWorkbench.java | 9 +- .../api/interfaces/GregtechItemContainer.java | 49 +- .../api/interfaces/IBaseCustomMetaTileEntity.java | 3 +- .../xmod/gregtech/api/interfaces/IHeatEntity.java | 21 +- .../xmod/gregtech/api/interfaces/IHeatSink.java | 13 +- .../api/interfaces/IMetaTileEntityHeatPipe.java | 12 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 861 ++- .../internal/Interface_IconContainer.java | 26 +- .../internal/Interface_ItemBehaviour.java | 79 +- .../internal/Interface_OreRecipeRegistrator.java | 34 +- .../Interface_OreRecipeRegistrator_GT.java | 23 +- .../api/interfaces/internal/Interface_Texture.java | 16 +- .../interfaces/internal/Interface_ToolStats.java | 362 +- .../gregtech/api/items/Gregtech_Generic_Item.java | 347 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 651 +-- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 1399 ++--- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 431 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 1115 ++-- .../gregtech/api/items/tools/GT_MetaGenTool.java | 1124 ++-- .../gregtech/api/items/types/ToolType_Base.java | 184 +- .../api/items/types/ToolType_HardHammer.java | 233 +- .../gregtech/api/items/types/ToolType_Pump.java | 275 +- .../gregtech/api/items/types/ToolType_Wrench.java | 326 +- .../api/metatileentity/BaseCustomTileEntity.java | 382 +- .../custom/power/BaseCustomPower_MTE.java | 552 +- .../power/GTPP_MTE_BasicLosslessGenerator.java | 610 +-- .../custom/power/GTPP_MTE_BasicMachine.java | 350 +- .../custom/power/GTPP_MTE_BasicTank.java | 71 +- .../custom/power/GTPP_MTE_TieredMachineBlock.java | 47 +- .../custom/power/MetaTileEntityCustomPower.java | 142 +- .../GT_MetaTileEntity_BasicBreaker.java | 539 +- ...GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java | 140 +- .../GT_MetaTileEntity_Dehydrator.java | 282 +- .../GT_MetaTileEntity_DeluxeMachine.java | 371 +- .../GT_MetaTileEntity_DeluxeTank.java | 693 +-- .../GT_MetaTileEntity_Hatch_AirIntake.java | 204 +- .../GT_MetaTileEntity_Hatch_AirIntake_Extreme.java | 46 +- .../GT_MetaTileEntity_Hatch_ControlCore.java | 96 +- .../GT_MetaTileEntity_Hatch_DynamoBuffer.java | 131 +- ...etaTileEntity_Hatch_ElementalDataOrbHolder.java | 318 +- .../GT_MetaTileEntity_Hatch_Energy_RTG.java | 547 +- .../GT_MetaTileEntity_Hatch_FluidGenerator.java | 420 +- .../GT_MetaTileEntity_Hatch_InputBattery.java | 366 +- .../GT_MetaTileEntity_Hatch_Muffler_Adv.java | 614 +-- .../GT_MetaTileEntity_Hatch_Naquadah.java | 385 +- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 427 +- .../GT_MetaTileEntity_Hatch_Plasma.java | 395 +- .../GT_MetaTileEntity_Hatch_Reservoir.java | 205 +- .../GT_MetaTileEntity_Hatch_Steam_BusInput.java | 505 +- .../GT_MetaTileEntity_Hatch_Steam_BusOutput.java | 124 +- .../GT_MetaTileEntity_Hatch_Turbine.java | 757 +-- .../GT_MetaTileEntity_Hatch_TurbineProvider.java | 382 +- .../GT_MetaTileEntity_SuperBus_Input.java | 258 +- .../GT_MetaTileEntity_SuperBus_Output.java | 326 +- .../GregtechMetaPipeEntityFluid.java | 250 +- .../GregtechMetaPipeEntity_Cable.java | 422 +- .../GregtechMetaTreeFarmerStructural.java | 99 +- .../implementations/base/CustomMetaTileBase.java | 74 +- .../GT_MetaTileEntity_Hatch_CustomFluidBase.java | 354 +- .../base/GregtechMetaPipeEntityBase_Cable.java | 964 ++-- .../base/GregtechMetaTileEntity.java | 125 +- .../base/GregtechMetaTransformerHiAmp.java | 221 +- .../base/GregtechMeta_MultiBlockBase.java | 5494 ++++++++++---------- .../base/GregtechMeta_SteamMultiBase.java | 1318 ++--- .../GregtechDoubleFuelGeneratorBase.java | 861 +-- .../base/generators/GregtechMetaBoilerBase.java | 713 ++- .../generators/GregtechMetaSolarGenerator.java | 441 +- .../GregtechRocketFuelGeneratorBase.java | 731 +-- .../base/machines/GregtechMetaSafeBlockBase.java | 572 +- .../base/machines/GregtechMetaTreeFarmerBase.java | 355 +- .../GT_MetaTileEntity_Hatch_Catalysts.java | 60 +- .../GT_MetaTileEntity_Hatch_MillingBalls.java | 60 +- .../GT_MetaTileEntity_Hatch_NbtConsumable.java | 559 +- .../api/objects/GTPP_CopiedBlockTexture.java | 3 +- .../gregtech/api/objects/GTPP_RenderedTexture.java | 3 +- .../xmod/gregtech/api/objects/GregtechFluid.java | 37 +- .../gregtech/api/objects/GregtechItemData.java | 281 +- .../api/objects/GregtechMaterialStack.java | 94 +- .../ProcessingSkookumChoocherToolRecipes.java | 30 +- .../xmod/gregtech/api/util/GTPP_Config.java | 25 +- .../api/util/GregtechOreDictUnificator.java | 166 +- .../api/util/SpecialBehaviourTooltipHandler.java | 46 +- .../xmod/gregtech/api/world/GTPP_Worldgen.java | 28 +- .../gregtech/api/world/GTPP_Worldgen_Boulder.java | 74 +- .../api/world/GTPP_Worldgen_GT_Ore_Layer.java | 398 +- .../gregtech/api/world/GTPP_Worldgen_Handler.java | 82 +- .../xmod/gregtech/api/world/GTPP_Worldgen_Ore.java | 20 +- .../api/world/GTPP_Worldgen_Ore_Normal.java | 91 +- .../xmod/gregtech/api/world/GT_OreVein_Object.java | 56 +- .../xmod/gregtech/api/world/WorldGenUtils.java | 38 +- .../xmod/gregtech/common/Meta_GT_Proxy.java | 1176 +++-- .../xmod/gregtech/common/StaticFields59.java | 549 +- .../common/blocks/GTPP_Block_Machines.java | 988 ++-- .../gregtech/common/blocks/GTPP_Item_Machines.java | 457 +- .../common/blocks/GregtechMetaCasingBlocks.java | 114 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 131 +- .../common/blocks/GregtechMetaCasingBlocks3.java | 693 +-- .../common/blocks/GregtechMetaCasingBlocks4.java | 184 +- .../common/blocks/GregtechMetaCasingBlocks5.java | 148 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 260 +- .../GregtechMetaCasingBlocksPipeGearbox.java | 156 +- .../common/blocks/GregtechMetaCasingItems.java | 9 +- .../common/blocks/GregtechMetaItemCasings1.java | 53 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 98 +- .../blocks/GregtechMetaSpecialMachineCasings.java | 117 +- .../blocks/GregtechMetaSpecialMultiCasings.java | 204 +- .../blocks/GregtechMetaSpecialMultiCasings2.java | 167 +- .../blocks/GregtechMetaTieredCasingBlocks1.java | 172 +- .../common/blocks/fluid/GregtechFluidHandler.java | 266 +- .../blocks/textures/CasingTextureHandler.java | 146 +- .../blocks/textures/CasingTextureHandler2.java | 98 +- .../blocks/textures/CasingTextureHandler3.java | 118 +- .../textures/TexturesCentrifugeMultiblock.java | 300 +- .../common/blocks/textures/TexturesGregtech58.java | 947 ++-- .../common/blocks/textures/TexturesGregtech59.java | 957 ++-- .../blocks/textures/TexturesGrinderMultiblock.java | 266 +- .../common/blocks/textures/TexturesGtBlock.java | 1578 +++--- .../blocks/textures/TexturesGtCutomCovers.java | 47 +- .../common/blocks/textures/TexturesGtTools.java | 92 +- .../turbine/LargeTurbineTextureHandler.java | 601 ++- .../common/computer/GT_ComputerCube_Setup.java | 132 +- .../computer/GT_Computercube_Description.java | 702 ++- .../common/computer/GT_Computercube_Simulator.java | 269 +- .../xmod/gregtech/common/covers/CoverManager.java | 198 +- .../common/covers/GTPP_Cover_Overflow.java | 488 +- .../common/covers/GTPP_Cover_Overflow_Item.java | 342 +- .../common/covers/GTPP_Cover_ToggleVisual.java | 349 +- .../gregtech/common/helpers/ChargingHelper.java | 848 +-- .../gregtech/common/helpers/CraftingHelper.java | 58 +- .../common/helpers/FlotationRecipeHandler.java | 97 +- .../gregtech/common/helpers/GT_MethodHelper.java | 122 +- .../common/helpers/MachineUpdateHandler.java | 55 +- .../gregtech/common/helpers/TreeFarmHelper.java | 1935 +++---- .../common/helpers/VolumetricFlaskHelper.java | 305 +- .../helpers/autocrafter/AC_Helper_Container.java | 203 +- .../helpers/autocrafter/AC_Helper_Utils.java | 132 +- .../common/helpers/tesseract/TesseractHelper.java | 476 +- .../common/helpers/treefarm/TreeGenerator.java | 715 ++- .../gregtech/common/items/MetaCustomCoverItem.java | 389 +- .../common/items/MetaGeneratedGregtechItems.java | 1571 ++++-- .../common/items/MetaGeneratedGregtechTools.java | 171 +- .../items/behaviours/Behaviour_Choocher.java | 147 +- .../behaviours/Behaviour_Electric_Lighter.java | 388 +- .../common/items/behaviours/Behaviour_Grinder.java | 174 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 226 +- .../common/items/covers/MetaItemCoverCasings.java | 57 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 996 ++-- .../gregtech/common/render/GTPP_FlaskRenderer.java | 18 +- .../common/render/GTPP_Render_MachineBlock.java | 1401 ++--- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 1586 +++--- ...GT_MetaTileEntity_ElectricInventoryManager.java | 1006 ++-- .../GT_MetaTileEntity_TesseractGenerator.java | 1443 ++--- .../GT_MetaTileEntity_TesseractTerminal.java | 1151 ++-- .../generators/GT_MetaTileEntity_Boiler_Base.java | 553 +- .../generators/GT_MetaTileEntity_Boiler_HV.java | 75 +- .../generators/GT_MetaTileEntity_Boiler_LV.java | 93 +- .../generators/GT_MetaTileEntity_Boiler_MV.java | 93 +- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 384 +- .../generators/GT_MetaTileEntity_RfConvertor.java | 647 +-- .../GT_MetaTileEntity_SemiFluidGenerator.java | 310 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 297 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 300 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 278 +- .../GregtechMetaTileEntitySolarGenerator.java | 369 +- .../generators/GregtechMetaTileEntity_RTG.java | 751 +-- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 33 +- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 37 +- .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 36 +- .../creative/GregtechMetaCreativeEnergyBuffer.java | 424 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 1372 ++--- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 613 ++- .../GregtechMetaAtmosphericReconditioner.java | 1689 +++--- .../machines/basic/GregtechMetaCondensor.java | 294 +- .../basic/GregtechMetaGarbageCollector.java | 702 +-- .../basic/GregtechMetaPollutionCreator.java | 835 +-- .../basic/GregtechMetaPollutionDetector.java | 935 ++-- .../basic/GregtechMetaTileEntityChunkLoader.java | 832 +-- ...GregtechMetaTileEntityThaumcraftResearcher.java | 466 +- .../basic/GregtechMetaTileEntity_AutoChisel.java | 239 +- .../basic/GregtechMetaTileEntity_BasicWasher.java | 104 +- .../GregtechMetaTileEntity_ChemicalReactor.java | 1283 ++--- ...regtechMetaTileEntity_CompactFusionReactor.java | 1382 ++--- .../basic/GregtechMetaTileEntity_PocketFusion.java | 1386 ++--- .../GregtechMetaTileEntity_ReactorColdTrap.java | 93 +- ...egtechMetaTileEntity_ReactorProcessingUnit.java | 104 +- .../basic/GregtechMetaWirelessCharger.java | 1249 +++-- .../machines/multi/misc/GMTE_AmazonPackager.java | 1152 ++-- .../multi/misc/GregtechMTE_TeslaTower.java | 949 ++-- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 737 +-- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 564 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 430 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 818 ++- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 419 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 391 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 728 +-- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 318 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 408 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 388 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 594 +-- ...GregtechMetaTileEntity_IndustrialMacerator.java | 444 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 398 +- ...aTileEntity_IndustrialMolecularTransformer.java | 447 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 997 ++-- ...regtechMetaTileEntity_IndustrialPlatePress.java | 414 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 390 +- .../GregtechMetaTileEntity_IndustrialSinter.java | 24 - ...MetaTileEntity_IndustrialThermalCentrifuge.java | 377 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 484 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 623 +-- .../GregtechMetaTileEntity_IndustrialWireMill.java | 347 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 898 ++-- .../processing/GregtechMetaTileEntity_IsaMill.java | 1296 +++-- .../GregtechMetaTileEntity_SpargeTower.java | 851 +-- .../GregtechMetaTileEntity_Adv_AssemblyLine.java | 1302 ++--- ...egtechMetaTileEntity_Adv_DistillationTower.java | 889 ++-- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 951 ++-- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 199 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 239 +- .../GregtechMetaTileEntity_Adv_Implosion.java | 358 +- .../GregtechMetaTileEntity_SteamCompressor.java | 259 +- .../GregtechMetaTileEntity_SteamMacerator.java | 264 +- .../multi/production/GT4Entity_AutoCrafter.java | 1223 ++--- .../multi/production/GT4Entity_ThermalBoiler.java | 679 +-- .../GregtechMTE_ElementalDuplicator.java | 1376 ++--- .../production/GregtechMTE_FastNeutronReactor.java | 35 +- .../production/GregtechMTE_FrothFlotationCell.java | 852 ++- .../production/GregtechMTE_LargeNaqReactor.java | 111 +- .../production/GregtechMTE_MiniFusionPlant.java | 77 +- .../production/GregtechMTE_NuclearReactor.java | 1046 ++-- .../GregtechMetaTileEntityGeneratorArray.java | 966 ++-- .../production/GregtechMetaTileEntityTreeFarm.java | 1070 ++-- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 609 +-- .../GregtechMetaTileEntity_Cyclotron.java | 847 ++- ...egtechMetaTileEntity_IndustrialFishingPond.java | 1185 +++-- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 996 ++-- .../GregtechMetaTileEntity_LargeRocketEngine.java | 1135 ++-- ...techMetaTileEntity_LargeSemifluidGenerator.java | 651 ++- .../GregtechMetaTileEntity_MassFabricator.java | 1314 ++--- .../GregtechMetaTileEntity_Refinery.java | 453 +- .../GregtechMetaTileEntity_SolarTower.java | 1491 +++--- .../algae/GregtechMTE_AlgaePondBase.java | 953 ++-- ...gtechMetaTileEntity_BedrockMiningPlatform1.java | 5 - ...gtechMetaTileEntity_BedrockMiningPlatform2.java | 5 - ...chMetaTileEntity_BedrockMiningPlatformBase.java | 1255 +++-- .../chemplant/GregtechMTE_ChemicalPlant.java | 1936 +++---- .../turbines/GT_MTE_LargeTurbine_Gas.java | 95 +- .../turbines/GT_MTE_LargeTurbine_Plasma.java | 298 +- .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 150 +- .../turbines/GT_MTE_LargeTurbine_Steam.java | 151 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 1620 +++--- .../storage/GregtechMetaTileEntity_MultiTank.java | 1025 ++-- ...chMetaTileEntity_PowerSubStationController.java | 1521 +++--- .../misc/GT_TileEntity_ComputerCube.java | 1812 +++---- .../tileentities/misc/TileEntitySolarHeater.java | 674 +-- .../redstone/GT_MetaTileEntity_RedstoneBase.java | 230 +- .../GT_MetaTileEntity_RedstoneButtonPanel.java | 436 +- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 954 ++-- .../redstone/GT_MetaTileEntity_RedstoneLamp.java | 115 +- .../GT_MetaTileEntity_RedstoneStrengthDisplay.java | 288 +- .../GT_MetaTileEntity_RedstoneStrengthScale.java | 83 +- .../GT_MetaTileEntity_AdvancedCraftingTable.java | 1069 ++-- .../GT_MetaTileEntity_BronzeCraftingTable.java | 127 +- .../GT_MetaTileEntity_ConnectableCrate.java | 1101 ++-- .../storage/GT_MetaTileEntity_TieredChest.java | 393 +- .../storage/GT_MetaTileEntity_TieredTank.java | 310 +- .../storage/GregtechMetaEnergyBuffer.java | 897 ++-- .../storage/GregtechMetaSafeBlock.java | 107 +- .../GT_MetaTileEntity_InfiniteItemHolder.java | 180 +- .../storage/shelving/GT4Entity_Shelf.java | 693 +-- .../shelving/GT4Entity_Shelf_Compartment.java | 49 +- .../storage/shelving/GT4Entity_Shelf_Desk.java | 68 +- .../shelving/GT4Entity_Shelf_FileCabinet.java | 87 +- .../storage/shelving/GT4Entity_Shelf_Iron.java | 65 +- .../storage/shelving/GT4Entity_Shelf_Large.java | 500 +- .../common/tools/TOOL_Gregtech_AngleGrinder.java | 351 +- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 340 +- .../common/tools/TOOL_Gregtech_Choocher.java | 397 +- .../tools/TOOL_Gregtech_ElectricButcherKnife.java | 330 +- .../tools/TOOL_Gregtech_ElectricLighter.java | 282 +- .../common/tools/TOOL_Gregtech_ElectricSnips.java | 125 +- .../xmod/gregtech/loaders/GT_Material_Loader.java | 541 +- .../xmod/gregtech/loaders/Gregtech_Blocks.java | 27 +- .../gregtech/loaders/ProcessingAngleGrinder.java | 221 +- .../loaders/ProcessingElectricButcherKnife.java | 215 +- .../loaders/ProcessingElectricLighter.java | 209 +- .../gregtech/loaders/ProcessingElectricSnips.java | 206 +- .../loaders/ProcessingToolHeadChoocher.java | 174 +- .../loaders/Processing_Textures_Items.java | 6 +- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 104 +- .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 119 +- .../xmod/gregtech/loaders/RecipeGen_Base.java | 15 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 490 +- .../loaders/RecipeGen_BlastSmelterGT_Ex.java | 351 +- .../loaders/RecipeGen_BlastSmelterGT_GTNH.java | 463 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 841 ++- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 311 +- .../gregtech/loaders/RecipeGen_FluidCanning.java | 453 +- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 464 +- .../xmod/gregtech/loaders/RecipeGen_Fluorite.java | 424 +- .../loaders/RecipeGen_MaterialProcessing.java | 498 +- .../gregtech/loaders/RecipeGen_MetalRecipe.java | 139 +- .../RecipeGen_MultisUsingFluidInsteadOfCells.java | 342 +- .../xmod/gregtech/loaders/RecipeGen_Ore.java | 1188 +++-- .../xmod/gregtech/loaders/RecipeGen_Plasma.java | 71 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 307 +- .../xmod/gregtech/loaders/RecipeGen_Recycling.java | 744 +-- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 588 ++- .../loaders/misc/AddCustomMachineToPA.java | 13 +- .../gregtech/loaders/misc/AssLineAchievements.java | 315 +- .../loaders/recipe/RecipeLoader_AlgaeFarm.java | 367 +- .../gregtech/loaders/recipe/RecipeLoader_GTNH.java | 38 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 285 +- .../gregtech/loaders/recipe/RecipeLoader_LFTR.java | 275 +- .../recipe/RecipeLoader_MolecularTransformer.java | 95 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 1311 +++-- .../recipe/RecipeLoader_NuclearFuelProcessing.java | 689 ++- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 3992 +++++++------- .../xmod/gregtech/recipes/RecipesToRemove.java | 81 +- .../machines/RECIPEHANDLER_AssemblyLine.java | 21 +- .../recipes/machines/RECIPEHANDLER_CokeOven.java | 117 +- .../recipes/machines/RECIPEHANDLER_Dehydrator.java | 167 +- .../machines/RECIPEHANDLER_MatterFabricator.java | 105 +- .../registration/gregtech/Gregtech4Content.java | 281 +- .../gregtech/GregtechAdvancedBoilers.java | 251 +- .../gregtech/GregtechAdvancedMixer.java | 358 +- .../gregtech/GregtechAlgaeContent.java | 80 +- .../gregtech/GregtechAmazonWarehouse.java | 25 +- .../gregtech/GregtechBedrockPlatforms.java | 3 - .../gregtech/GregtechBufferDynamos.java | 187 +- .../gregtech/GregtechComponentAssembler.java | 1249 +++-- .../registration/gregtech/GregtechConduits.java | 1826 ++++--- .../gregtech/GregtechCustomHatches.java | 423 +- .../registration/gregtech/GregtechCyclotron.java | 23 +- .../registration/gregtech/GregtechDehydrator.java | 428 +- .../gregtech/GregtechEnergyBuffer.java | 315 +- .../GregtechFactoryGradeReplacementMultis.java | 44 +- .../gregtech/GregtechFluidReactor.java | 37 +- .../gregtech/GregtechGeneratorsULV.java | 82 +- .../GregtechGeothermalThermalGenerator.java | 138 +- .../gregtech/GregtechHiAmpTransformer.java | 488 +- .../gregtech/GregtechIndustrialAlloySmelter.java | 25 +- .../gregtech/GregtechIndustrialArcFurnace.java | 26 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 31 +- .../gregtech/GregtechIndustrialCentrifuge.java | 29 +- .../gregtech/GregtechIndustrialChisel.java | 29 +- .../gregtech/GregtechIndustrialCokeOven.java | 31 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 30 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 31 +- .../GregtechIndustrialElementDuplicator.java | 19 +- .../gregtech/GregtechIndustrialExtruder.java | 31 +- .../gregtech/GregtechIndustrialFishPond.java | 29 +- .../gregtech/GregtechIndustrialFluidHeater.java | 25 +- .../gregtech/GregtechIndustrialForgeHammer.java | 25 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 29 +- .../gregtech/GregtechIndustrialGeneratorArray.java | 30 +- .../gregtech/GregtechIndustrialMacerator.java | 31 +- .../gregtech/GregtechIndustrialMassFabricator.java | 248 +- .../gregtech/GregtechIndustrialMixer.java | 30 +- .../gregtech/GregtechIndustrialMultiMachine.java | 29 +- .../gregtech/GregtechIndustrialMultiTank.java | 4 - .../gregtech/GregtechIndustrialPlatePress.java | 31 +- .../gregtech/GregtechIndustrialRockBreaker.java | 10 +- .../gregtech/GregtechIndustrialSifter.java | 29 +- .../GregtechIndustrialThermalCentrifuge.java | 29 +- .../gregtech/GregtechIndustrialTreeFarm.java | 30 +- .../gregtech/GregtechIndustrialWashPlant.java | 29 +- .../gregtech/GregtechIndustrialWiremill.java | 30 +- .../gregtech/GregtechIronBlastFurnace.java | 26 +- .../registration/gregtech/GregtechIsaMill.java | 23 +- .../registration/gregtech/GregtechLFTR.java | 54 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 40 +- .../gregtech/GregtechMiniRaFusion.java | 18 +- .../gregtech/GregtechMolecularTransformer.java | 25 +- .../registration/gregtech/GregtechNaqReactor.java | 3 - .../gregtech/GregtechNitroDieselFix.java | 392 +- .../gregtech/GregtechPollutionDevices.java | 96 +- .../gregtech/GregtechPowerBreakers.java | 74 +- .../gregtech/GregtechPowerSubStation.java | 68 +- .../registration/gregtech/GregtechRTG.java | 23 +- .../gregtech/GregtechRocketFuelGenerator.java | 309 +- .../registration/gregtech/GregtechSafeBlock.java | 325 +- .../gregtech/GregtechSemiFluidgenerators.java | 25 +- .../gregtech/GregtechSimpleWasher.java | 185 +- .../gregtech/GregtechSolarGenerators.java | 76 +- .../registration/gregtech/GregtechSolarTower.java | 63 +- .../gregtech/GregtechSteamCondenser.java | 28 +- .../registration/gregtech/GregtechSteamMultis.java | 28 +- .../registration/gregtech/GregtechSuperChests.java | 170 +- .../gregtech/GregtechSuperConductionPoint.java | 23 +- .../registration/gregtech/GregtechTeslaTower.java | 11 +- .../gregtech/GregtechThaumcraftDevices.java | 29 +- .../gregtech/GregtechThreadedBuffers.java | 343 +- .../gregtech/GregtechTieredChunkloaders.java | 36 +- .../gregtech/GregtechTieredFluidTanks.java | 93 +- .../gregtech/GregtechTreeFarmerTE.java | 24 +- .../gregtech/GregtechWirelessChargers.java | 115 +- .../gregtech/NewHorizonsAccelerator.java | 295 +- .../gtPlusPlus/xmod/growthcraft/HANDLER_GC.java | 29 +- .../xmod/growthcraft/fishtrap/FishTrapHandler.java | 430 +- .../xmod/growthcraft/fishtrap/Growthcraft_New.java | 145 +- .../xmod/growthcraft/fishtrap/Growthcraft_Old.java | 145 +- .../gtPlusPlus/xmod/ic2/CustomInternalName.java | 26 +- src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java | 33 +- .../xmod/ic2/block/RTGGenerator/BlockRTG.java | 372 +- .../xmod/ic2/block/RTGGenerator/TileEntityRTG.java | 117 +- .../ic2/block/RTGGenerator/gui/CONTAINER_RTG.java | 48 +- .../xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java | 85 +- .../kieticgenerator/IC2_BlockKineticGenerator.java | 115 +- .../ic2/block/kieticgenerator/IC2_TEComponent.java | 48 +- .../container/ContainerKineticWindgenerator.java | 33 +- .../container/IC2_ContainerBase.java | 4 +- .../gui/GuiKineticWindGenerator.java | 135 +- .../tileentity/TileEntityKineticWindGenerator.java | 703 ++- .../xmod/ic2/item/CustomKineticRotor.java | 482 +- .../gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java | 57 +- .../xmod/ic2/item/IC2_ItemGradualInteger.java | 85 +- .../java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 153 +- .../java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 107 +- .../gtPlusPlus/xmod/ic2/item/ItemGenerators.java | 85 +- .../java/gtPlusPlus/xmod/ic2/item/RotorBase.java | 177 +- .../gtPlusPlus/xmod/ic2/item/RotorIridium.java | 224 +- .../xmod/ic2/item/reactor/IC2_FuelRod_Base.java | 85 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 803 +-- .../gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java | 625 ++- .../java/gtPlusPlus/xmod/ob/GliderHandler.java | 202 +- .../gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java | 41 +- .../java/gtPlusPlus/xmod/ob/SprinklerHandler.java | 89 +- .../xmod/railcraft/HANDLER_Railcraft.java | 240 +- .../xmod/railcraft/utils/RailcraftUtils.java | 20 +- .../xmod/reliquary/HANDLER_Reliquary.java | 31 +- .../xmod/reliquary/item/ReliquaryItems.java | 285 +- .../xmod/reliquary/util/AlkahestRecipeWrapper.java | 77 +- .../reliquary/util/ReliquaryRecipeHandler.java | 90 +- src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java | 18 +- .../xmod/sc2/modules/ModuleExoticSeeds.java | 196 +- .../gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java | 92 +- .../xmod/thaumcraft/HANDLER_Thaumcraft.java | 93 +- .../xmod/thaumcraft/aspect/GTPP_AspectCompat.java | 335 +- .../xmod/thaumcraft/aspect/GTPP_AspectStack.java | 13 +- .../thaumcraft/commands/CommandDumpAspects.java | 135 +- .../thaumcraft/objects/ThreadAspectScanner.java | 268 +- .../wrapper/aspect/TC_AspectList_Wrapper.java | 56 +- .../objects/wrapper/aspect/TC_Aspect_Wrapper.java | 602 ++- .../wrapper/recipe/Base_Recipe_Wrapper.java | 4 +- .../wrapper/recipe/TC_CrucibleRecipe_Wrapper.java | 21 +- .../wrapper/recipe/TC_IArcaneRecipe_Wrapper.java | 21 +- .../TC_InfusionEnchantmentRecipe_Wrapper.java | 21 +- .../wrapper/recipe/TC_InfusionRecipe_Wrapper.java | 21 +- .../wrapper/research/TC_PageType_Wrapper.java | 23 +- .../research/TC_ResearchCategories_Wrapper.java | 155 +- .../research/TC_ResearchCategoryList_Wrapper.java | 23 +- .../wrapper/research/TC_ResearchItem_Wrapper.java | 472 +- .../research/TC_ResearchNoteData_Wrapper.java | 17 +- .../wrapper/research/TC_ResearchPage_Wrapper.java | 426 +- .../xmod/thaumcraft/util/ThaumcraftUtils.java | 905 ++-- .../xmod/thermalfoundation/HANDLER_TF.java | 60 +- .../block/TF_Block_Fluid_Cryotheum.java | 343 +- .../block/TF_Block_Fluid_Ender.java | 100 +- .../block/TF_Block_Fluid_Pyrotheum.java | 376 +- .../xmod/thermalfoundation/block/TF_Blocks.java | 34 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 130 +- .../xmod/thermalfoundation/item/TF_Items.java | 141 +- .../recipe/TF_Gregtech_Recipes.java | 158 +- .../gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java | 159 +- .../xmod/tinkers/material/BaseTinkersMaterial.java | 473 +- .../xmod/tinkers/util/TinkersDryingRecipe.java | 199 +- .../gtPlusPlus/xmod/tinkers/util/TinkersUtils.java | 1089 ++-- .../java/gtPlusPlus/xmod/witchery/WitchUtils.java | 159 +- 607 files changed, 109887 insertions(+), 97039 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod') diff --git a/src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java b/src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java index 38f0d5a89b..72c6025323 100644 --- a/src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java +++ b/src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java @@ -7,10 +7,9 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils; public class HANDLER_AdvSolar { - public static void postInit() { - if (LoadedMods.AdvancedSolarPanel) { - RecipeUtils.removeRecipeByOutput(ItemUtils.getSimpleStack(AdvancedSolarPanel.blockMolecularTransformer)); - } - } - + public static void postInit() { + if (LoadedMods.AdvancedSolarPanel) { + RecipeUtils.removeRecipeByOutput(ItemUtils.getSimpleStack(AdvancedSolarPanel.blockMolecularTransformer)); + } + } } diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java b/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java index ce7d919431..9207749655 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java @@ -6,16 +6,16 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; public class HANDLER_CropsPlusPlus { - public static void preInit(FMLPreInitializationEvent preinit) { - LoaderOfTheCrops.load(preinit); - } - - public static void init(FMLInitializationEvent init) { - //registerItems(); - } + public static void preInit(FMLPreInitializationEvent preinit) { + LoaderOfTheCrops.load(preinit); + } - public static void postInit(FMLPostInitializationEvent postinit) { - LoaderOfTheCrops.register(); - LoaderOfTheCrops.registerBaseSeed(); - } + public static void init(FMLInitializationEvent init) { + // registerItems(); + } + + public static void postInit(FMLPostInitializationEvent postinit) { + LoaderOfTheCrops.register(); + LoaderOfTheCrops.registerBaseSeed(); + } } diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java index 033aaac663..7114aa3db4 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java @@ -1,14 +1,13 @@ package gtPlusPlus.xmod.bartcrops; -import java.util.ArrayList; -import java.util.List; - import cpw.mods.fml.common.event.FMLPreInitializationEvent; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.bartcrops.crops.Crop_Force; import gtPlusPlus.xmod.bartcrops.crops.Crop_Hemp; import ic2.api.crops.CropCard; import ic2.api.crops.Crops; +import java.util.ArrayList; +import java.util.List; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,96 +15,95 @@ import net.minecraft.item.ItemStack; * Mostly borrowed from the Crops++ Crop Loader. * @author Alkalus */ - public class LoaderOfTheCrops { - - private static List mHasCropObj = new ArrayList(); - private CropCard mCropObj; - private ItemStack mBaseSeed; - private static List mCropList = cropLoader(); - - public LoaderOfTheCrops(CropCard cropObj) { - this.mCropObj = cropObj; - } - - public LoaderOfTheCrops(CropCard cropObj, ItemStack baseseed) { - this.mCropObj = cropObj; - this.mBaseSeed = baseseed; - } - - public static CropCard cropUnpackerCC(LoaderOfTheCrops inp) { - return inp.mCropObj; - } - - private static ItemStack cropUnpackerCG(LoaderOfTheCrops inp) { - return inp.mBaseSeed; - } - - private static LoaderOfTheCrops cropHelper(CropCard cropObj) { - return new LoaderOfTheCrops(cropObj, ItemUtils.getItemStackOfAmountFromOreDict("crop" + cropObj.name(), 0)); - } - - public static final List cropLoader() { - List p = new ArrayList(); - - p.add(new LoaderOfTheCrops(new Crop_Hemp(), new ItemStack(Item.getItemById(111), 3))); - p.add(new LoaderOfTheCrops(new Crop_Force(), new ItemStack(Item.getItemById(111), 3))); - - return p; - } - - private static final List cropObjs() { - List p = new ArrayList(); - - for (int i = 0; i < mCropList.size(); ++i) { - p.add(cropUnpackerCC((LoaderOfTheCrops) mCropList.get(i))); - } - - return p; - } - - private static final List setBaseSeed() { - List p = new ArrayList(); - - for (int i = 0; i < mCropList.size(); ++i) { - p.add(cropUnpackerCG((LoaderOfTheCrops) mCropList.get(i))); - } - - return p; - } - - private static final List setnames() { - List s = new ArrayList(); - - for (int i = 0; i < mCropList.size(); ++i) { - s.add(((CropCard) cropObjs().get(i)).name()); - } - - return s; - } - - public static void load(FMLPreInitializationEvent preinit) { - for (int i = 0; i < mCropList.size(); ++i) { - mHasCropObj.add(true); - } - } - - public static void register() { - for (int i = 0; i < mCropList.size(); ++i) { - if ((Boolean) mHasCropObj.get(i) && cropObjs().get(i) != null) { - Crops.instance.registerCrop((CropCard) cropObjs().get(i)); - } - } - } - - public static void registerBaseSeed() { - List baseseed = new ArrayList(setBaseSeed()); - - for (int i = 0; i < mCropList.size(); ++i) { - if (baseseed.get(i) != null && cropObjs().get(i) != null) { - Crops.instance.registerBaseSeed((ItemStack) baseseed.get(i), (CropCard) cropObjs().get(i), 1, 1, 1, 1); - } - } - - } -} \ No newline at end of file + + private static List mHasCropObj = new ArrayList(); + private CropCard mCropObj; + private ItemStack mBaseSeed; + private static List mCropList = cropLoader(); + + public LoaderOfTheCrops(CropCard cropObj) { + this.mCropObj = cropObj; + } + + public LoaderOfTheCrops(CropCard cropObj, ItemStack baseseed) { + this.mCropObj = cropObj; + this.mBaseSeed = baseseed; + } + + public static CropCard cropUnpackerCC(LoaderOfTheCrops inp) { + return inp.mCropObj; + } + + private static ItemStack cropUnpackerCG(LoaderOfTheCrops inp) { + return inp.mBaseSeed; + } + + private static LoaderOfTheCrops cropHelper(CropCard cropObj) { + return new LoaderOfTheCrops(cropObj, ItemUtils.getItemStackOfAmountFromOreDict("crop" + cropObj.name(), 0)); + } + + public static final List cropLoader() { + List p = new ArrayList(); + + p.add(new LoaderOfTheCrops(new Crop_Hemp(), new ItemStack(Item.getItemById(111), 3))); + p.add(new LoaderOfTheCrops(new Crop_Force(), new ItemStack(Item.getItemById(111), 3))); + + return p; + } + + private static final List cropObjs() { + List p = new ArrayList(); + + for (int i = 0; i < mCropList.size(); ++i) { + p.add(cropUnpackerCC((LoaderOfTheCrops) mCropList.get(i))); + } + + return p; + } + + private static final List setBaseSeed() { + List p = new ArrayList(); + + for (int i = 0; i < mCropList.size(); ++i) { + p.add(cropUnpackerCG((LoaderOfTheCrops) mCropList.get(i))); + } + + return p; + } + + private static final List setnames() { + List s = new ArrayList(); + + for (int i = 0; i < mCropList.size(); ++i) { + s.add(((CropCard) cropObjs().get(i)).name()); + } + + return s; + } + + public static void load(FMLPreInitializationEvent preinit) { + for (int i = 0; i < mCropList.size(); ++i) { + mHasCropObj.add(true); + } + } + + public static void register() { + for (int i = 0; i < mCropList.size(); ++i) { + if ((Boolean) mHasCropObj.get(i) && cropObjs().get(i) != null) { + Crops.instance.registerCrop((CropCard) cropObjs().get(i)); + } + } + } + + public static void registerBaseSeed() { + List baseseed = new ArrayList(setBaseSeed()); + + for (int i = 0; i < mCropList.size(); ++i) { + if (baseseed.get(i) != null && cropObjs().get(i) != null) { + Crops.instance.registerBaseSeed( + (ItemStack) baseseed.get(i), (CropCard) cropObjs().get(i), 1, 1, 1, 1); + } + } + } +} diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java index f62b429acb..41631eaae8 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java @@ -4,34 +4,33 @@ import gtPlusPlus.preloader.CORE_Preloader; import ic2.api.crops.ICropTile; public abstract class BaseAestheticCrop extends BaseHarvestableCrop { - - public int tier() { - return 1; - } - public int stat(int n) { - switch (n) { - case 0 : - return 0; - case 1 : - return 0; - case 2 : - return 0; - case 3 : - return 4; - case 4 : - return 0; - default : - return 0; - } - } + public int tier() { + return 1; + } - public int growthDuration(ICropTile crop) { - return CORE_Preloader.DEBUG_MODE ? 1 : 225; - } + public int stat(int n) { + switch (n) { + case 0: + return 0; + case 1: + return 0; + case 2: + return 0; + case 3: + return 4; + case 4: + return 0; + default: + return 0; + } + } - public byte getSizeAfterHarvest(ICropTile crop) { - return 1; - } - -} \ No newline at end of file + public int growthDuration(ICropTile crop) { + return CORE_Preloader.DEBUG_MODE ? 1 : 225; + } + + public byte getSizeAfterHarvest(ICropTile crop) { + return 1; + } +} diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java index 271e3ad7eb..32c9dbf0f6 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java @@ -15,43 +15,42 @@ import net.minecraft.util.IIcon; import speiger.src.crops.api.ICropCardInfo; public abstract class BaseCrop extends CropCard implements ICropCardInfo { - - @SideOnly(Side.CLIENT) - public void registerSprites(IIconRegister iconRegister) { - this.textures = new IIcon[this.maxSize()]; - for (int i = 1; i <= this.textures.length; ++i) { - this.textures[i - 1] = iconRegister.registerIcon(CORE.MODID+":crop/blockCrop." + this.name() + "." + i); - } - - } - - public float dropGainChance() { - return (float) (Math.pow(0.95D, (double) ((float) this.tier())) * (double) 1f); - } - - public boolean canCross(ICropTile crop) { - return crop.getSize() == this.maxSize(); - } - - public int getrootslength(ICropTile crop) { - return 3; - } - - public String discoveredBy() { - return "Alkalus"; - } - - public String owner() { - return "Gtplusplus"; - } - - public List getCropInformation() { - List ret = new ArrayList(); - ret.add(Arrays.toString(this.attributes())); - return ret; - } - - public ItemStack getDisplayItem(CropCard card) { - return ItemUtils.getItemStackOfAmountFromOreDict("crop" + this.name(), 0); - } -} \ No newline at end of file + + @SideOnly(Side.CLIENT) + public void registerSprites(IIconRegister iconRegister) { + this.textures = new IIcon[this.maxSize()]; + for (int i = 1; i <= this.textures.length; ++i) { + this.textures[i - 1] = iconRegister.registerIcon(CORE.MODID + ":crop/blockCrop." + this.name() + "." + i); + } + } + + public float dropGainChance() { + return (float) (Math.pow(0.95D, (double) ((float) this.tier())) * (double) 1f); + } + + public boolean canCross(ICropTile crop) { + return crop.getSize() == this.maxSize(); + } + + public int getrootslength(ICropTile crop) { + return 3; + } + + public String discoveredBy() { + return "Alkalus"; + } + + public String owner() { + return "Gtplusplus"; + } + + public List getCropInformation() { + List ret = new ArrayList(); + ret.add(Arrays.toString(this.attributes())); + return ret; + } + + public ItemStack getDisplayItem(CropCard card) { + return ItemUtils.getItemStackOfAmountFromOreDict("crop" + this.name(), 0); + } +} diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java index e877233c67..3d56bba979 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java @@ -4,66 +4,66 @@ import gtPlusPlus.preloader.CORE_Preloader; import ic2.api.crops.ICropTile; public abstract class BaseHarvestableCrop extends BaseCrop { - - public int tier() { - return 2; - } - public int stat(int n) { - switch (n) { - case 0 : - return 0; - case 1 : - return 4; - case 2 : - return 0; - case 3 : - return 4; - case 4 : - return 0; - default : - return 0; - } - } + public int tier() { + return 2; + } - public boolean canGrow(ICropTile crop) { - return crop.getSize() < 3; - } + public int stat(int n) { + switch (n) { + case 0: + return 0; + case 1: + return 4; + case 2: + return 0; + case 3: + return 4; + case 4: + return 0; + default: + return 0; + } + } - public int getOptimalHavestSize(ICropTile crop) { - return 3; - } + public boolean canGrow(ICropTile crop) { + return crop.getSize() < 3; + } - public boolean canBeHarvested(ICropTile crop) { - return crop.getSize() == 3; - } + public int getOptimalHavestSize(ICropTile crop) { + return 3; + } - public int weightInfluences(ICropTile crop, float humidity, float nutrients, float air) { - return (int) ((double) humidity * 1.2D + (double) nutrients * 0.9D + (double) air * 0.9D); - } + public boolean canBeHarvested(ICropTile crop) { + return crop.getSize() == 3; + } - public int growthDuration(ICropTile crop) { - short r; - if (CORE_Preloader.DEBUG_MODE) { - r = 1; - } else if (crop.getSize() == 2) { - r = 200; - } else { - r = 700; - } + public int weightInfluences(ICropTile crop, float humidity, float nutrients, float air) { + return (int) ((double) humidity * 1.2D + (double) nutrients * 0.9D + (double) air * 0.9D); + } - return r; - } + public int growthDuration(ICropTile crop) { + short r; + if (CORE_Preloader.DEBUG_MODE) { + r = 1; + } else if (crop.getSize() == 2) { + r = 200; + } else { + r = 700; + } - public byte getSizeAfterHarvest(ICropTile crop) { - return 2; - } + return r; + } - public int maxSize() { - return 3; - } + public byte getSizeAfterHarvest(ICropTile crop) { + return 2; + } - public String discoveredBy() { - return "Alkalus"; - } -} \ No newline at end of file + public int maxSize() { + return 3; + } + + public String discoveredBy() { + return "Alkalus"; + } +} diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java index 06238a4589..926bc33776 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java @@ -8,46 +8,46 @@ import ic2.api.crops.ICropTile; import net.minecraft.item.ItemStack; public class Crop_Force extends BaseAestheticCrop { - - public int tier() { - return 4; - } - - public String name() { - return "Force"; - } - - public String discoveredBy() { - return "Alkalus"; - } - - public int growthDuration(ICropTile crop) { - int ret = 800; - - /*if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) { - ret = 225; - }*/ - - if (CORE_Preloader.DEBUG_MODE) { - ret = 1; - } - - return ret; - } - - public String[] attributes() { - return new String[]{"Power", "Soil", "Yellow", "Gold"}; - } - - public ItemStack getGain(ICropTile crop) { - ItemStack ret = this.getDisplayItem(); - if (MathUtils.randInt(0, 10) > 8) { - ret = STANDALONE.FORCE.getNugget(MathUtils.randInt(4, 8)); - } - return ret; - } - - public ItemStack getDisplayItem() { - return STANDALONE.FORCE.getNugget(0); - } -} \ No newline at end of file + + public int tier() { + return 4; + } + + public String name() { + return "Force"; + } + + public String discoveredBy() { + return "Alkalus"; + } + + public int growthDuration(ICropTile crop) { + int ret = 800; + + /*if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) { + ret = 225; + }*/ + + if (CORE_Preloader.DEBUG_MODE) { + ret = 1; + } + + return ret; + } + + public String[] attributes() { + return new String[] {"Power", "Soil", "Yellow", "Gold"}; + } + + public ItemStack getGain(ICropTile crop) { + ItemStack ret = this.getDisplayItem(); + if (MathUtils.randInt(0, 10) > 8) { + ret = STANDALONE.FORCE.getNugget(MathUtils.randInt(4, 8)); + } + return ret; + } + + public ItemStack getDisplayItem() { + return STANDALONE.FORCE.getNugget(0); + } +} diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java index 95e2766aae..c7cd1c0bea 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java @@ -9,48 +9,48 @@ import ic2.api.crops.ICropTile; import net.minecraft.item.ItemStack; public class Crop_Hemp extends BaseAestheticCrop { - - public int tier() { - return 2; - } - - public String name() { - return "Hemp"; - } - - public String discoveredBy() { - return "Alkalus"; - } - - public int growthDuration(ICropTile crop) { - int ret = 550; - - /*if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) { - ret = 225; - }*/ - - if (CORE_Preloader.DEBUG_MODE) { - ret = 1; - } - - return ret; - } - - public String[] attributes() { - return new String[]{"Green", "Soil", "Orange"}; - } - - public ItemStack getGain(ICropTile crop) { - - ItemStack ret = this.getDisplayItem(); - if (MathUtils.randInt(0, 10) > 8) { - ret = ItemUtils.getSimpleStack(ModItems.itemRope, MathUtils.randInt(1, 3)); - } - - return ret; - } - - public ItemStack getDisplayItem() { - return ItemUtils.getSimpleStack(ModItems.itemRope, 0); - } -} \ No newline at end of file + + public int tier() { + return 2; + } + + public String name() { + return "Hemp"; + } + + public String discoveredBy() { + return "Alkalus"; + } + + public int growthDuration(ICropTile crop) { + int ret = 550; + + /*if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) { + ret = 225; + }*/ + + if (CORE_Preloader.DEBUG_MODE) { + ret = 1; + } + + return ret; + } + + public String[] attributes() { + return new String[] {"Green", "Soil", "Orange"}; + } + + public ItemStack getGain(ICropTile crop) { + + ItemStack ret = this.getDisplayItem(); + if (MathUtils.randInt(0, 10) > 8) { + ret = ItemUtils.getSimpleStack(ModItems.itemRope, MathUtils.randInt(1, 3)); + } + + return ret; + } + + public ItemStack getDisplayItem() { + return ItemUtils.getSimpleStack(ModItems.itemRope, 0); + } +} diff --git a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java index babd607aab..dba2976758 100644 --- a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java +++ b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java @@ -1,80 +1,85 @@ package gtPlusPlus.xmod.bartworks; +import gregtech.api.enums.OrePrefixes; +import gtPlusPlus.core.lib.LoadedMods; +import gtPlusPlus.core.util.reflect.ReflectionUtils; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Map; - -import gregtech.api.enums.OrePrefixes; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import net.minecraft.item.ItemStack; public class BW_Utils { - private final static Method sName; - private final static Method sGet; - private static final Class sClassBW_NonMeta_MaterialItems; - private static final Class Werkstoff; - private static final Class WerkstoffLoader; - private static final Map werkstoffHashMap; - private static final Method getCorrespondingItemStackUnsafe; - - static { - sName = ReflectionUtils.getMethod(Enum.class, "name"); - sClassBW_NonMeta_MaterialItems = ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems"); - sGet = ReflectionUtils.getMethod(sClassBW_NonMeta_MaterialItems, "get", long.class, Object[].class); - Werkstoff = ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.Werkstoff"); - WerkstoffLoader = ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader"); - Field fieldWerkstoffHashMap = ReflectionUtils.getField(Werkstoff, "werkstoffHashMap"); - werkstoffHashMap = ReflectionUtils.getFieldValue(fieldWerkstoffHashMap); - getCorrespondingItemStackUnsafe = ReflectionUtils.getMethod(WerkstoffLoader, "getCorrespondingItemStackUnsafe", OrePrefixes.class, Werkstoff, int.class); - } - - public enum NonMeta_MaterialItem { - Depleted_Tiberium_1, - Depleted_Tiberium_2, - Depleted_Tiberium_4, - TiberiumCell_1, - TiberiumCell_2, - TiberiumCell_4, - TheCoreCell, - Depleted_TheCoreCell; - } - - public static ItemStack getBW_NonMeta_MaterialItems(NonMeta_MaterialItem aItem, long aAmount) { - if (sClassBW_NonMeta_MaterialItems != null && sClassBW_NonMeta_MaterialItems.isEnum()) { - for (Object obj : sClassBW_NonMeta_MaterialItems.getEnumConstants()) { - try { - if (aItem.name().equals(ReflectionUtils.invokeNonBool(obj, sName, new Object[] {}))) { - return ((ItemStack) ReflectionUtils.invokeNonBool(obj, sGet, new Object[] {aAmount, new Object[] {}})).copy(); - } - } catch (Throwable t) { - t.printStackTrace(); - } - } - } - return null; - } - - public static ArrayList getAll(int aStackSize){ - ArrayList aItems = new ArrayList(); - aItems.add(getBW_NonMeta_MaterialItems(NonMeta_MaterialItem.TiberiumCell_1, aStackSize)); - aItems.add(getBW_NonMeta_MaterialItems(NonMeta_MaterialItem.TiberiumCell_2, aStackSize)); - aItems.add(getBW_NonMeta_MaterialItems(NonMeta_MaterialItem.TiberiumCell_4, aStackSize)); - aItems.add(getBW_NonMeta_MaterialItems(NonMeta_MaterialItem.TheCoreCell, aStackSize)); - return aItems; - } + private static final Method sName; + private static final Method sGet; + private static final Class sClassBW_NonMeta_MaterialItems; + private static final Class Werkstoff; + private static final Class WerkstoffLoader; + private static final Map werkstoffHashMap; + private static final Method getCorrespondingItemStackUnsafe; + + static { + sName = ReflectionUtils.getMethod(Enum.class, "name"); + sClassBW_NonMeta_MaterialItems = + ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems"); + sGet = ReflectionUtils.getMethod(sClassBW_NonMeta_MaterialItems, "get", long.class, Object[].class); + Werkstoff = ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.Werkstoff"); + WerkstoffLoader = + ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader"); + Field fieldWerkstoffHashMap = ReflectionUtils.getField(Werkstoff, "werkstoffHashMap"); + werkstoffHashMap = ReflectionUtils.getFieldValue(fieldWerkstoffHashMap); + getCorrespondingItemStackUnsafe = ReflectionUtils.getMethod( + WerkstoffLoader, "getCorrespondingItemStackUnsafe", OrePrefixes.class, Werkstoff, int.class); + } + + public enum NonMeta_MaterialItem { + Depleted_Tiberium_1, + Depleted_Tiberium_2, + Depleted_Tiberium_4, + TiberiumCell_1, + TiberiumCell_2, + TiberiumCell_4, + TheCoreCell, + Depleted_TheCoreCell; + } + + public static ItemStack getBW_NonMeta_MaterialItems(NonMeta_MaterialItem aItem, long aAmount) { + if (sClassBW_NonMeta_MaterialItems != null && sClassBW_NonMeta_MaterialItems.isEnum()) { + for (Object obj : sClassBW_NonMeta_MaterialItems.getEnumConstants()) { + try { + if (aItem.name().equals(ReflectionUtils.invokeNonBool(obj, sName, new Object[] {}))) { + return ((ItemStack) ReflectionUtils.invokeNonBool( + obj, sGet, new Object[] {aAmount, new Object[] {}})) + .copy(); + } + } catch (Throwable t) { + t.printStackTrace(); + } + } + } + return null; + } + + public static ArrayList getAll(int aStackSize) { + ArrayList aItems = new ArrayList(); + aItems.add(getBW_NonMeta_MaterialItems(NonMeta_MaterialItem.TiberiumCell_1, aStackSize)); + aItems.add(getBW_NonMeta_MaterialItems(NonMeta_MaterialItem.TiberiumCell_2, aStackSize)); + aItems.add(getBW_NonMeta_MaterialItems(NonMeta_MaterialItem.TiberiumCell_4, aStackSize)); + aItems.add(getBW_NonMeta_MaterialItems(NonMeta_MaterialItem.TheCoreCell, aStackSize)); + return aItems; + } - public static ItemStack getCorrespondingItemStack(OrePrefixes orePrefixes, short werkstoffID, int amount) { - if (LoadedMods.BartWorks) { - if (werkstoffHashMap != null) { - Object werkstoff = werkstoffHashMap.get(werkstoffID