From 6f31720697bcc351421a4d86ba3bf749375dd12c Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 27 Aug 2022 10:19:57 +0100 Subject: Update buildscript & apply spotless (#1306) * Update dependencies * Update buildscript, apply spotless --- .gitattributes | 35 + build.gradle | 259 +- dependencies.gradle | 36 +- settings.gradle | 10 + src/main/java/gregtech/GT_Mod.java | 385 +- src/main/java/gregtech/api/GregTech_API.java | 444 +- .../api/damagesources/GT_DamageSources.java | 12 +- .../api/enchants/Enchantment_EnderDamage.java | 15 +- .../java/gregtech/api/enums/ConfigCategories.java | 7 +- src/main/java/gregtech/api/enums/Dyes.java | 24 +- src/main/java/gregtech/api/enums/Element.java | 9 +- .../gregtech/api/enums/GTNH_ExtraMaterials.java | 637 +- .../java/gregtech/api/enums/GT_HatchElement.java | 8 +- src/main/java/gregtech/api/enums/GT_Values.java | 352 +- .../java/gregtech/api/enums/HeatingCoilLevel.java | 112 +- src/main/java/gregtech/api/enums/ItemList.java | 370 +- .../java/gregtech/api/enums/MaterialBuilder.java | 518 +- src/main/java/gregtech/api/enums/Materials.java | 18509 ++++++++++++- .../java/gregtech/api/enums/MaterialsBotania.java | 194 +- .../java/gregtech/api/enums/MaterialsKevlar.java | 597 +- src/main/java/gregtech/api/enums/OreDictNames.java | 1 - src/main/java/gregtech/api/enums/OrePrefixes.java | 4026 ++- src/main/java/gregtech/api/enums/ParticleFX.java | 1 - .../java/gregtech/api/enums/SoundResource.java | 12 +- src/main/java/gregtech/api/enums/SubTag.java | 23 +- src/main/java/gregtech/api/enums/TC_Aspects.java | 2 +- src/main/java/gregtech/api/enums/TextureSet.java | 7 +- src/main/java/gregtech/api/enums/Textures.java | 1387 +- src/main/java/gregtech/api/enums/Tier.java | 506 +- .../java/gregtech/api/enums/ToolDictNames.java | 2 +- .../gregtech/api/events/BlockScanningEvent.java | 18 +- src/main/java/gregtech/api/fluid/FluidTankGT.java | 37 +- .../java/gregtech/api/graphs/GenerateNodeMap.java | 56 +- .../gregtech/api/graphs/GenerateNodeMapPower.java | 22 +- src/main/java/gregtech/api/graphs/Lock.java | 5 +- src/main/java/gregtech/api/graphs/Node.java | 4 +- src/main/java/gregtech/api/graphs/NodeList.java | 13 +- src/main/java/gregtech/api/graphs/PowerNode.java | 6 +- src/main/java/gregtech/api/graphs/PowerNodes.java | 33 +- .../api/graphs/consumers/ConsumerNode.java | 6 +- .../api/graphs/consumers/EmptyPowerConsumer.java | 11 +- .../api/graphs/consumers/NodeEnergyConnected.java | 10 +- .../api/graphs/consumers/NodeEnergyReceiver.java | 99 +- .../api/graphs/consumers/NodeEnergySink.java | 10 +- .../api/graphs/consumers/NodeGTBaseMetaTile.java | 5 +- .../java/gregtech/api/graphs/paths/NodePath.java | 2 +- .../gregtech/api/graphs/paths/PowerNodePath.java | 1 - src/main/java/gregtech/api/gui/GT_Container.java | 84 +- .../api/gui/GT_ContainerMetaTile_Machine.java | 38 +- .../gregtech/api/gui/GT_Container_2by2_Fluid.java | 9 +- .../api/gui/GT_Container_BasicMachine.java | 36 +- .../gregtech/api/gui/GT_Container_BasicTank.java | 12 +- .../api/gui/GT_Container_MaintenanceHatch.java | 6 +- .../api/gui/GT_Container_MultiMachine.java | 3 +- .../api/gui/GT_Container_SpecialFilter.java | 39 +- .../java/gregtech/api/gui/GT_GUIColorOverride.java | 11 +- .../java/gregtech/api/gui/GT_GUIContainer.java | 13 +- .../api/gui/GT_GUIContainerMetaTile_Machine.java | 104 +- .../gregtech/api/gui/GT_GUIContainer_1by1.java | 9 +- .../gregtech/api/gui/GT_GUIContainer_2by2.java | 7 +- .../api/gui/GT_GUIContainer_2by2_Fluid.java | 5 +- .../gregtech/api/gui/GT_GUIContainer_3by3.java | 7 +- .../gregtech/api/gui/GT_GUIContainer_4by4.java | 7 +- .../api/gui/GT_GUIContainer_BasicMachine.java | 167 +- .../api/gui/GT_GUIContainer_BasicTank.java | 20 +- .../api/gui/GT_GUIContainer_MaintenanceHatch.java | 10 +- .../api/gui/GT_GUIContainer_MultiMachine.java | 62 +- src/main/java/gregtech/api/gui/GT_GUICover.java | 13 +- .../gregtech/api/gui/GT_GUIDialogSelectItem.java | 422 +- src/main/java/gregtech/api/gui/GT_GUIScreen.java | 568 +- src/main/java/gregtech/api/gui/GT_Slot_Holo.java | 19 +- .../java/gregtech/api/gui/GT_Slot_Holo_ME.java | 3 +- .../api/gui/widgets/GT_GuiCoverTabLine.java | 70 +- .../api/gui/widgets/GT_GuiFakeItemButton.java | 32 +- .../java/gregtech/api/gui/widgets/GT_GuiIcon.java | 123 +- .../gregtech/api/gui/widgets/GT_GuiIconButton.java | 39 +- .../api/gui/widgets/GT_GuiIconCheckButton.java | 13 +- .../api/gui/widgets/GT_GuiIntegerTextBox.java | 15 +- .../api/gui/widgets/GT_GuiSlotTooltip.java | 3 +- .../api/gui/widgets/GT_GuiSmartTooltip.java | 11 +- .../java/gregtech/api/gui/widgets/GT_GuiTab.java | 74 +- .../gregtech/api/gui/widgets/GT_GuiTabLine.java | 108 +- .../gregtech/api/gui/widgets/GT_GuiTooltip.java | 32 +- .../api/gui/widgets/GT_GuiTooltipManager.java | 21 +- .../gregtech/api/interfaces/IBlockContainer.java | 1 + .../gregtech/api/interfaces/IDebugableBlock.java | 3 +- .../api/interfaces/IGlobalWirelessEnergy.java | 68 +- .../java/gregtech/api/interfaces/IGuiIcon.java | 5 + .../java/gregtech/api/interfaces/IGuiScreen.java | 9 +- .../gregtech/api/interfaces/IHatchElement.java | 42 +- .../java/gregtech/api/interfaces/IHeatingCoil.java | 6 +- .../gregtech/api/interfaces/IIconContainer.java | 12 +- .../gregtech/api/interfaces/IItemBehaviour.java | 37 +- .../api/interfaces/INetworkUpdatableItem.java | 18 +- .../gregtech/api/interfaces/IProjectileItem.java | 3 +- .../java/gregtech/api/interfaces/ITexture.java | 2 +- .../java/gregtech/api/interfaces/IToolStats.java | 19 +- .../gregtech/api/interfaces/internal/IGT_Mod.java | 2 +- .../api/interfaces/internal/IGT_RecipeAdder.java | 724 +- .../api/interfaces/internal/IThaumcraftCompat.java | 32 +- .../api/interfaces/internal/IUETileEntity.java | 1 - .../IConfigurationCircuitSupport.java | 7 +- .../interfaces/metatileentity/IConnectable.java | 20 +- .../metatileentity/IMachineCallback.java | 2 + .../interfaces/metatileentity/IMetaTileEntity.java | 46 +- .../metatileentity/IMetaTileEntityCable.java | 6 +- .../metatileentity/IMetaTileEntityItemPipe.java | 64 +- .../tileentity/IBasicEnergyContainer.java | 12 +- .../api/interfaces/tileentity/ICoverable.java | 6 +- .../tileentity/IDebugableTileEntity.java | 3 +- .../interfaces/tileentity/IEnergyConnected.java | 16 +- .../tileentity/IExperimentalEnergyTileEntity.java | 36 +- .../api/interfaces/tileentity/IGTEnet.java | 11 +- .../interfaces/tileentity/IGregTechTileEntity.java | 44 +- .../tileentity/IGregtechWailaProvider.java | 15 +- .../api/interfaces/tileentity/IIC2Enet.java | 1 - .../tileentity/IMachineBlockUpdateable.java | 2 +- .../interfaces/tileentity/IMachineProgress.java | 5 +- .../api/interfaces/tileentity/ITurnable.java | 3 +- .../interfaces/tileentity/IUpgradableMachine.java | 1 - .../api/items/GT_Block_LongDistancePipe.java | 19 +- .../gregtech/api/items/GT_BreederCell_Item.java | 41 +- .../gregtech/api/items/GT_CoolantCellIC_Item.java | 18 +- .../gregtech/api/items/GT_CoolantCell_Item.java | 41 +- .../gregtech/api/items/GT_EnergyArmor_Item.java | 85 +- .../java/gregtech/api/items/GT_Generic_Block.java | 4 +- .../java/gregtech/api/items/GT_Generic_Item.java | 29 +- .../java/gregtech/api/items/GT_MetaBase_Item.java | 239 +- .../gregtech/api/items/GT_MetaGenerated_Item.java | 69 +- .../api/items/GT_MetaGenerated_Item_X01.java | 55 +- .../api/items/GT_MetaGenerated_Item_X32.java | 57 +- .../gregtech/api/items/GT_MetaGenerated_Tool.java | 523 +- .../api/items/GT_RadioactiveCellIC_Item.java | 100 +- .../api/items/GT_RadioactiveCell_Item.java | 56 +- .../gregtech/api/items/GT_SolderingTool_Item.java | 46 +- .../java/gregtech/api/items/GT_Spray_Bug_Item.java | 20 +- .../gregtech/api/items/GT_Spray_Foam_Item.java | 49 +- .../gregtech/api/items/GT_Spray_Hardener_Item.java | 34 +- .../api/items/GT_Spray_Hydration_Item.java | 23 +- .../java/gregtech/api/items/GT_Spray_Ice_Item.java | 49 +- .../gregtech/api/items/GT_Spray_Pepper_Item.java | 52 +- src/main/java/gregtech/api/items/GT_Tool_Item.java | 48 +- .../api/metatileentity/BaseMetaPipeEntity.java | 450 +- .../api/metatileentity/BaseMetaTileEntity.java | 879 +- .../api/metatileentity/BaseTileEntity.java | 57 +- .../api/metatileentity/CommonMetaTileEntity.java | 7 +- .../api/metatileentity/CoverableTileEntity.java | 211 +- .../api/metatileentity/MetaPipeEntity.java | 409 +- .../api/metatileentity/MetaTileEntity.java | 370 +- .../api/metatileentity/TileIC2EnergySink.java | 51 +- .../examples/GT_MetaTileEntity_E_Furnace.java | 76 +- .../implementations/GT_MetaPipeEntity_Cable.java | 421 +- .../implementations/GT_MetaPipeEntity_Fluid.java | 325 +- .../implementations/GT_MetaPipeEntity_Frame.java | 55 +- .../implementations/GT_MetaPipeEntity_Item.java | 275 +- .../GT_MetaTileEntity_BasicBatteryBuffer.java | 101 +- .../GT_MetaTileEntity_BasicGenerator.java | 98 +- .../GT_MetaTileEntity_BasicHull.java | 50 +- .../GT_MetaTileEntity_BasicHull_NonElectric.java | 17 +- .../GT_MetaTileEntity_BasicMachine.java | 460 +- .../GT_MetaTileEntity_BasicMachine_Bronze.java | 235 +- .../GT_MetaTileEntity_BasicMachine_GT_Recipe.java | 441 +- .../GT_MetaTileEntity_BasicMachine_Steel.java | 128 +- .../GT_MetaTileEntity_BasicTank.java | 82 +- .../implementations/GT_MetaTileEntity_Buffer.java | 156 +- .../GT_MetaTileEntity_CubicMultiBlockBase.java | 171 +- .../GT_MetaTileEntity_EnhancedMultiBlockBase.java | 347 +- .../implementations/GT_MetaTileEntity_Hatch.java | 111 +- .../GT_MetaTileEntity_Hatch_DataAccess.java | 35 +- .../GT_MetaTileEntity_Hatch_Dynamo.java | 15 +- .../GT_MetaTileEntity_Hatch_Energy.java | 18 +- .../GT_MetaTileEntity_Hatch_Input.java | 47 +- .../GT_MetaTileEntity_Hatch_InputBus.java | 118 +- .../GT_MetaTileEntity_Hatch_Maintenance.java | 134 +- .../GT_MetaTileEntity_Hatch_Muffler.java | 43 +- .../GT_MetaTileEntity_Hatch_MultiInput.java | 40 +- .../GT_MetaTileEntity_Hatch_Output.java | 183 +- .../GT_MetaTileEntity_Hatch_OutputBus.java | 80 +- .../GT_MetaTileEntity_MultiBlockBase.java | 432 +- .../GT_MetaTileEntity_SpecialFilter.java | 13 +- .../GT_MetaTileEntity_TieredMachineBlock.java | 32 +- .../GT_MetaTileEntity_TooltipMultiBlockBase.java | 9 +- .../GT_MetaTileEntity_Transformer.java | 192 +- .../GT_MetaTileEntity_Wireless_Dynamo.java | 21 +- .../GT_MetaTileEntity_Wireless_Hatch.java | 25 +- .../api/multitileentity/MultiTileEntityBlock.java | 317 +- .../MultiTileEntityBlockInternal.java | 75 +- .../MultiTileEntityClassContainer.java | 29 +- .../multitileentity/MultiTileEntityContainer.java | 9 +- .../MultiTileEntityItemInternal.java | 148 +- .../multitileentity/MultiTileEntityRegistry.java | 109 +- .../multitileentity/base/BaseMultiTileEntity.java | 720 +- .../base/BaseNontickableMultiTileEntity.java | 22 +- .../base/BaseTickableMultiTileEntity.java | 24 +- .../interfaces/IMultiBlockController.java | 8 +- .../interfaces/IMultiBlockEnergy.java | 50 +- .../interfaces/IMultiBlockFluidHandler.java | 17 +- .../interfaces/IMultiBlockInventory.java | 59 +- .../interfaces/IMultiTileEntity.java | 98 +- .../machine/MultiTileBasicMachine.java | 109 +- .../multiblock/base/MultiBlockController.java | 217 +- .../multiblock/base/MultiBlockPart.java | 277 +- .../multiblock/base/MultiBlock_Stackable.java | 10 +- .../multiblock/casing/CasingBehaviorBase.java | 3 +- .../gregtech/api/net/GT_Packet_Block_Event.java | 3 +- .../api/net/GT_Packet_ClientPreference.java | 6 +- .../api/net/GT_Packet_GtTileEntityGuiRequest.java | 29 +- src/main/java/gregtech/api/net/GT_Packet_New.java | 33 +- .../java/gregtech/api/net/GT_Packet_Pollution.java | 5 +- .../api/net/GT_Packet_RequestCoverData.java | 14 +- .../gregtech/api/net/GT_Packet_SendCoverData.java | 8 +- .../api/net/GT_Packet_SetConfigurationCircuit.java | 5 +- .../gregtech/api/net/GT_Packet_SetLockedFluid.java | 138 +- .../java/gregtech/api/net/GT_Packet_Sound.java | 11 +- .../gregtech/api/net/GT_Packet_TileEntity.java | 128 +- .../api/net/GT_Packet_TileEntityCover.java | 3 +- .../api/net/GT_Packet_TileEntityCoverGUI.java | 51 +- .../api/net/GT_Packet_TileEntityCoverNew.java | 9 +- .../gregtech/api/net/GT_Packet_UpdateItem.java | 84 +- .../api/net/GT_Packet_WirelessRedstoneCover.java | 12 +- .../api/objects/AE2DigitalChestHandler.java | 21 +- .../java/gregtech/api/objects/CollectorUtils.java | 7 +- .../java/gregtech/api/objects/ElementStack.java | 11 +- .../java/gregtech/api/objects/GT_ArrayList.java | 19 +- .../java/gregtech/api/objects/GT_ChunkManager.java | 83 +- .../api/objects/GT_CopiedBlockTexture.java | 4 +- .../gregtech/api/objects/GT_Cover_Default.java | 17 +- .../java/gregtech/api/objects/GT_Cover_None.java | 160 +- src/main/java/gregtech/api/objects/GT_Fluid.java | 8 +- .../java/gregtech/api/objects/GT_FluidStack.java | 28 +- src/main/java/gregtech/api/objects/GT_HashSet.java | 3 +- .../java/gregtech/api/objects/GT_ItemStack.java | 5 +- .../java/gregtech/api/objects/GT_MultiTexture.java | 2 +- .../gregtech/api/objects/GT_RenderedTexture.java | 6 +- .../java/gregtech/api/objects/GT_SidedTexture.java | 33 +- .../api/objects/GT_StdRenderedTexture.java | 5 +- .../java/gregtech/api/objects/GT_UO_Dimension.java | 73 +- .../gregtech/api/objects/GT_UO_DimensionList.java | 143 +- .../java/gregtech/api/objects/GT_UO_Fluid.java | 102 +- src/main/java/gregtech/api/objects/ItemData.java | 10 +- .../java/gregtech/api/objects/MaterialStack.java | 46 +- src/main/java/gregtech/api/objects/ObjMap.java | 274 +- .../gregtech/api/objects/ReverseShapedRecipe.java | 13 +- .../api/objects/ReverseShapelessRecipe.java | 13 +- src/main/java/gregtech/api/objects/XSTR.java | 42 +- .../java/gregtech/api/render/TextureFactory.java | 39 +- .../api/threads/GT_Runnable_Cable_Update.java | 26 +- .../threads/GT_Runnable_MachineBlockUpdate.java | 66 +- .../gregtech/api/threads/GT_Runnable_Sound.java | 34 +- .../gregtech/api/util/ColorsMetadataSection.java | 16 +- .../api/util/ColorsMetadataSectionSerializer.java | 32 +- .../java/gregtech/api/util/GT_ApiaryUpgrade.java | 53 +- .../gregtech/api/util/GT_AssemblyLineUtils.java | 1023 +- .../gregtech/api/util/GT_Assemblyline_Server.java | 722 +- src/main/java/gregtech/api/util/GT_BaseCrop.java | 145 +- src/main/java/gregtech/api/util/GT_BlockMap.java | 221 +- src/main/java/gregtech/api/util/GT_BlockSet.java | 48 +- src/main/java/gregtech/api/util/GT_CLS_Compat.java | 56 +- .../gregtech/api/util/GT_ChunkAssociatedData.java | 820 +- .../gregtech/api/util/GT_CircuitryBehavior.java | 58 +- .../gregtech/api/util/GT_ClientPreference.java | 6 +- src/main/java/gregtech/api/util/GT_Config.java | 30 +- .../java/gregtech/api/util/GT_CoverBehavior.java | 192 +- .../gregtech/api/util/GT_CoverBehaviorBase.java | 196 +- .../api/util/GT_ExoticEnergyInputHelper.java | 110 +- src/main/java/gregtech/api/util/GT_FoodStat.java | 13 +- .../java/gregtech/api/util/GT_Forestry_Compat.java | 129 +- src/main/java/gregtech/api/util/GT_GC_Compat.java | 23 +- .../gregtech/api/util/GT_HatchElementBuilder.java | 158 +- .../api/util/GT_ItsNotMyFaultException.java | 3 +- .../java/gregtech/api/util/GT_LanguageManager.java | 529 +- src/main/java/gregtech/api/util/GT_Log.java | 4 +- src/main/java/gregtech/api/util/GT_ModHandler.java | 1167 +- .../api/util/GT_Multiblock_Tooltip_Builder.java | 975 +- .../gregtech/api/util/GT_OreDictUnificator.java | 164 +- .../java/gregtech/api/util/GT_PlayedSound.java | 9 +- .../api/util/GT_ProcessingArray_Manager.java | 7 +- src/main/java/gregtech/api/util/GT_Recipe.java | 4076 ++- .../gregtech/api/util/GT_RecipeRegistrator.java | 513 +- .../java/gregtech/api/util/GT_RenderingWorld.java | 328 +- .../java/gregtech/api/util/GT_Shaped_Recipe.java | 37 +- .../gregtech/api/util/GT_Shapeless_Recipe.java | 69 +- .../gregtech/api/util/GT_Single_Recipe_Check.java | 28 +- .../GT_Single_Recipe_Check_Processing_Array.java | 31 +- .../gregtech/api/util/GT_SpawnEventHandler.java | 20 +- .../gregtech/api/util/GT_StructureUtility.java | 202 +- .../gregtech/api/util/GT_ToolHarvestHelper.java | 118 +- .../gregtech/api/util/GT_TooltipDataCache.java | 14 +- src/main/java/gregtech/api/util/GT_Util.java | 96 +- src/main/java/gregtech/api/util/GT_Utility.java | 2285 +- .../java/gregtech/api/util/GT_UtilityClient.java | 68 +- .../java/gregtech/api/util/IGT_HatchAdder.java | 4 +- .../gregtech/api/util/ISerializableObject.java | 15 +- .../java/gregtech/api/util/LightingHelper.java | 1108 +- .../api/util/WorldSpawnedEventBuilder.java | 119 +- .../gregtech/api/util/extensions/IteratorExt.java | 1 - src/main/java/gregtech/api/world/GT_Worldgen.java | 57 +- .../java/gregtech/api/world/GT_Worldgen_Ore.java | 17 +- .../api/world/GT_Worldgen_Ore_SingleBlock.java | 57 +- .../GT_Worldgen_Ore_SingleBlock_UnderLava.java | 60 +- .../java/gregtech/client/GT_GUI_ClientConfig.java | 64 +- src/main/java/gregtech/client/GT_GuiFactory.java | 33 +- .../gregtech/client/GT_TooltipEventHandler.java | 396 +- src/main/java/gregtech/common/GT_Client.java | 413 +- src/main/java/gregtech/common/GT_DummyWorld.java | 107 +- src/main/java/gregtech/common/GT_Network.java | 94 +- .../gregtech/common/GT_PlayerActivityLogger.java | 1 - src/main/java/gregtech/common/GT_Pollution.java | 887 +- src/main/java/gregtech/common/GT_Proxy.java | 1798 +- src/main/java/gregtech/common/GT_RecipeAdder.java | 2296 +- src/main/java/gregtech/common/GT_Server.java | 3 +- .../java/gregtech/common/GT_ThaumcraftCompat.java | 144 +- .../java/gregtech/common/GT_UndergroundOil.java | 107 +- .../gregtech/common/GT_Worldgen_GT_Ore_Layer.java | 567 +- .../common/GT_Worldgen_GT_Ore_SmallPieces.java | 128 +- .../java/gregtech/common/GT_Worldgen_Stone.java | 293 +- .../java/gregtech/common/GT_Worldgenerator.java | 436 +- .../gregtech/common/bees/GT_AlleleBeeSpecies.java | 40 +- .../java/gregtech/common/bees/GT_AlleleHelper.java | 115 +- .../java/gregtech/common/bees/GT_Bee_Mutation.java | 36 +- .../gregtech/common/blocks/GT_Block_Casings1.java | 37 +- .../gregtech/common/blocks/GT_Block_Casings2.java | 15 +- .../gregtech/common/blocks/GT_Block_Casings3.java | 12 +- .../gregtech/common/blocks/GT_Block_Casings4.java | 118 +- .../gregtech/common/blocks/GT_Block_Casings5.java | 12 +- .../gregtech/common/blocks/GT_Block_Casings6.java | 4 +- .../gregtech/common/blocks/GT_Block_Casings8.java | 96 +- .../common/blocks/GT_Block_Casings_Abstract.java | 12 +- .../gregtech/common/blocks/GT_Block_Concretes.java | 14 +- .../gregtech/common/blocks/GT_Block_Machines.java | 155 +- .../gregtech/common/blocks/GT_Block_Metal.java | 6 +- .../java/gregtech/common/blocks/GT_Block_Ores.java | 67 +- .../common/blocks/GT_Block_Ores_Abstract.java | 77 +- .../gregtech/common/blocks/GT_Block_Ores_UB1.java | 51 +- .../gregtech/common/blocks/GT_Block_Ores_UB2.java | 52 +- .../gregtech/common/blocks/GT_Block_Ores_UB3.java | 52 +- .../common/blocks/GT_Block_Reinforced.java | 149 +- .../gregtech/common/blocks/GT_Block_Stones.java | 12 +- .../common/blocks/GT_Block_Stones_Abstract.java | 97 +- .../gregtech/common/blocks/GT_Block_Storage.java | 6 +- .../gregtech/common/blocks/GT_Item_Casings1.java | 7 - .../gregtech/common/blocks/GT_Item_Casings2.java | 3 +- .../gregtech/common/blocks/GT_Item_Casings5.java | 9 +- .../common/blocks/GT_Item_Casings_Abstract.java | 41 +- .../gregtech/common/blocks/GT_Item_Concretes.java | 6 +- .../common/blocks/GT_Item_LongDistancePipe.java | 9 +- .../gregtech/common/blocks/GT_Item_Machines.java | 204 +- .../java/gregtech/common/blocks/GT_Item_Ores.java | 45 +- .../common/blocks/GT_Item_Stones_Abstract.java | 6 +- .../gregtech/common/blocks/GT_Item_Storage.java | 19 +- .../gregtech/common/blocks/GT_TileEntity_Ores.java | 157 +- .../java/gregtech/common/covers/GT_Cover_Arm.java | 244 +- .../common/covers/GT_Cover_ControlsWork.java | 66 +- .../gregtech/common/covers/GT_Cover_Conveyor.java | 143 +- .../gregtech/common/covers/GT_Cover_Crafting.java | 35 +- .../gregtech/common/covers/GT_Cover_DoesWork.java | 91 +- .../gregtech/common/covers/GT_Cover_Drain.java | 110 +- .../gregtech/common/covers/GT_Cover_EUMeter.java | 184 +- .../common/covers/GT_Cover_EnergyOnly.java | 40 +- .../gregtech/common/covers/GT_Cover_FacadeAE.java | 36 +- .../common/covers/GT_Cover_FacadeBase.java | 145 +- .../common/covers/GT_Cover_FluidLimiter.java | 56 +- .../common/covers/GT_Cover_FluidRegulator.java | 1010 +- .../covers/GT_Cover_FluidStorageMonitor.java | 182 +- .../common/covers/GT_Cover_Fluidfilter.java | 168 +- .../common/covers/GT_Cover_ItemFilter.java | 132 +- .../gregtech/common/covers/GT_Cover_ItemMeter.java | 161 +- .../java/gregtech/common/covers/GT_Cover_Lens.java | 3 +- .../common/covers/GT_Cover_LiquidMeter.java | 88 +- .../common/covers/GT_Cover_NeedMaintainance.java | 145 +- .../common/covers/GT_Cover_PlayerDetector.java | 69 +- .../java/gregtech/common/covers/GT_Cover_Pump.java | 165 +- .../common/covers/GT_Cover_RedstoneConductor.java | 49 +- .../covers/GT_Cover_RedstoneReceiverExternal.java | 15 +- .../covers/GT_Cover_RedstoneReceiverInternal.java | 15 +- .../common/covers/GT_Cover_RedstoneSignalizer.java | 29 +- .../GT_Cover_RedstoneTransmitterExternal.java | 3 +- .../GT_Cover_RedstoneTransmitterInternal.java | 12 +- .../covers/GT_Cover_RedstoneWirelessBase.java | 107 +- .../gregtech/common/covers/GT_Cover_Screen.java | 22 +- .../gregtech/common/covers/GT_Cover_Shutter.java | 101 +- .../common/covers/GT_Cover_SolarPanel.java | 115 +- .../common/covers/GT_Cover_SteamValve.java | 3 +- .../java/gregtech/common/covers/GT_Cover_Vent.java | 18 +- .../common/entities/GT_EntityFXPollution.java | 7 +- .../gregtech/common/entities/GT_Entity_Arrow.java | 185 +- .../common/entities/GT_Entity_Arrow_Potion.java | 17 +- .../gregtech/common/gui/GT_Container_Boiler.java | 21 +- .../common/gui/GT_Container_ChestBuffer.java | 36 +- .../gregtech/common/gui/GT_Container_Filter.java | 44 +- .../common/gui/GT_Container_IndustrialApiary.java | 116 +- .../common/gui/GT_Container_InputBus_ME.java | 58 +- .../common/gui/GT_Container_ItemDistributor.java | 21 +- .../GT_Container_MicrowaveEnergyTransmitter.java | 54 +- .../common/gui/GT_Container_OutputHatch.java | 14 +- .../gui/GT_Container_PrimitiveBlastFurnace.java | 3 +- .../common/gui/GT_Container_Regulator.java | 14 +- .../common/gui/GT_Container_SuperBuffer.java | 36 +- .../common/gui/GT_Container_Teleporter.java | 57 +- .../common/gui/GT_GUIContainerVolumetricFlask.java | 36 +- .../common/gui/GT_GUIContainer_Boiler.java | 3 +- .../gui/GT_GUIContainer_BronzeBlastFurnace.java | 24 +- .../common/gui/GT_GUIContainer_FusionReactor.java | 39 +- .../gui/GT_GUIContainer_IndustrialApiary.java | 157 +- .../common/gui/GT_GUIContainer_InputBus_ME.java | 48 +- .../gui/GT_GUIContainer_ItemDistributor.java | 4 +- ...GT_GUIContainer_MicrowaveEnergyTransmitter.java | 60 +- .../common/gui/GT_GUIContainer_OutputHatch.java | 37 +- .../gui/GT_GUIContainer_PrimitiveBlastFurnace.java | 31 +- .../common/gui/GT_GUIContainer_QuantumChest.java | 24 +- .../common/gui/GT_GUIContainer_RecipeFilter.java | 18 +- .../common/gui/GT_GUIContainer_Regulator.java | 27 +- .../common/gui/GT_GUIContainer_Teleporter.java | 44 +- src/main/java/gregtech/common/items/CombType.java | 61 +- src/main/java/gregtech/common/items/DropType.java | 45 +- .../common/items/GT_DepletetCell_Item.java | 17 +- .../gregtech/common/items/GT_FluidDisplayItem.java | 83 +- .../common/items/GT_IntegratedCircuit_Item.java | 207 +- .../common/items/GT_MetaGenerated_Item_01.java | 5306 +++- .../common/items/GT_MetaGenerated_Item_02.java | 2530 +- .../common/items/GT_MetaGenerated_Item_03.java | 598 +- .../common/items/GT_MetaGenerated_Item_98.java | 28 +- .../common/items/GT_MetaGenerated_Item_99.java | 48 +- .../common/items/GT_MetaGenerated_Tool_01.java | 788 +- .../common/items/GT_NeutronReflector_Item.java | 16 +- .../gregtech/common/items/GT_SensorCard_Item.java | 22 +- .../gregtech/common/items/GT_VolumetricFlask.java | 61 +- src/main/java/gregtech/common/items/ItemComb.java | 2544 +- src/main/java/gregtech/common/items/ItemDrop.java | 288 +- .../java/gregtech/common/items/ItemPollen.java | 123 +- .../java/gregtech/common/items/ItemPropolis.java | 182 +- .../java/gregtech/common/items/PollenType.java | 11 +- .../java/gregtech/common/items/PropolisType.java | 39 +- .../common/items/behaviors/Behaviour_Arrow.java | 44 +- .../items/behaviors/Behaviour_Arrow_Potion.java | 24 +- .../items/behaviors/Behaviour_Cover_Tool.java | 105 +- .../common/items/behaviors/Behaviour_Crowbar.java | 13 +- .../common/items/behaviors/Behaviour_DataOrb.java | 3 +- .../items/behaviors/Behaviour_DataStick.java | 47 +- .../common/items/behaviors/Behaviour_Hoe.java | 20 +- .../common/items/behaviors/Behaviour_Lighter.java | 56 +- .../common/items/behaviors/Behaviour_None.java | 56 +- .../behaviors/Behaviour_Plunger_Essentia.java | 30 +- .../items/behaviors/Behaviour_Plunger_Fluid.java | 29 +- .../items/behaviors/Behaviour_Plunger_Item.java | 41 +- .../items/behaviors/Behaviour_PrintedPages.java | 3 +- .../items/behaviors/Behaviour_Prospecting.java | 85 +- .../common/items/behaviors/Behaviour_Scanner.java | 43 +- .../common/items/behaviors/Behaviour_Scoop.java | 28 +- .../items/behaviors/Behaviour_Screwdriver.java | 13 +- .../common/items/behaviors/Behaviour_Sense.java | 26 +- .../items/behaviors/Behaviour_SensorKit.java | 22 +- .../items/behaviors/Behaviour_SoftHammer.java | 76 +- .../items/behaviors/Behaviour_Sonictron.java | 19 +- .../items/behaviors/Behaviour_Spray_Color.java | 46 +- .../common/items/behaviors/Behaviour_Wrench.java | 101 +- .../items/behaviors/Behaviour_WrittenBook.java | 19 +- .../common/misc/GT_ClientPollutionMap.java | 94 +- src/main/java/gregtech/common/misc/GT_Command.java | 171 +- .../common/misc/GT_DrillingLogicDelegate.java | 33 +- .../common/net/MessageSetFlaskCapacity.java | 3 +- .../gregtech/common/power/BasicMachineEUPower.java | 24 +- .../redstonecircuits/GT_Circuit_BasicLogic.java | 36 +- .../common/redstonecircuits/GT_Circuit_BitAnd.java | 12 +- .../common/redstonecircuits/GT_Circuit_Equals.java | 7 +- .../common/redstonecircuits/GT_Circuit_Pulser.java | 14 +- .../redstonecircuits/GT_Circuit_Randomizer.java | 3 +- .../redstonecircuits/GT_Circuit_RedstoneMeter.java | 8 +- .../common/redstonecircuits/GT_Circuit_Timer.java | 4 +- .../common/render/CosmicItemRendererGT.java | 112 +- .../gregtech/common/render/GT_CapeRenderer.java | 49 +- .../common/render/GT_CopiedBlockTexture.java | 6 +- .../common/render/GT_CopiedCTMBlockTexture.java | 18 +- .../gregtech/common/render/GT_FlaskRenderer.java | 11 +- .../render/GT_FluidDisplayStackRenderer.java | 36 +- .../render/GT_MetaGenerated_Tool_Renderer.java | 100 +- .../gregtech/common/render/GT_MultiTexture.java | 2 - .../common/render/GT_PollutionRenderer.java | 123 +- .../java/gregtech/common/render/GT_RenderUtil.java | 11 +- .../gregtech/common/render/GT_RenderedTexture.java | 90 +- .../gregtech/common/render/GT_Renderer_Block.java | 526 +- .../gregtech/common/render/GT_SidedTexture.java | 26 +- .../gregtech/common/render/GT_TextureBase.java | 2 +- .../gregtech/common/render/GT_TextureBuilder.java | 14 +- .../gregtech/common/render/IRenderedBlock.java | 57 +- .../render/items/GT_GeneratedItem_Renderer.java | 54 +- .../items/GT_GeneratedMaterial_Renderer.java | 38 +- .../items/GT_MetaGenerated_Item_Renderer.java | 4 +- .../automation/GT_MetaTileEntity_ChestBuffer.java | 59 +- .../automation/GT_MetaTileEntity_Filter.java | 40 +- .../GT_MetaTileEntity_ItemDistributor.java | 64 +- .../automation/GT_MetaTileEntity_RecipeFilter.java | 32 +- .../automation/GT_MetaTileEntity_Regulator.java | 61 +- .../automation/GT_MetaTileEntity_SuperBuffer.java | 54 +- .../automation/GT_MetaTileEntity_TypeFilter.java | 65 +- .../boilers/GT_MetaTileEntity_Boiler.java | 49 +- .../boilers/GT_MetaTileEntity_Boiler_Bronze.java | 230 +- .../boilers/GT_MetaTileEntity_Boiler_Lava.java | 60 +- .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 138 +- .../GT_MetaTileEntity_Boiler_Solar_Steel.java | 37 +- .../boilers/GT_MetaTileEntity_Boiler_Steel.java | 57 +- .../GT_MetaTileEntity_DieselGenerator.java | 175 +- .../generators/GT_MetaTileEntity_GasTurbine.java | 146 +- .../generators/GT_MetaTileEntity_LightningRod.java | 62 +- .../GT_MetaTileEntity_MagicEnergyConverter.java | 153 +- .../GT_MetaTileEntity_MagicalEnergyAbsorber.java | 205 +- .../GT_MetaTileEntity_NaquadahReactor.java | 135 +- .../GT_MetaTileEntity_PlasmaGenerator.java | 98 +- .../generators/GT_MetaTileEntity_SteamTurbine.java | 139 +- .../GT_MetaTileEntity_BasicHull_Bronze.java | 18 +- .../GT_MetaTileEntity_BasicHull_BronzeBricks.java | 26 +- .../GT_MetaTileEntity_BasicHull_Steel.java | 16 +- .../GT_MetaTileEntity_BasicHull_SteelBricks.java | 25 +- .../GT_MetaTileEntity_Hatch_InputBus_ME.java | 105 +- .../GT_MetaTileEntity_Hatch_OutputBus_ME.java | 118 +- .../GT_MetaTileEntity_AdvSeismicProspector.java | 219 +- .../basic/GT_MetaTileEntity_Boxinator.java | 144 +- .../machines/basic/GT_MetaTileEntity_Charger.java | 70 +- .../basic/GT_MetaTileEntity_CuringOven.java | 86 +- .../basic/GT_MetaTileEntity_Disassembler.java | 395 +- .../basic/GT_MetaTileEntity_IndustrialApiary.java | 596 +- .../basic/GT_MetaTileEntity_Massfabricator.java | 115 +- ..._MetaTileEntity_MicrowaveEnergyTransmitter.java | 142 +- .../machines/basic/GT_MetaTileEntity_Miner.java | 210 +- .../basic/GT_MetaTileEntity_MonsterRepellent.java | 97 +- .../basic/GT_MetaTileEntity_PotionBrewer.java | 98 +- .../machines/basic/GT_MetaTileEntity_Printer.java | 32 +- .../machines/basic/GT_MetaTileEntity_Pump.java | 287 +- .../basic/GT_MetaTileEntity_Replicator.java | 121 +- .../basic/GT_MetaTileEntity_RockBreaker.java | 97 +- .../machines/basic/GT_MetaTileEntity_Scanner.java | 224 +- .../basic/GT_MetaTileEntity_SeismicProspector.java | 207 +- .../basic/GT_MetaTileEntity_Teleporter.java | 265 +- ...GT_MetaTileEntity_LongDistancePipelineBase.java | 191 +- ...T_MetaTileEntity_LongDistancePipelineFluid.java | 58 +- ...GT_MetaTileEntity_LongDistancePipelineItem.java | 69 +- .../GT_MetaTileEntity_AbstractMultiFurnace.java | 11 +- .../multi/GT_MetaTileEntity_AssemblyLine.java | 275 +- .../GT_MetaTileEntity_BrickedBlastFurnace.java | 23 +- .../GT_MetaTileEntity_BronzeBlastFurnace.java | 27 +- .../multi/GT_MetaTileEntity_Charcoal_Pit.java | 112 +- .../multi/GT_MetaTileEntity_Cleanroom.java | 268 +- .../GT_MetaTileEntity_ConcreteBackfillerBase.java | 70 +- .../multi/GT_MetaTileEntity_DieselEngine.java | 224 +- .../multi/GT_MetaTileEntity_DistillationTower.java | 245 +- .../multi/GT_MetaTileEntity_DrillerBase.java | 284 +- .../GT_MetaTileEntity_ElectricBlastFurnace.java | 286 +- .../GT_MetaTileEntity_ExtremeDieselEngine.java | 123 +- .../multi/GT_MetaTileEntity_FusionComputer.java | 244 +- .../multi/GT_MetaTileEntity_FusionComputer1.java | 13 +- .../multi/GT_MetaTileEntity_FusionComputer2.java | 12 +- .../multi/GT_MetaTileEntity_FusionComputer3.java | 13 +- .../multi/GT_MetaTileEntity_HeatExchanger.java | 179 +- .../GT_MetaTileEntity_ImplosionCompressor.java | 101 +- .../GT_MetaTileEntity_IntegratedOreFactory.java | 272 +- .../multi/GT_MetaTileEntity_LargeBoiler.java | 262 +- .../GT_MetaTileEntity_LargeBoiler_Bronze.java | 9 +- .../multi/GT_MetaTileEntity_LargeBoiler_Steel.java | 13 +- .../GT_MetaTileEntity_LargeBoiler_Titanium.java | 18 +- ...T_MetaTileEntity_LargeBoiler_TungstenSteel.java | 14 +- .../GT_MetaTileEntity_LargeChemicalReactor.java | 175 +- .../multi/GT_MetaTileEntity_LargeTurbine.java | 242 +- .../multi/GT_MetaTileEntity_LargeTurbine_Gas.java | 77 +- ...GT_MetaTileEntity_LargeTurbine_GasAdvanced.java | 106 +- .../GT_MetaTileEntity_LargeTurbine_HPSteam.java | 90 +- .../GT_MetaTileEntity_LargeTurbine_Plasma.java | 207 +- .../GT_MetaTileEntity_LargeTurbine_Steam.java | 108 +- .../multi/GT_MetaTileEntity_MultiFurnace.java | 219 +- .../multi/GT_MetaTileEntity_OilCracker.java | 229 +- .../multi/GT_MetaTileEntity_OilDrillBase.java | 219 +- .../multi/GT_MetaTileEntity_OilDrillInfinite.java | 12 +- .../multi/GT_MetaTileEntity_OreDrillingPlant1.java | 4 +- .../multi/GT_MetaTileEntity_OreDrillingPlant2.java | 4 +- .../multi/GT_MetaTileEntity_OreDrillingPlant3.java | 4 +- .../multi/GT_MetaTileEntity_OreDrillingPlant4.java | 4 +- .../GT_MetaTileEntity_OreDrillingPlantBase.java | 200 +- .../multi/GT_MetaTileEntity_PlasmaForge.java | 1192 +- .../GT_MetaTileEntity_PrimitiveBlastFurnace.java | 143 +- .../multi/GT_MetaTileEntity_ProcessingArray.java | 233 +- .../multi/GT_MetaTileEntity_PyrolyseOven.java | 169 +- .../multi/GT_MetaTileEntity_VacuumFreezer.java | 73 +- .../machines/multiblock/MultiBlock_Macerator.java | 108 +- .../GT_MetaTileEntity_AlloySmelter_Bronze.java | 75 +- .../GT_MetaTileEntity_AlloySmelter_Steel.java | 75 +- .../steam/GT_MetaTileEntity_Compressor_Bronze.java | 75 +- .../steam/GT_MetaTileEntity_Compressor_Steel.java | 75 +- .../steam/GT_MetaTileEntity_Extractor_Bronze.java | 75 +- .../steam/GT_MetaTileEntity_Extractor_Steel.java | 75 +- .../GT_MetaTileEntity_ForgeHammer_Bronze.java | 86 +- .../steam/GT_MetaTileEntity_ForgeHammer_Steel.java | 86 +- .../steam/GT_MetaTileEntity_Furnace_Bronze.java | 79 +- .../steam/GT_MetaTileEntity_Furnace_Steel.java | 77 +- .../steam/GT_MetaTileEntity_Macerator_Bronze.java | 111 +- .../steam/GT_MetaTileEntity_Macerator_Steel.java | 116 +- .../GT_MetaTileEntity_DigitalChestBase.java | 200 +- .../storage/GT_MetaTileEntity_DigitalTankBase.java | 64 +- .../storage/GT_MetaTileEntity_Locker.java | 27 +- .../storage/GT_MetaTileEntity_QuantumChest.java | 7 +- .../storage/GT_MetaTileEntity_QuantumTank.java | 27 +- .../storage/GT_MetaTileEntity_SuperChest.java | 3 +- .../storage/GT_MetaTileEntity_SuperTank.java | 26 +- src/main/java/gregtech/common/tools/GT_Tool.java | 59 +- .../java/gregtech/common/tools/GT_Tool_Axe.java | 86 +- .../common/tools/GT_Tool_BranchCutter.java | 31 +- .../common/tools/GT_Tool_ButcheryKnife.java | 10 +- .../gregtech/common/tools/GT_Tool_BuzzSaw.java | 14 +- .../gregtech/common/tools/GT_Tool_Chainsaw_HV.java | 6 +- .../gregtech/common/tools/GT_Tool_Chainsaw_LV.java | 86 +- .../gregtech/common/tools/GT_Tool_Chainsaw_MV.java | 6 +- .../gregtech/common/tools/GT_Tool_Crowbar.java | 14 +- .../gregtech/common/tools/GT_Tool_Drill_HV.java | 6 +- .../gregtech/common/tools/GT_Tool_Drill_LV.java | 40 +- .../gregtech/common/tools/GT_Tool_Drill_MV.java | 9 +- .../java/gregtech/common/tools/GT_Tool_File.java | 22 +- .../gregtech/common/tools/GT_Tool_HardHammer.java | 57 +- .../java/gregtech/common/tools/GT_Tool_Hoe.java | 20 +- .../gregtech/common/tools/GT_Tool_JackHammer.java | 43 +- .../java/gregtech/common/tools/GT_Tool_Knife.java | 5 +- .../java/gregtech/common/tools/GT_Tool_Mortar.java | 7 +- .../gregtech/common/tools/GT_Tool_Pickaxe.java | 33 +- .../java/gregtech/common/tools/GT_Tool_Plow.java | 53 +- .../gregtech/common/tools/GT_Tool_Plunger.java | 17 +- .../gregtech/common/tools/GT_Tool_RollingPin.java | 7 +- .../java/gregtech/common/tools/GT_Tool_Saw.java | 60 +- .../java/gregtech/common/tools/GT_Tool_Scoop.java | 18 +- .../gregtech/common/tools/GT_Tool_Screwdriver.java | 34 +- .../common/tools/GT_Tool_Screwdriver_LV.java | 10 +- .../java/gregtech/common/tools/GT_Tool_Sense.java | 51 +- .../java/gregtech/common/tools/GT_Tool_Shovel.java | 28 +- .../gregtech/common/tools/GT_Tool_SoftHammer.java | 18 +- .../common/tools/GT_Tool_Soldering_Iron.java | 29 +- .../java/gregtech/common/tools/GT_Tool_Sword.java | 36 +- .../gregtech/common/tools/GT_Tool_Turbine.java | 5 +- .../common/tools/GT_Tool_UniversalSpade.java | 56 +- .../gregtech/common/tools/GT_Tool_WireCutter.java | 13 +- .../java/gregtech/common/tools/GT_Tool_Wrench.java | 19 +- .../gregtech/common/tools/GT_Tool_Wrench_HV.java | 10 +- .../gregtech/common/tools/GT_Tool_Wrench_LV.java | 13 +- .../gregtech/common/tools/GT_Tool_Wrench_MV.java | 10 +- .../crossmod/GregtechWailaDataProvider.java | 31 +- src/main/java/gregtech/crossmod/Harvestcraft.java | 3 +- src/main/java/gregtech/crossmod/Waila.java | 8 +- src/main/java/gregtech/loaders/ExtraIcons.java | 12 +- .../java/gregtech/loaders/load/GT_FuelLoader.java | 140 +- .../gregtech/loaders/load/GT_ItemIterator.java | 329 +- .../gregtech/loaders/load/GT_SonictronLoader.java | 3 +- .../materialprocessing/ProcessingConfig.java | 33 +- .../materialprocessing/ProcessingModSupport.java | 14 +- .../gregtech/loaders/misc/GT_Achievements.java | 302 +- .../gregtech/loaders/misc/GT_BeeDefinition.java | 2815 +- src/main/java/gregtech/loaders/misc/GT_Bees.java | 60 +- .../gregtech/loaders/misc/GT_BranchDefinition.java | 61 +- .../java/gregtech/loaders/misc/GT_CoverLoader.java | 32 +- .../loaders/oreprocessing/ProcessingAll.java | 9 +- .../loaders/oreprocessing/ProcessingArrows.java | 101 +- .../loaders/oreprocessing/ProcessingBeans.java | 6 +- .../loaders/oreprocessing/ProcessingBlock.java | 77 +- .../loaders/oreprocessing/ProcessingBolt.java | 11 +- .../loaders/oreprocessing/ProcessingCell.java | 129 +- .../loaders/oreprocessing/ProcessingCircuit.java | 31 +- .../oreprocessing/ProcessingCompressed.java | 8 +- .../loaders/oreprocessing/ProcessingCrafting.java | 408 +- .../loaders/oreprocessing/ProcessingCrate.java | 91 +- .../loaders/oreprocessing/ProcessingCrop.java | 73 +- .../oreprocessing/ProcessingCrushedOre.java | 112 +- .../oreprocessing/ProcessingCrystallized.java | 16 +- .../loaders/oreprocessing/ProcessingDirty.java | 134 +- .../loaders/oreprocessing/ProcessingDust.java | 431 +- .../loaders/oreprocessing/ProcessingDye.java | 56 +- .../loaders/oreprocessing/ProcessingFineWire.java | 27 +- .../loaders/oreprocessing/ProcessingFoil.java | 12 +- .../loaders/oreprocessing/ProcessingFood.java | 63 +- .../loaders/oreprocessing/ProcessingGear.java | 91 +- .../loaders/oreprocessing/ProcessingGem.java | 267 +- .../loaders/oreprocessing/ProcessingIngot.java | 186 +- .../loaders/oreprocessing/ProcessingItem.java | 14 +- .../loaders/oreprocessing/ProcessingLens.java | 38 +- .../loaders/oreprocessing/ProcessingLog.java | 293 +- .../loaders/oreprocessing/ProcessingNugget.java | 41 +- .../loaders/oreprocessing/ProcessingOre.java | 197 +- .../loaders/oreprocessing/ProcessingOrePoor.java | 29 +- .../oreprocessing/ProcessingOreSmelting.java | 132 +- .../loaders/oreprocessing/ProcessingPipe.java | 133 +- .../loaders/oreprocessing/ProcessingPlank.java | 130 +- .../loaders/oreprocessing/ProcessingPlate.java | 382 +- .../loaders/oreprocessing/ProcessingPure.java | 23 +- .../loaders/oreprocessing/ProcessingRecycling.java | 15 +- .../loaders/oreprocessing/ProcessingRotor.java | 59 +- .../loaders/oreprocessing/ProcessingRound.java | 25 +- .../loaders/oreprocessing/ProcessingSand.java | 25 +- .../loaders/oreprocessing/ProcessingSaplings.java | 17 +- .../loaders/oreprocessing/ProcessingScrew.java | 15 +- .../loaders/oreprocessing/ProcessingShaping.java | 448 +- .../loaders/oreprocessing/ProcessingSlab.java | 18 +- .../loaders/oreprocessing/ProcessingStick.java | 54 +- .../loaders/oreprocessing/ProcessingStickLong.java | 36 +- .../loaders/oreprocessing/ProcessingStone.java | 178 +- .../oreprocessing/ProcessingStoneCobble.java | 32 +- .../oreprocessing/ProcessingStoneVarious.java | 21 +- .../loaders/oreprocessing/ProcessingToolHead.java | 1845 +- .../loaders/oreprocessing/ProcessingToolOther.java | 177 +- .../oreprocessing/ProcessingTransforming.java | 103 +- .../loaders/oreprocessing/ProcessingWax.java | 6 +- .../loaders/oreprocessing/ProcessingWire.java | 424 +- .../loaders/postload/GT_BlockResistanceLoader.java | 4 +- .../loaders/postload/GT_BookAndLootLoader.java | 336 +- .../loaders/postload/GT_CraftingRecipeLoader.java | 3840 ++- .../gregtech/loaders/postload/GT_CropLoader.java | 1424 +- .../loaders/postload/GT_MachineRecipeLoader.java | 26888 ++++++++++++++++--- .../gregtech/loaders/postload/GT_PostLoad.java | 392 +- .../postload/GT_ProcessingArrayRecipeLoader.java | 180 +- .../postload/GT_RecyclerBlacklistLoader.java | 59 +- .../loaders/postload/GT_UUMRecipeLoader.java | 3 +- .../loaders/postload/GT_Worldgenloader.java | 1756 +- .../gregtech/loaders/postload/PartP2PGTPower.java | 26 +- .../loaders/preload/GT_Loader_ItemData.java | 452 +- .../preload/GT_Loader_Item_Block_And_Fluid.java | 3195 ++- .../preload/GT_Loader_MetaTileEntities.java | 15834 ++++++++++- .../preload/GT_Loader_MultiTileEntities.java | 47 +- .../loaders/preload/GT_Loader_OreDictionary.java | 353 +- .../loaders/preload/GT_Loader_OreProcessing.java | 3 +- .../java/gregtech/loaders/preload/GT_PreLoad.java | 884 +- .../java/gregtech/nei/GT_NEI_AssLineHandler.java | 239 +- .../java/gregtech/nei/GT_NEI_DefaultHandler.java | 513 +- .../gregtech/nei/NEIHandlerAbsoluteTooltip.java | 8 +- src/main/java/gregtech/nei/NEI_GT_Config.java | 8 +- .../java/gregtech/nei/NEI_TransferRectHost.java | 3 + src/main/java/gregtech/nei/RecipeMapHandler.java | 4 +- .../java/speiger/src/crops/api/ICropCardInfo.java | 14 +- .../java/gregtech/common/items/CombTypeTest.java | 13 +- .../IGlobalWirelessEnergy_UnitTest.java | 8 +- 731 files changed, 135671 insertions(+), 39231 deletions(-) create mode 100644 .gitattributes create mode 100644 settings.gradle diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..9917fc4abe --- /dev/null +++ b/.gitattributes @@ -0,0 +1,35 @@ +* text eol=lf + +*.jar binary + +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.tif binary +*.tiff binary +*.ico binary +*.svg text +*.eps binary + +*.kar binary +*.m4a binary +*.mid binary +*.midi binary +*.mp3 binary +*.ogg binary +*.ra binary + +*.7z binary +*.gz binary +*.tar binary +*.tgz binary +*.zip binary + +*.patch -text + +*.bat text eol=crlf +*.cmd text eol=crlf +*.ps1 text eol=crlf + +*autogenerated binary \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3208b6c90d..997b94dc30 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,9 @@ -//version: 1657593170-nospotless +//version: 1661114848 /* -DO NOT CHANGE THIS FILE! - -Also, you may replace this file at any time if there is an update available. -Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates. -*/ + DO NOT CHANGE THIS FILE! + Also, you may replace this file at any time if there is an update available. + Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates. + */ import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation @@ -21,10 +20,17 @@ import java.util.zip.ZipOutputStream buildscript { repositories { + mavenCentral() + maven { name 'forge' url 'https://maven.minecraftforge.net' } + maven { + // GTNH ForgeGradle Fork + name = "GTNH Maven" + url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" + } maven { name 'sonatype' url 'https://oss.sonatype.org/content/repositories/snapshots/' @@ -33,32 +39,38 @@ buildscript { name 'Scala CI dependencies' url 'https://repo1.maven.org/maven2/' } - maven { - name 'jitpack' - url 'https://jitpack.io' - } } dependencies { - classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7' + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.9' } } - plugins { id 'java-library' id 'idea' id 'eclipse' id 'scala' id 'maven-publish' - id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false - id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false - id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false - id 'org.ajoberstar.grgit' version '4.1.1' + id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false + id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false + id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false + id 'org.ajoberstar.grgit' version '4.1.1' id 'com.github.johnrengelman.shadow' version '4.0.4' - id 'com.palantir.git-version' version '0.13.0' apply false - id 'de.undercouch.download' version '5.0.1' - id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false + id 'com.palantir.git-version' version '0.13.0' apply false + id 'de.undercouch.download' version '5.0.1' + id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false + id 'com.diffplug.spotless' version '6.7.2' apply false +} +boolean settingsupdated = verifySettingsGradle() +settingsupdated = verifyGitAttributes() || settingsupdated +if (settingsupdated) + throw new GradleException("Settings has been updated, please re-run task.") + +dependencies { + implementation 'com.diffplug:blowdryer:1.6.0' } +apply plugin: 'com.diffplug.blowdryer' + if (project.file('.git/HEAD').isFile()) { apply plugin: 'com.palantir.git-version' } @@ -83,7 +95,14 @@ idea { } } -if(JavaVersion.current() != JavaVersion.VERSION_1_8) { +boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false + +if (!disableSpotless) { + apply plugin: 'com.diffplug.spotless' + apply from: Blowdryer.file('spotless.gradle') +} + +if (JavaVersion.current() != JavaVersion.VERSION_1_8) { throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current()) } @@ -108,13 +127,11 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly") checkPropertyExists("usesShadowedDependencies") checkPropertyExists("developmentEnvironmentUserName") -boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false -boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean() -boolean forceEnableMixins = project.findProperty('forceEnableMixins') ? project.forceEnableMixins.toBoolean() : false -String channel = project.findProperty('channel') ? project.channel : 'stable' -String mappingsVersion = project.findProperty('mappingsVersion') ? project.mappingsVersion : '12' -String remoteMappings = project.findProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/' - +boolean noPublishedSources = project.hasProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false +boolean usesMixinDebug = project.hasProperty('usesMixinDebug') ?: project.usesMixins.toBoolean() +boolean forceEnableMixins = project.hasProperty('forceEnableMixins') ? project.forceEnableMixins.toBoolean() : false +String channel = project.hasProperty('channel') ? project.channel : 'stable' +String mappingsVersion = project.hasProperty('mappingsVersion') ? project.mappingsVersion : '12' String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" String kotlinSourceDir = "src/main/kotlin/" @@ -122,53 +139,53 @@ String kotlinSourceDir = "src/main/kotlin/" String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") -if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { +if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin) } -if(apiPackage) { +if (apiPackage) { targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") - if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { + if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin) } } -if(accessTransformersFile) { +if (accessTransformersFile) { String targetFile = "src/main/resources/META-INF/" + accessTransformersFile - if(!getFile(targetFile).exists()) { + if (!getFile(targetFile).exists()) { throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) } } -if(usesMixins.toBoolean()) { - if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) { +if (usesMixins.toBoolean()) { + if (mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) { throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!") } targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") - if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { - throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin) + if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { + throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin) } String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala" String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt" - if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) { + if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) { throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin) } } -if(coreModClass) { +if (coreModClass) { String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala" String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt" - if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) { + if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) { throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin) } } @@ -209,15 +226,14 @@ ext { modVersion = identifiedVersion } -if(identifiedVersion == versionOverride) { +if (identifiedVersion == versionOverride) { out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7') } group = modGroup -if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) { +if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) { archivesBaseName = customArchiveBaseName -} -else { +} else { archivesBaseName = modId } @@ -243,16 +259,16 @@ minecraft { if (replaceGradleTokenInFile) { replaceIn replaceGradleTokenInFile - if(gradleTokenModId) { + if (gradleTokenModId) { replace gradleTokenModId, modId } - if(gradleTokenModName) { + if (gradleTokenModName) { replace gradleTokenModName, modName } - if(gradleTokenVersion) { + if (gradleTokenVersion) { replace gradleTokenVersion, modVersion } - if(gradleTokenGroupName) { + if (gradleTokenGroupName) { replace gradleTokenGroupName, modGroup } } @@ -261,7 +277,7 @@ minecraft { args(arguments) jvmArgs(jvmArguments) - if(developmentEnvironmentUserName) { + if (developmentEnvironmentUserName) { args("--username", developmentEnvironmentUserName) } } @@ -272,7 +288,7 @@ minecraft { } } -if(file('addon.gradle').exists()) { +if (file('addon.gradle').exists()) { apply from: 'addon.gradle' } @@ -289,7 +305,7 @@ repositories { name 'Overmind forge repo mirror' url 'https://gregtech.overminddl1.com/' } - if(usesMixins.toBoolean() || forceEnableMixins) { + if (usesMixins.toBoolean() || forceEnableMixins) { maven { name 'sponge' url 'https://repo.spongepowered.org/repository/maven-public' @@ -301,13 +317,13 @@ repositories { } dependencies { - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean()) { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT') } - if(usesMixins.toBoolean() || forceEnableMixins) { + if (usesMixins.toBoolean() || forceEnableMixins) { // using 0.8 to workaround a issue in 0.7 which fails mixin application compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') { // Mixin includes a lot of dependencies that are too up-to-date @@ -365,7 +381,10 @@ shadowJar { } minimize() // This will only allow shading for actually used classes - configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile] + configurations = [ + project.configurations.shadowImplementation, + project.configurations.shadowCompile + ] dependsOn(relocateShadowJar) } @@ -380,20 +399,20 @@ jar { attributes(getManifestAttributes()) } - if(usesShadowedDependencies.toBoolean()) { + if (usesShadowedDependencies.toBoolean()) { dependsOn(shadowJar) enabled = false } } reobf { - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean()) { addExtraSrgFile mixinSrg } } afterEvaluate { - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean()) { tasks.compileJava { options.compilerArgs += [ "-AreobfSrgFile=${tasks.reobf.srg}", @@ -408,7 +427,7 @@ afterEvaluate { } runClient { - if(developmentEnvironmentUserName) { + if (developmentEnvironmentUserName) { arguments += [ "--username", developmentEnvironmentUserName @@ -436,6 +455,7 @@ processResources { // this will ensure that this task is redone when the versions change. inputs.property "version", project.version inputs.property "mcversion", project.minecraft.version + exclude("spotless.gradle") // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { @@ -448,43 +468,44 @@ processResources { "modName": modName } - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean()) { from refMap } // copy everything else that's not the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' + exclude 'spotless.gradle' } } def getManifestAttributes() { def manifestAttributes = [:] - if(!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) { + if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) { manifestAttributes += ["FMLCorePluginContainsFMLMod": true] } - if(accessTransformersFile) { - manifestAttributes += ["FMLAT" : accessTransformersFile.toString()] + if (accessTransformersFile) { + manifestAttributes += ["FMLAT": accessTransformersFile.toString()] } - if(coreModClass) { + if (coreModClass) { manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass] } - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean()) { manifestAttributes += [ - "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker", - "MixinConfigs" : "mixins." + modId + ".json", - "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean() + "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker", + "MixinConfigs" : "mixins." + modId + ".json", + "ForceLoadAsMod": !containsMixinsAndOrCoreModOnly.toBoolean() ] } return manifestAttributes } task sourcesJar(type: Jar) { - from (sourceSets.main.allSource) - from (file("$projectDir/LICENSE")) + from(sourceSets.main.allSource) + from(file("$projectDir/LICENSE")) getArchiveClassifier().set('sources') } @@ -503,7 +524,10 @@ task shadowDevJar(type: ShadowJar) { } minimize() // This will only allow shading for actually used classes - configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile] + configurations = [ + project.configurations.shadowImplementation, + project.configurations.shadowCompile + ] } task relocateShadowDevJar(type: ConfigureShadowRelocation) { @@ -531,22 +555,22 @@ task devJar(type: Jar) { attributes(getManifestAttributes()) } - if(usesShadowedDependencies.toBoolean()) { + if (usesShadowedDependencies.toBoolean()) { dependsOn(circularResolverJar) enabled = false } } task apiJar(type: Jar) { - from (sourceSets.main.allSource) { + from(sourceSets.main.allSource) { include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPack