From 0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 30 Jan 2023 10:56:42 -0800 Subject: [ci skip] spotlessApply with the new settings --- src/main/java/gregtech/GT_Mod.java | 246 +- src/main/java/gregtech/api/GregTech_API.java | 746 +- .../api/damagesources/GT_DamageSources.java | 13 +- .../api/enchants/Enchantment_EnderDamage.java | 29 +- .../gregtech/api/enchants/Enchantment_Hazmat.java | 8 +- .../api/enchants/Enchantment_Radioactivity.java | 10 +- .../java/gregtech/api/enums/ConfigCategories.java | 4 +- src/main/java/gregtech/api/enums/Dyes.java | 31 +- src/main/java/gregtech/api/enums/Element.java | 13 +- src/main/java/gregtech/api/enums/FluidState.java | 6 +- .../java/gregtech/api/enums/GT_HatchElement.java | 29 +- src/main/java/gregtech/api/enums/GT_Values.java | 406 +- .../java/gregtech/api/enums/HeatingCoilLevel.java | 33 +- src/main/java/gregtech/api/enums/ItemList.java | 219 +- .../java/gregtech/api/enums/MaterialBuilder.java | 58 +- src/main/java/gregtech/api/enums/Materials.java | 685 +- .../java/gregtech/api/enums/MaterialsBotania.java | 119 +- .../java/gregtech/api/enums/MaterialsKevlar.java | 555 +- .../java/gregtech/api/enums/MaterialsOreAlum.java | 72 +- src/main/java/gregtech/api/enums/OrePrefixes.java | 4177 +---- src/main/java/gregtech/api/enums/ParticleFX.java | 1 + .../java/gregtech/api/enums/SoundResource.java | 19 +- src/main/java/gregtech/api/enums/SteamVariant.java | 1 + src/main/java/gregtech/api/enums/SubTag.java | 83 +- src/main/java/gregtech/api/enums/TC_Aspects.java | 24 +- src/main/java/gregtech/api/enums/TextureSet.java | 352 +- src/main/java/gregtech/api/enums/Textures.java | 1099 +- src/main/java/gregtech/api/enums/Tier.java | 891 +- src/main/java/gregtech/api/enums/TierEU.java | 2 +- .../java/gregtech/api/enums/ToolDictNames.java | 1 + .../gregtech/api/events/BlockScanningEvent.java | 19 +- src/main/java/gregtech/api/fluid/FluidTankGT.java | 27 +- .../java/gregtech/api/fluid/GT_FluidFactory.java | 92 +- .../java/gregtech/api/graphs/GenerateNodeMap.java | 45 +- .../gregtech/api/graphs/GenerateNodeMapPower.java | 33 +- src/main/java/gregtech/api/graphs/Lock.java | 2 + src/main/java/gregtech/api/graphs/Node.java | 8 +- src/main/java/gregtech/api/graphs/NodeList.java | 1 + src/main/java/gregtech/api/graphs/PowerNode.java | 5 +- src/main/java/gregtech/api/graphs/PowerNodes.java | 66 +- .../api/graphs/consumers/ConsumerNode.java | 5 +- .../api/graphs/consumers/EmptyPowerConsumer.java | 7 +- .../api/graphs/consumers/NodeEnergyConnected.java | 9 +- .../api/graphs/consumers/NodeEnergyReceiver.java | 108 +- .../api/graphs/consumers/NodeEnergySink.java | 11 +- .../api/graphs/consumers/NodeGTBaseMetaTile.java | 8 +- .../java/gregtech/api/graphs/paths/NodePath.java | 1 + .../gregtech/api/graphs/paths/PowerNodePath.java | 4 +- src/main/java/gregtech/api/gui/GT_Container.java | 98 +- .../api/gui/GT_ContainerMetaTile_Machine.java | 54 +- .../java/gregtech/api/gui/GT_Container_1by1.java | 3 +- .../java/gregtech/api/gui/GT_Container_2by2.java | 3 +- .../java/gregtech/api/gui/GT_Container_3by3.java | 3 +- .../java/gregtech/api/gui/GT_Container_4by4.java | 3 +- .../api/gui/GT_Container_BasicMachine.java | 13 +- .../gregtech/api/gui/GT_Container_BasicTank.java | 30 +- .../api/gui/GT_Container_MultiMachine.java | 8 +- .../java/gregtech/api/gui/GT_GUIColorOverride.java | 19 +- .../java/gregtech/api/gui/GT_GUIContainer.java | 21 +- .../api/gui/GT_GUIContainerMetaTile_Machine.java | 68 +- .../gregtech/api/gui/GT_GUIContainer_1by1.java | 7 +- .../gregtech/api/gui/GT_GUIContainer_2by2.java | 7 +- .../gregtech/api/gui/GT_GUIContainer_3by3.java | 7 +- .../gregtech/api/gui/GT_GUIContainer_4by4.java | 7 +- .../api/gui/GT_GUIContainer_BasicMachine.java | 130 +- .../api/gui/GT_GUIContainer_BasicTank.java | 9 +- .../api/gui/GT_GUIContainer_MultiMachine.java | 59 +- src/main/java/gregtech/api/gui/GT_GUICover.java | 19 +- .../gregtech/api/gui/GT_GUIDialogSelectItem.java | 62 +- src/main/java/gregtech/api/gui/GT_GUIScreen.java | 19 +- src/main/java/gregtech/api/gui/GT_Slot_Armor.java | 1 + .../java/gregtech/api/gui/GT_Slot_DataOrb.java | 4 +- src/main/java/gregtech/api/gui/GT_Slot_Holo.java | 20 +- src/main/java/gregtech/api/gui/GT_Slot_Output.java | 1 + src/main/java/gregtech/api/gui/GT_Slot_Render.java | 4 +- .../gui/modularui/FallbackableSteamTexture.java | 8 +- .../api/gui/modularui/GT_CoverUIBuildContext.java | 25 +- .../gregtech/api/gui/modularui/GT_UIInfos.java | 181 +- .../gregtech/api/gui/modularui/GT_UITextures.java | 320 +- .../gregtech/api/gui/modularui/GUITextureSet.java | 21 +- .../api/gui/modularui/IDataFollowerWidget.java | 29 +- .../gregtech/api/gui/modularui/SteamTexture.java | 19 +- .../api/gui/widgets/GT_GuiCoverTabLine.java | 102 +- .../api/gui/widgets/GT_GuiFakeItemButton.java | 40 +- .../java/gregtech/api/gui/widgets/GT_GuiIcon.java | 31 +- .../gregtech/api/gui/widgets/GT_GuiIconButton.java | 11 +- .../api/gui/widgets/GT_GuiIconCheckButton.java | 12 +- .../api/gui/widgets/GT_GuiIntegerTextBox.java | 8 +- .../api/gui/widgets/GT_GuiSlotTooltip.java | 5 +- .../api/gui/widgets/GT_GuiSmartTooltip.java | 5 +- .../java/gregtech/api/gui/widgets/GT_GuiTab.java | 48 +- .../gregtech/api/gui/widgets/GT_GuiTabLine.java | 68 +- .../gregtech/api/gui/widgets/GT_GuiTooltip.java | 12 +- .../api/gui/widgets/GT_GuiTooltipManager.java | 7 +- .../gregtech/api/interfaces/IBlockContainer.java | 1 + .../gregtech/api/interfaces/IBlockOnWalkOver.java | 1 + .../java/gregtech/api/interfaces/IChunkLoader.java | 1 + .../api/interfaces/IColorModulationContainer.java | 1 + .../java/gregtech/api/interfaces/ICondition.java | 8 + .../interfaces/IConfigurationCircuitSupport.java | 9 +- .../gregtech/api/interfaces/IDamagableItem.java | 1 + .../gregtech/api/interfaces/IDebugableBlock.java | 12 +- .../java/gregtech/api/interfaces/IDescribable.java | 1 + .../api/interfaces/IDragAndDropSupport.java | 32 +- .../java/gregtech/api/interfaces/IFoodStat.java | 4 +- .../api/interfaces/IGlobalWirelessEnergy.java | 4 +- .../java/gregtech/api/interfaces/IGuiIcon.java | 1 + .../java/gregtech/api/interfaces/IGuiScreen.java | 4 +- .../api/interfaces/IHasFluidDisplayItem.java | 1 + .../api/interfaces/IHasIndexedTexture.java | 2 + .../gregtech/api/interfaces/IHatchElement.java | 63 +- .../java/gregtech/api/interfaces/IHeatingCoil.java | 4 +- .../gregtech/api/interfaces/IIconContainer.java | 9 +- .../gregtech/api/interfaces/IItemBehaviour.java | 45 +- .../gregtech/api/interfaces/IItemContainer.java | 1 + .../gregtech/api/interfaces/IMaterialHandler.java | 1 + .../api/interfaces/INetworkUpdatableItem.java | 14 +- .../api/interfaces/IOreRecipeRegistrator.java | 7 +- .../gregtech/api/interfaces/IProjectileItem.java | 14 +- .../api/interfaces/IRedstoneCircuitBlock.java | 10 +- .../api/interfaces/ISecondaryDescribable.java | 1 + .../gregtech/api/interfaces/ISubTagContainer.java | 1 + .../java/gregtech/api/interfaces/ITexture.java | 9 +- .../gregtech/api/interfaces/ITextureBuilder.java | 26 +- .../java/gregtech/api/interfaces/IToolStats.java | 40 +- .../api/interfaces/covers/IControlsWorkCover.java | 4 +- .../api/interfaces/fluid/IGT_FluidBuilder.java | 9 +- .../api/interfaces/fluid/IGT_RegisteredFluid.java | 18 +- .../api/interfaces/internal/IBCTileEntity.java | 2 +- .../interfaces/internal/IGT_CraftingRecipe.java | 1 + .../gregtech/api/interfaces/internal/IGT_Mod.java | 10 +- .../api/interfaces/internal/IGT_RecipeAdder.java | 1027 +- .../api/interfaces/internal/IIC2TileEntity.java | 3 +- .../api/interfaces/internal/IThaumcraftCompat.java | 66 +- .../api/interfaces/internal/IUETileEntity.java | 2 +- .../interfaces/metatileentity/IConnectable.java | 5 +- .../interfaces/metatileentity/IFluidLockable.java | 6 +- .../metatileentity/IMachineCallback.java | 1 + .../interfaces/metatileentity/IMetaTileEntity.java | 171 +- .../metatileentity/IMetaTileEntityCable.java | 6 +- .../metatileentity/IMetaTileEntityItemPipe.java | 38 +- .../api/interfaces/modularui/IAddGregtechLogo.java | 1 + .../interfaces/modularui/IAddInventorySlots.java | 1 + .../api/interfaces/modularui/IAddUIWidgets.java | 1 + .../interfaces/modularui/IGetGUITextureSet.java | 1 + .../api/interfaces/modularui/IGetTitleColor.java | 1 + .../tileentity/IBasicEnergyContainer.java | 20 +- .../interfaces/tileentity/IColoredTileEntity.java | 5 +- .../api/interfaces/tileentity/ICoverable.java | 22 +- .../tileentity/IDebugableTileEntity.java | 9 +- .../api/interfaces/tileentity/IDigitalChest.java | 14 +- .../interfaces/tileentity/IEnergyConductor.java | 1 + .../interfaces/tileentity/IEnergyConnected.java | 27 +- .../tileentity/IExperimentalEnergyTileEntity.java | 55 +- .../api/interfaces/tileentity/IFibreConnected.java | 1 + .../tileentity/IGearEnergyTileEntity.java | 9 +- .../tileentity/IGregTechDeviceInformation.java | 11 +- .../interfaces/tileentity/IGregTechTileEntity.java | 60 +- .../tileentity/IGregtechWailaProvider.java | 17 +- .../api/interfaces/tileentity/IHasInventory.java | 14 +- .../tileentity/IHasWorldObjectAndCoords.java | 16 +- .../api/interfaces/tileentity/IIC2Enet.java | 1 + .../tileentity/IMachineBlockUpdateable.java | 11 +- .../interfaces/tileentity/IMachineProgress.java | 14 +- .../tileentity/IPipeRenderedTileEntity.java | 1 + .../interfaces/tileentity/IRedstoneEmitter.java | 11 +- .../interfaces/tileentity/IRedstoneReceiver.java | 6 +- .../interfaces/tileentity/IRedstoneTileEntity.java | 4 +- .../interfaces/tileentity/ITexturedTileEntity.java | 4 +- .../api/interfaces/tileentity/ITurnable.java | 1 + .../interfaces/tileentity/IUpgradableMachine.java | 1 + .../api/items/GT_Block_LongDistancePipe.java | 26 +- .../gregtech/api/items/GT_BreederCell_Item.java | 52 +- .../gregtech/api/items/GT_CoolantCellIC_Item.java | 15 +- .../gregtech/api/items/GT_CoolantCell_Item.java | 12 +- .../gregtech/api/items/GT_EnergyArmor_Item.java | 88 +- .../java/gregtech/api/items/GT_Generic_Block.java | 6 +- .../java/gregtech/api/items/GT_Generic_Item.java | 41 +- .../java/gregtech/api/items/GT_MetaBase_Item.java | 362 +- .../gregtech/api/items/GT_MetaGenerated_Item.java | 261 +- .../api/items/GT_MetaGenerated_Item_X01.java | 71 +- .../api/items/GT_MetaGenerated_Item_X32.java | 49 +- .../gregtech/api/items/GT_MetaGenerated_Tool.java | 471 +- .../api/items/GT_RadioactiveCellIC_Item.java | 65 +- .../api/items/GT_RadioactiveCell_Item.java | 17 +- .../gregtech/api/items/GT_SolderingTool_Item.java | 48 +- .../java/gregtech/api/items/GT_Spray_Bug_Item.java | 71 +- .../gregtech/api/items/GT_Spray_Foam_Item.java | 144 +- .../gregtech/api/items/GT_Spray_Hardener_Item.java | 49 +- .../api/items/GT_Spray_Hydration_Item.java | 42 +- .../java/gregtech/api/items/GT_Spray_Ice_Item.java | 69 +- .../gregtech/api/items/GT_Spray_Pepper_Item.java | 70 +- src/main/java/gregtech/api/items/GT_Tool_Item.java | 35 +- .../api/metatileentity/BaseMetaPipeEntity.java | 336 +- .../api/metatileentity/BaseMetaTileEntity.java | 746 +- .../api/metatileentity/BaseTileEntity.java | 319 +- .../api/metatileentity/CommonMetaTileEntity.java | 15 +- .../api/metatileentity/CoverableTileEntity.java | 272 +- .../metatileentity/GregTechTileClientEvents.java | 1 + .../api/metatileentity/MetaPipeEntity.java | 293 +- .../api/metatileentity/MetaTileEntity.java | 236 +- .../api/metatileentity/TileIC2EnergySink.java | 55 +- .../examples/GT_MetaTileEntity_E_Furnace.java | 61 +- .../implementations/GT_MetaPipeEntity_Cable.java | 371 +- .../implementations/GT_MetaPipeEntity_Fluid.java | 343 +- .../implementations/GT_MetaPipeEntity_Frame.java | 43 +- .../implementations/GT_MetaPipeEntity_Item.java | 305 +- .../GT_MetaTileEntity_BasicBatteryBuffer.java | 220 +- .../GT_MetaTileEntity_BasicGenerator.java | 91 +- .../GT_MetaTileEntity_BasicHull.java | 58 +- .../GT_MetaTileEntity_BasicHull_NonElectric.java | 22 +- .../GT_MetaTileEntity_BasicMachine.java | 641 +- .../GT_MetaTileEntity_BasicMachine_Bronze.java | 254 +- .../GT_MetaTileEntity_BasicMachine_GT_Recipe.java | 418 +- .../GT_MetaTileEntity_BasicMachine_Steel.java | 151 +- .../GT_MetaTileEntity_BasicTank.java | 120 +- .../implementations/GT_MetaTileEntity_Buffer.java | 258 +- .../GT_MetaTileEntity_CubicMultiBlockBase.java | 81 +- .../GT_MetaTileEntity_EnhancedMultiBlockBase.java | 225 +- ...MetaTileEntity_ExtendedPowerMultiBlockBase.java | 93 +- .../implementations/GT_MetaTileEntity_Hatch.java | 80 +- .../GT_MetaTileEntity_Hatch_DataAccess.java | 28 +- .../GT_MetaTileEntity_Hatch_Dynamo.java | 24 +- .../GT_MetaTileEntity_Hatch_Energy.java | 41 +- .../GT_MetaTileEntity_Hatch_Input.java | 53 +- .../GT_MetaTileEntity_Hatch_InputBus.java | 44 +- .../GT_MetaTileEntity_Hatch_Maintenance.java | 178 +- .../GT_MetaTileEntity_Hatch_Muffler.java | 62 +- .../GT_MetaTileEntity_Hatch_MultiInput.java | 71 +- .../GT_MetaTileEntity_Hatch_Output.java | 182 +- .../GT_MetaTileEntity_Hatch_OutputBus.java | 52 +- .../GT_MetaTileEntity_MultiBlockBase.java | 493 +- .../GT_MetaTileEntity_SpecialFilter.java | 144 +- .../GT_MetaTileEntity_TieredMachineBlock.java | 54 +- .../GT_MetaTileEntity_TooltipMultiBlockBase.java | 11 +- .../GT_MetaTileEntity_Transformer.java | 253 +- .../GT_MetaTileEntity_Wireless_Dynamo.java | 27 +- .../GT_MetaTileEntity_Wireless_Hatch.java | 30 +- .../api/multitileentity/MultiTileEntityBlock.java | 242 +- .../MultiTileEntityBlockInternal.java | 35 +- .../MultiTileEntityClassContainer.java | 25 +- .../multitileentity/MultiTileEntityContainer.java | 4 +- .../MultiTileEntityItemInternal.java | 107 +- .../multitileentity/MultiTileEntityRegistry.java | 107 +- .../multitileentity/base/BaseMultiTileEntity.java | 377 +- .../base/BaseNontickableMultiTileEntity.java | 10 +- .../base/BaseTickableMultiTileEntity.java | 16 +- .../multitileentity/interfaces/IItemUpdatable.java | 8 +- .../interfaces/IMultiBlockController.java | 1 + .../interfaces/IMultiBlockEnergy.java | 1 + .../interfaces/IMultiBlockFluidHandler.java | 4 +- .../interfaces/IMultiBlockInventory.java | 7 +- .../interfaces/IMultiBlockPart.java | 1 + .../interfaces/IMultiTileEntity.java | 130 +- .../machine/MultiTileBasicMachine.java | 80 +- .../multiblock/base/MultiBlockController.java | 334 +- .../multiblock/base/MultiBlockPart.java | 150 +- .../multiblock/base/MultiBlock_Stackable.java | 7 +- .../multiblock/casing/CasingBehaviorBase.java | 16 +- src/main/java/gregtech/api/net/GT_Packet.java | 13 +- .../gregtech/api/net/GT_Packet_Block_Event.java | 12 +- .../api/net/GT_Packet_ClientPreference.java | 11 +- .../api/net/GT_Packet_GtTileEntityGuiRequest.java | 26 +- .../api/net/GT_Packet_MultiTileEntity.java | 21 +- src/main/java/gregtech/api/net/GT_Packet_New.java | 2 + .../java/gregtech/api/net/GT_Packet_Pollution.java | 7 +- .../api/net/GT_Packet_RequestCoverData.java | 19 +- .../gregtech/api/net/GT_Packet_SendCoverData.java | 11 +- .../api/net/GT_Packet_SetConfigurationCircuit.java | 20 +- .../gregtech/api/net/GT_Packet_SetLockedFluid.java | 21 +- .../java/gregtech/api/net/GT_Packet_Sound.java | 10 +- .../gregtech/api/net/GT_Packet_TileEntity.java | 92 +- .../api/net/GT_Packet_TileEntityCover.java | 11 +- .../api/net/GT_Packet_TileEntityCoverGUI.java | 52 +- .../api/net/GT_Packet_TileEntityCoverNew.java | 21 +- .../gregtech/api/net/GT_Packet_UpdateItem.java | 13 +- .../api/net/GT_Packet_WirelessRedstoneCover.java | 22 +- .../java/gregtech/api/net/IGT_NetworkHandler.java | 4 +- .../api/objects/AE2DigitalChestHandler.java | 20 +- .../java/gregtech/api/objects/CollectorUtils.java | 14 +- .../java/gregtech/api/objects/ElementStack.java | 8 +- .../java/gregtech/api/objects/GT_ArrayList.java | 22 +- .../java/gregtech/api/objects/GT_ChunkManager.java | 80 +- .../api/objects/GT_CopiedBlockTexture.java | 4 +- .../gregtech/api/objects/GT_Cover_Default.java | 17 +- .../java/gregtech/api/objects/GT_Cover_None.java | 183 +- src/main/java/gregtech/api/objects/GT_Fluid.java | 7 +- .../java/gregtech/api/objects/GT_FluidStack.java | 20 +- src/main/java/gregtech/api/objects/GT_HashSet.java | 7 +- .../java/gregtech/api/objects/GT_ItemStack.java | 6 +- .../java/gregtech/api/objects/GT_ItemStack2.java | 4 +- .../java/gregtech/api/objects/GT_MultiTexture.java | 10 +- .../gregtech/api/objects/GT_RenderedTexture.java | 1 + .../java/gregtech/api/objects/GT_SidedTexture.java | 31 +- .../api/objects/GT_StdRenderedTexture.java | 15 +- .../java/gregtech/api/objects/GT_UO_Dimension.java | 9 +- .../gregtech/api/objects/GT_UO_DimensionList.java | 28 +- .../java/gregtech/api/objects/GT_UO_Fluid.java | 27 +- src/main/java/gregtech/api/objects/ItemData.java | 40 +- .../java/gregtech/api/objects/MaterialStack.java | 9 +- src/main/java/gregtech/api/objects/ObjMap.java | 24 +- .../gregtech/api/objects/ReverseShapedRecipe.java | 13 +- .../api/objects/ReverseShapelessRecipe.java | 13 +- src/main/java/gregtech/api/objects/XSTR.java | 144 +- .../api/objects/iterators/MergedIterator.java | 1 + .../java/gregtech/api/render/TextureFactory.java | 71 +- .../api/threads/GT_Runnable_Cable_Update.java | 21 +- .../threads/GT_Runnable_MachineBlockUpdate.java | 25 +- .../gregtech/api/threads/GT_Runnable_Sound.java | 28 +- .../gregtech/api/util/ColorsMetadataSection.java | 11 +- .../api/util/ColorsMetadataSectionSerializer.java | 22 +- .../java/gregtech/api/util/GT_ApiaryModifier.java | 1 + .../java/gregtech/api/util/GT_ApiaryUpgrade.java | 31 +- .../gregtech/api/util/GT_AssemblyLineUtils.java | 104 +- .../gregtech/api/util/GT_Assemblyline_Server.java | 439 +- src/main/java/gregtech/api/util/GT_BaseCrop.java | 120 +- src/main/java/gregtech/api/util/GT_BlockMap.java | 7 +- src/main/java/gregtech/api/util/GT_BlockSet.java | 1 + src/main/java/gregtech/api/util/GT_CLS_Compat.java | 38 +- .../gregtech/api/util/GT_ChunkAssociatedData.java | 95 +- .../gregtech/api/util/GT_CircuitryBehavior.java | 100 +- .../gregtech/api/util/GT_ClientPreference.java | 9 +- src/main/java/gregtech/api/util/GT_Config.java | 32 +- .../java/gregtech/api/util/GT_CoverBehavior.java | 242 +- .../gregtech/api/util/GT_CoverBehaviorBase.java | 373 +- .../java/gregtech/api/util/GT_CreativeTab.java | 4 +- .../api/util/GT_ExoticEnergyInputHelper.java | 37 +- src/main/java/gregtech/api/util/GT_FoodStat.java | 58 +- .../java/gregtech/api/util/GT_Forestry_Compat.java | 92 +- src/main/java/gregtech/api/util/GT_GC_Compat.java | 14 +- .../gregtech/api/util/GT_HatchElementBuilder.java | 210 +- .../java/gregtech/api/util/GT_IBoxableWrapper.java | 4 +- .../api/util/GT_ItsNotMyFaultException.java | 1 + .../java/gregtech/api/util/GT_LanguageManager.java | 58 +- src/main/java/gregtech/api/util/GT_Log.java | 5 +- src/main/java/gregtech/api/util/GT_ModHandler.java | 1040 +- .../api/util/GT_Multiblock_Tooltip_Builder.java | 219 +- .../gregtech/api/util/GT_OreDictUnificator.java | 112 +- .../gregtech/api/util/GT_OverclockCalculator.java | 46 +- .../gregtech/api/util/GT_PCBFactoryManager.java | 1 + .../java/gregtech/api/util/GT_ParallelHelper.java | 53 +- .../java/gregtech/api/util/GT_PlayedSound.java | 4 +- .../api/util/GT_ProcessingArray_Manager.java | 7 +- src/main/java/gregtech/api/util/GT_Recipe.java | 4724 +++--- .../gregtech/api/util/GT_RecipeRegistrator.java | 483 +- .../java/gregtech/api/util/GT_RenderingWorld.java | 17 +- .../java/gregtech/api/util/GT_Shaped_Recipe.java | 54 +- .../gregtech/api/util/GT_Shapeless_Recipe.java | 84 +- .../gregtech/api/util/GT_Single_Recipe_Check.java | 40 +- .../GT_Single_Recipe_Check_Processing_Array.java | 21 +- .../gregtech/api/util/GT_SpawnEventHandler.java | 24 +- .../gregtech/api/util/GT_StructureUtility.java | 295 +- .../gregtech/api/util/GT_TooltipDataCache.java | 22 +- src/main/java/gregtech/api/util/GT_Util.java | 56 +- src/main/java/gregtech/api/util/GT_Utility.java | 1781 ++- .../java/gregtech/api/util/GT_UtilityClient.java | 21 +- .../java/gregtech/api/util/IGT_HatchAdder.java | 1 + .../gregtech/api/util/ISerializableObject.java | 32 +- .../java/gregtech/api/util/LightingHelper.java | 504 +- .../api/util/WorldSpawnedEventBuilder.java | 96 +- .../gregtech/api/util/extensions/ArrayExt.java | 1 + .../gregtech/api/util/extensions/IteratorExt.java | 4 +- src/main/java/gregtech/api/world/GT_Worldgen.java | 55 +- .../java/gregtech/api/world/GT_Worldgen_Ore.java | 19 +- .../api/world/GT_Worldgen_Ore_SingleBlock.java | 37 +- .../GT_Worldgen_Ore_SingleBlock_UnderLava.java | 39 +- .../java/gregtech/client/GT_GUI_ClientConfig.java | 15 +- src/main/java/gregtech/client/GT_GuiFactory.java | 5 +- .../java/gregtech/client/GT_TooltipHandler.java | 31 +- src/main/java/gregtech/common/GT_Client.java | 330 +- src/main/java/gregtech/common/GT_DummyWorld.java | 102 +- .../java/gregtech/common/GT_IteratorRandom.java | 1 + src/main/java/gregtech/common/GT_Network.java | 50 +- .../gregtech/common/GT_PlayerActivityLogger.java | 9 +- src/main/java/gregtech/common/GT_Pollution.java | 168 +- src/main/java/gregtech/common/GT_Proxy.java | 2073 +-- src/main/java/gregtech/common/GT_RecipeAdder.java | 1762 +-- src/main/java/gregtech/common/GT_Server.java | 1 + .../java/gregtech/common/GT_ThaumcraftCompat.java | 86 +- .../java/gregtech/common/GT_UndergroundOil.java | 82 +- .../gregtech/common/GT_Worldgen_GT_Ore_Layer.java | 437 +- .../common/GT_Worldgen_GT_Ore_SmallPieces.java | 88 +- .../java/gregtech/common/GT_Worldgen_Stone.java | 235 +- .../java/gregtech/common/GT_Worldgenerator.java | 353 +- .../gregtech/common/bees/GT_AlleleBeeSpecies.java | 20 +- .../java/gregtech/common/bees/GT_AlleleHelper.java | 97 +- .../java/gregtech/common/bees/GT_Bee_Mutation.java | 48 +- .../gregtech/common/blocks/GT_Block_Casings1.java | 31 +- .../gregtech/common/blocks/GT_Block_Casings2.java | 19 +- .../gregtech/common/blocks/GT_Block_Casings3.java | 15 +- .../gregtech/common/blocks/GT_Block_Casings4.java | 114 +- .../gregtech/common/blocks/GT_Block_Casings5.java | 8 +- .../gregtech/common/blocks/GT_Block_Casings6.java | 8 +- .../gregtech/common/blocks/GT_Block_Casings8.java | 65 +- .../gregtech/common/blocks/GT_Block_Casings9.java | 10 +- .../common/blocks/GT_Block_Casings_Abstract.java | 21 +- .../gregtech/common/blocks/GT_Block_Concretes.java | 15 +- .../gregtech/common/blocks/GT_Block_Granites.java | 10 +- .../gregtech/common/blocks/GT_Block_Machines.java | 115 +- .../gregtech/common/blocks/GT_Block_Metal.java | 8 +- .../java/gregtech/common/blocks/GT_Block_Ores.java | 75 +- .../common/blocks/GT_Block_Ores_Abstract.java | 86 +- .../gregtech/common/blocks/GT_Block_Ores_UB1.java | 60 +- .../gregtech/common/blocks/GT_Block_Ores_UB2.java | 64 +- .../gregtech/common/blocks/GT_Block_Ores_UB3.java | 64 +- .../common/blocks/GT_Block_Reinforced.java | 87 +- .../gregtech/common/blocks/GT_Block_Stones.java | 18 +- .../common/blocks/GT_Block_Stones_Abstract.java | 47 +- .../gregtech/common/blocks/GT_Block_Storage.java | 10 +- .../gregtech/common/blocks/GT_Cyclotron_Coils.java | 10 +- .../common/blocks/GT_Cyclotron_Item_Casings.java | 1 + .../gregtech/common/blocks/GT_Item_Casings1.java | 1 + .../gregtech/common/blocks/GT_Item_Casings2.java | 2 + .../gregtech/common/blocks/GT_Item_Casings3.java | 1 + .../gregtech/common/blocks/GT_Item_Casings4.java | 1 + .../gregtech/common/blocks/GT_Item_Casings5.java | 19 +- .../gregtech/common/blocks/GT_Item_Casings6.java | 1 + .../gregtech/common/blocks/GT_Item_Casings8.java | 1 + .../gregtech/common/blocks/GT_Item_Casings9.java | 1 + .../common/blocks/GT_Item_Casings_Abstract.java | 55 +- .../gregtech/common/blocks/GT_Item_Concretes.java | 9 +- .../gregtech/common/blocks/GT_Item_Granites.java | 1 + .../common/blocks/GT_Item_LongDistancePipe.java | 15 +- .../gregtech/common/blocks/GT_Item_Machines.java | 245 +- .../java/gregtech/common/blocks/GT_Item_Ores.java | 39 +- .../common/blocks/GT_Item_Stones_Abstract.java | 11 +- .../gregtech/common/blocks/GT_Item_Storage.java | 5 +- .../common/blocks/GT_Material_Casings.java | 1 + .../common/blocks/GT_Material_Machines.java | 1 + .../common/blocks/GT_Material_Reinforced.java | 1 + .../gregtech/common/blocks/GT_Packet_Ores.java | 9 +- .../gregtech/common/blocks/GT_TileEntity_Ores.java | 159 +- .../java/gregtech/common/covers/CoverInfo.java | 27 +- .../java/gregtech/common/covers/GT_Cover_Arm.java | 236 +- .../common/covers/GT_Cover_ControlsWork.java | 132 +- .../gregtech/common/covers/GT_Cover_Conveyor.java | 161 +- .../gregtech/common/covers/GT_Cover_Crafting.java | 51 +- .../gregtech/common/covers/GT_Cover_DoesWork.java | 114 +- .../gregtech/common/covers/GT_Cover_Drain.java | 110 +- .../gregtech/common/covers/GT_Cover_EUMeter.java | 160 +- .../gregtech/common/covers/GT_Cover_FacadeAE.java | 4 +- .../common/covers/GT_Cover_FacadeBase.java | 223 +- .../common/covers/GT_Cover_FluidLimiter.java | 63 +- .../common/covers/GT_Cover_FluidRegulator.java | 325 +- .../covers/GT_Cover_FluidStorageMonitor.java | 157 +- .../common/covers/GT_Cover_Fluidfilter.java | 319 +- .../common/covers/GT_Cover_ItemFilter.java | 120 +- .../gregtech/common/covers/GT_Cover_ItemMeter.java | 165 +- .../java/gregtech/common/covers/GT_Cover_Lens.java | 5 +- .../common/covers/GT_Cover_LiquidMeter.java | 121 +- .../common/covers/GT_Cover_NeedMaintainance.java | 220 +- .../common/covers/GT_Cover_PlayerDetector.java | 103 +- .../java/gregtech/common/covers/GT_Cover_Pump.java | 177 +- .../common/covers/GT_Cover_RedstoneConductor.java | 32 +- .../covers/GT_Cover_RedstoneReceiverExternal.java | 15 +- .../covers/GT_Cover_RedstoneReceiverInternal.java | 21 +- .../common/covers/GT_Cover_RedstoneSignalizer.java | 31 +- .../GT_Cover_RedstoneTransmitterExternal.java | 15 +- .../GT_Cover_RedstoneTransmitterInternal.java | 16 +- .../covers/GT_Cover_RedstoneWirelessBase.java | 108 +- .../gregtech/common/covers/GT_Cover_Screen.java | 32 +- .../gregtech/common/covers/GT_Cover_Shutter.java | 124 +- .../common/covers/GT_Cover_SolarPanel.java | 42 +- .../common/covers/GT_Cover_SteamValve.java | 7 +- .../java/gregtech/common/covers/GT_Cover_Vent.java | 21 +- .../GT_Cover_AdvancedRedstoneReceiverBase.java | 61 +- .../GT_Cover_AdvancedRedstoneReceiverExternal.java | 17 +- .../GT_Cover_AdvancedRedstoneReceiverInternal.java | 17 +- .../GT_Cover_AdvancedRedstoneTransmitterBase.java | 64 +- ..._Cover_AdvancedRedstoneTransmitterExternal.java | 13 +- ..._Cover_AdvancedRedstoneTransmitterInternal.java | 17 +- .../GT_Cover_AdvancedWirelessRedstoneBase.java | 117 +- .../redstone/GT_Cover_WirelessFluidDetector.java | 46 +- .../redstone/GT_Cover_WirelessItemDetector.java | 110 +- .../GT_Cover_WirelessMaintenanceDetector.java | 70 +- .../common/entities/GT_EntityFXPollution.java | 1 + .../gregtech/common/entities/GT_Entity_Arrow.java | 156 +- .../common/entities/GT_Entity_Arrow_Potion.java | 30 +- src/main/java/gregtech/common/fluid/GT_Fluid.java | 33 +- .../gregtech/common/fluid/GT_FluidBuilder.java | 18 +- .../gregtech/common/gui/modularui/UIHelper.java | 80 +- .../modularui/uifactory/SelectItemUIFactory.java | 124 +- .../common/gui/modularui/widget/AESlotWidget.java | 7 +- .../modularui/widget/CoverCycleButtonWidget.java | 28 +- .../widget/CoverDataControllerWidget.java | 77 +- .../CoverDataFollower_CycleButtonWidget.java | 5 +- .../widget/CoverDataFollower_SlotWidget.java | 11 +- .../widget/CoverDataFollower_TextFieldWidget.java | 9 +- .../CoverDataFollower_ToggleButtonWidget.java | 8 +- .../gui/modularui/widget/DataControllerWidget.java | 41 +- .../modularui/widget/FluidDisplaySlotWidget.java | 82 +- .../modularui/widget/ItemWatcherSlotWidget.java | 10 +- src/main/java/gregtech/common/items/CombType.java | 39 +- src/main/java/gregtech/common/items/DropType.java | 18 +- .../common/items/GT_DepletetCell_Item.java | 22 +- .../gregtech/common/items/GT_FluidDisplayItem.java | 58 +- .../common/items/GT_IntegratedCircuit_Item.java | 269 +- .../common/items/GT_MetaGenerated_Item_01.java | 6526 ++++---- .../common/items/GT_MetaGenerated_Item_02.java | 4319 ++--- .../common/items/GT_MetaGenerated_Item_03.java | 1434 +- .../common/items/GT_MetaGenerated_Item_98.java | 76 +- .../common/items/GT_MetaGenerated_Item_99.java | 42 +- .../common/items/GT_MetaGenerated_Tool_01.java | 243 +- .../common/items/GT_NeutronReflector_Item.java | 15 +- .../gregtech/common/items/GT_SensorCard_Item.java | 21 +- .../gregtech/common/items/GT_VolumetricFlask.java | 113 +- src/main/java/gregtech/common/items/ItemComb.java | 1390 +- src/main/java/gregtech/common/items/ItemDrop.java | 33 +- .../java/gregtech/common/items/ItemPollen.java | 11 +- .../java/gregtech/common/items/ItemPropolis.java | 38 +- .../java/gregtech/common/items/PollenType.java | 8 +- .../java/gregtech/common/items/PropolisType.java | 7 +- .../common/items/behaviors/Behaviour_Arrow.java | 65 +- .../items/behaviors/Behaviour_Arrow_Potion.java | 40 +- .../items/behaviors/Behaviour_Cover_Tool.java | 94 +- .../common/items/behaviors/Behaviour_Crowbar.java | 24 +- .../common/items/behaviors/Behaviour_DataOrb.java | 7 +- .../items/behaviors/Behaviour_DataStick.java | 7 +- .../common/items/behaviors/Behaviour_Hoe.java | 36 +- .../common/items/behaviors/Behaviour_Lighter.java | 63 +- .../common/items/behaviors/Behaviour_None.java | 62 +- .../behaviors/Behaviour_Plunger_Essentia.java | 45 +- .../items/behaviors/Behaviour_Plunger_Fluid.java | 47 +- .../items/behaviors/Behaviour_Plunger_Item.java | 52 +- .../items/behaviors/Behaviour_PrintedPages.java | 7 +- .../items/behaviors/Behaviour_Prospecting.java | 75 +- .../common/items/behaviors/Behaviour_Scanner.java | 31 +- .../common/items/behaviors/Behaviour_Scoop.java | 42 +- .../items/behaviors/Behaviour_Screwdriver.java | 24 +- .../common/items/behaviors/Behaviour_Sense.java | 29 +- .../items/behaviors/Behaviour_SensorKit.java | 30 +- .../items/behaviors/Behaviour_SoftHammer.java | 65 +- .../items/behaviors/Behaviour_Sonictron.java | 34 +- .../items/behaviors/Behaviour_Spray_Color.java | 40 +- .../items/behaviors/Behaviour_Switch_Metadata.java | 25 +- .../common/items/behaviors/Behaviour_Wrench.java | 67 +- .../items/behaviors/Behaviour_WrittenBook.java | 25 +- .../common/misc/GT_ClientPollutionMap.java | 67 +- src/main/java/gregtech/common/misc/GT_Command.java | 235 +- .../common/misc/GT_DrillingLogicDelegate.java | 56 +- .../misc/GT_IDrillingLogicDelegateOwner.java | 3 +- .../common/misc/GlobalEnergyWorldSavedData.java | 4 +- .../common/net/MessageSetFlaskCapacity.java | 11 +- .../common/net/MessageUpdateFluidDisplayItem.java | 11 +- .../gregtech/common/power/BasicMachineEUPower.java | 6 +- src/main/java/gregtech/common/power/EUPower.java | 1 + src/main/java/gregtech/common/power/Power.java | 1 + .../java/gregtech/common/power/SteamPower.java | 3 +- .../gregtech/common/power/UnspecifiedEUPower.java | 1 + .../redstonecircuits/GT_Circuit_BasicLogic.java | 12 +- .../common/redstonecircuits/GT_Circuit_BitAnd.java | 10 +- .../GT_Circuit_CombinationLock.java | 1 + .../common/redstonecircuits/GT_Circuit_Equals.java | 8 +- .../common/redstonecircuits/GT_Circuit_Pulser.java | 10 +- .../redstonecircuits/GT_Circuit_Randomizer.java | 5 +- .../redstonecircuits/GT_Circuit_RedstoneMeter.java | 8 +- .../redstonecircuits/GT_Circuit_Repeater.java | 1 + .../common/redstonecircuits/GT_Circuit_Timer.java | 1 + .../common/render/CosmicItemRendererGT.java | 4 +- .../gregtech/common/render/GT_CapeRenderer.java | 46 +- .../common/render/GT_CopiedBlockTexture.java | 26 +- .../common/render/GT_CopiedCTMBlockTexture.java | 48 +- .../gregtech/common/render/GT_FlaskRenderer.java | 13 +- .../render/GT_FluidDisplayStackRenderer.java | 20 +- .../gregtech/common/render/GT_IconFlipped.java | 4 +- .../render/GT_MetaGenerated_Tool_Renderer.java | 28 +- .../gregtech/common/render/GT_MultiTexture.java | 14 +- .../common/render/GT_PollutionRenderer.java | 52 +- .../java/gregtech/common/render/GT_RenderUtil.java | 20 +- .../gregtech/common/render/GT_RenderedTexture.java | 69 +- .../gregtech/common/render/GT_Renderer_Block.java | 319 +- .../common/render/GT_Renderer_Entity_Arrow.java | 4 +- .../gregtech/common/render/GT_SidedTexture.java | 32 +- .../gregtech/common/render/GT_TextureBase.java | 6 +- .../gregtech/common/render/GT_TextureBuilder.java | 19 +- .../gregtech/common/render/IRenderedBlock.java | 11 +- .../common/render/IRenderedBlockSideCheck.java | 6 +- .../render/items/CosmicNeutroniumRenderer.java | 11 +- .../render/items/GT_GeneratedItem_Renderer.java | 26 +- .../items/GT_GeneratedMaterial_Renderer.java | 24 +- .../items/GT_MetaGenerated_Item_Renderer.java | 12 +- .../common/render/items/GaiaSpiritRenderer.java | 8 +- .../common/render/items/InfinityRenderer.java | 16 +- .../render/items/TranscendentMetalRenderer.java | 49 +- .../common/render/items/UniversiumRenderer.java | 26 +- .../automation/GT_MetaTileEntity_ChestBuffer.java | 53 +- .../automation/GT_MetaTileEntity_Filter.java | 132 +- .../GT_MetaTileEntity_ItemDistributor.java | 73 +- .../automation/GT_MetaTileEntity_RecipeFilter.java | 43 +- .../automation/GT_MetaTileEntity_Regulator.java | 143 +- .../automation/GT_MetaTileEntity_SuperBuffer.java | 53 +- .../automation/GT_MetaTileEntity_TypeFilter.java | 51 +- .../boilers/GT_MetaTileEntity_Boiler.java | 148 +- .../boilers/GT_MetaTileEntity_Boiler_Bronze.java | 225 +- .../boilers/GT_MetaTileEntity_Boiler_Lava.java | 61 +- .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 163 +- .../GT_MetaTileEntity_Boiler_Solar_Steel.java | 38 +- .../boilers/GT_MetaTileEntity_Boiler_Steel.java | 41 +- .../GT_MetaTileEntity_AdvDebugStructureWriter.java | 201 +- .../GT_MetaTileEntity_DieselGenerator.java | 185 +- .../generators/GT_MetaTileEntity_GasTurbine.java | 182 +- .../generators/GT_MetaTileEntity_LightningRod.java | 69 +- .../GT_MetaTileEntity_MagicEnergyConverter.java | 106 +- .../GT_MetaTileEntity_MagicalEnergyAbsorber.java | 221 +- .../GT_MetaTileEntity_NaquadahReactor.java | 127 +- .../GT_MetaTileEntity_PlasmaGenerator.java | 65 +- .../generators/GT_MetaTileEntity_SteamTurbine.java | 149 +- .../GT_MetaTileEntity_BasicHull_Bronze.java | 24 +- .../GT_MetaTileEntity_BasicHull_BronzeBricks.java | 35 +- .../GT_MetaTileEntity_BasicHull_Steel.java | 18 +- .../GT_MetaTileEntity_BasicHull_SteelBricks.java | 34 +- .../GT_MetaTileEntity_Hatch_InputBus_ME.java | 115 +- .../GT_MetaTileEntity_Hatch_OutputBus_ME.java | 75 +- .../GT_MetaTileEntity_Hatch_Output_ME.java | 78 +- .../GT_MetaTileEntity_AdvSeismicProspector.java | 174 +- .../basic/GT_MetaTileEntity_Boxinator.java | 115 +- .../machines/basic/GT_MetaTileEntity_Charger.java | 29 +- .../basic/GT_MetaTileEntity_CuringOven.java | 94 +- .../basic/GT_MetaTileEntity_Disassembler.java | 197 +- .../basic/GT_MetaTileEntity_IndustrialApiary.java | 474 +- .../basic/GT_MetaTileEntity_Massfabricator.java | 88 +- ..._MetaTileEntity_MicrowaveEnergyTransmitter.java | 235 +- .../machines/basic/GT_MetaTileEntity_Miner.java | 178 +- .../basic/GT_MetaTileEntity_MonsterRepellent.java | 85 +- .../basic/GT_MetaTileEntity_PotionBrewer.java | 83 +- .../machines/basic/GT_MetaTileEntity_Printer.java | 46 +- .../machines/basic/GT_MetaTileEntity_Pump.java | 293 +- .../basic/GT_MetaTileEntity_Replicator.java | 82 +- .../basic/GT_MetaTileEntity_RockBreaker.java | 77 +- .../machines/basic/GT_MetaTileEntity_Scanner.java | 166 +- .../basic/GT_MetaTileEntity_SeismicProspector.java | 213 +- .../basic/GT_MetaTileEntity_Teleporter.java | 387 +- ...GT_MetaTileEntity_LongDistancePipelineBase.java | 113 +- ...T_MetaTileEntity_LongDistancePipelineFluid.java | 67 +- ...GT_MetaTileEntity_LongDistancePipelineItem.java | 65 +- .../GT_MetaTileEntity_AbstractMultiFurnace.java | 3 +- .../multi/GT_MetaTileEntity_AssemblyLine.java | 209 +- .../GT_MetaTileEntity_BrickedBlastFurnace.java | 44 +- .../GT_MetaTileEntity_BronzeBlastFurnace.java | 30 +- .../multi/GT_MetaTileEntity_Charcoal_Pit.java | 115 +- .../multi/GT_MetaTileEntity_Cleanroom.java | 163 +- .../GT_MetaTileEntity_ConcreteBackfiller1.java | 1 + .../GT_MetaTileEntity_ConcreteBackfiller2.java | 1 + .../GT_MetaTileEntity_ConcreteBackfillerBase.java | 35 +- .../multi/GT_MetaTileEntity_DieselEngine.java | 218 +- .../multi/GT_MetaTileEntity_DistillationTower.java | 149 +- .../multi/GT_MetaTileEntity_DrillerBase.java | 183 +- .../GT_MetaTileEntity_ElectricBlastFurnace.java | 247 +- .../GT_MetaTileEntity_ExtremeDieselEngine.java | 143 +- .../multi/GT_MetaTileEntity_FusionComputer.java | 389 +- .../multi/GT_MetaTileEntity_FusionComputer1.java | 27 +- .../multi/GT_MetaTileEntity_FusionComputer2.java | 27 +- .../multi/GT_MetaTileEntity_FusionComputer3.java | 27 +- .../multi/GT_MetaTileEntity_HeatExchanger.java | 210 +- .../GT_MetaTileEntity_ImplosionCompressor.java | 76 +- .../GT_MetaTileEntity_IntegratedOreFactory.java | 235 +- .../multi/GT_MetaTileEntity_LargeBoiler.java | 181 +- .../GT_MetaTileEntity_LargeBoiler_Bronze.java | 3 +- .../multi/GT_MetaTileEntity_LargeBoiler_Steel.java | 4 +- .../GT_MetaTileEntity_LargeBoiler_Titanium.java | 4 +- ...T_MetaTileEntity_LargeBoiler_TungstenSteel.java | 4 +- .../GT_MetaTileEntity_LargeChemicalReactor.java | 198 +- .../multi/GT_MetaTileEntity_LargeTurbine.java | 242 +- .../multi/GT_MetaTileEntity_LargeTurbine_Gas.java | 79 +- ...GT_MetaTileEntity_LargeTurbine_GasAdvanced.java | 77 +- .../GT_MetaTileEntity_LargeTurbine_HPSteam.java | 95 +- .../GT_MetaTileEntity_LargeTurbine_Plasma.java | 218 +- .../GT_MetaTileEntity_LargeTurbine_Steam.java | 92 +- .../multi/GT_MetaTileEntity_MultiFurnace.java | 249 +- .../multi/GT_MetaTileEntity_NanoForge.java | 192 +- .../multi/GT_MetaTileEntity_OilCracker.java | 177 +- .../multi/GT_MetaTileEntity_OilDrill1.java | 1 + .../multi/GT_MetaTileEntity_OilDrill2.java | 1 + .../multi/GT_MetaTileEntity_OilDrill3.java | 1 + .../multi/GT_MetaTileEntity_OilDrillBase.java | 157 +- .../multi/GT_MetaTileEntity_OilDrillInfinite.java | 19 +- .../multi/GT_MetaTileEntity_OreDrillingPlant1.java | 1 + .../multi/GT_MetaTileEntity_OreDrillingPlant2.java | 1 + .../multi/GT_MetaTileEntity_OreDrillingPlant3.java | 1 + .../multi/GT_MetaTileEntity_OreDrillingPlant4.java | 1 + .../GT_MetaTileEntity_OreDrillingPlantBase.java | 128 +- .../multi/GT_MetaTileEntity_PCBFactory.java | 946 +- .../multi/GT_MetaTileEntity_PlasmaForge.java | 1554 +- .../GT_MetaTileEntity_PrimitiveBlastFurnace.java | 237 +- .../multi/GT_MetaTileEntity_ProcessingArray.java | 269 +- .../multi/GT_MetaTileEntity_PyrolyseOven.java | 124 +- .../multi/GT_MetaTileEntity_VacuumFreezer.java | 81 +- .../machines/multiblock/MultiBlock_Macerator.java | 63 +- .../GT_MetaTileEntity_AlloySmelter_Bronze.java | 89 +- .../GT_MetaTileEntity_AlloySmelter_Steel.java | 89 +- .../steam/GT_MetaTileEntity_Compressor_Bronze.java | 88 +- .../steam/GT_MetaTileEntity_Compressor_Steel.java | 88 +- .../steam/GT_MetaTileEntity_Extractor_Bronze.java | 87 +- .../steam/GT_MetaTileEntity_Extractor_Steel.java | 87 +- .../GT_MetaTileEntity_ForgeHammer_Bronze.java | 102 +- .../steam/GT_MetaTileEntity_ForgeHammer_Steel.java | 102 +- .../steam/GT_MetaTileEntity_Furnace_Bronze.java | 95 +- .../steam/GT_MetaTileEntity_Furnace_Steel.java | 93 +- .../steam/GT_MetaTileEntity_Macerator_Bronze.java | 107 +- .../steam/GT_MetaTileEntity_Macerator_Steel.java | 106 +- .../GT_MetaTileEntity_DigitalChestBase.java | 221 +- .../storage/GT_MetaTileEntity_DigitalTankBase.java | 347 +- .../storage/GT_MetaTileEntity_Locker.java | 34 +- .../storage/GT_MetaTileEntity_QuantumChest.java | 8 +- .../storage/GT_MetaTileEntity_QuantumTank.java | 40 +- .../storage/GT_MetaTileEntity_SuperTank.java | 38 +- src/main/java/gregtech/common/tools/GT_Tool.java | 48 +- .../java/gregtech/common/tools/GT_Tool_Axe.java | 71 +- .../common/tools/GT_Tool_BranchCutter.java | 46 +- .../common/tools/GT_Tool_ButcheryKnife.java | 21 +- .../gregtech/common/tools/GT_Tool_BuzzSaw.java | 26 +- .../gregtech/common/tools/GT_Tool_Chainsaw_HV.java | 9 +- .../gregtech/common/tools/GT_Tool_Chainsaw_LV.java | 87 +- .../gregtech/common/tools/GT_Tool_Chainsaw_MV.java | 9 +- .../gregtech/common/tools/GT_Tool_Crowbar.java | 33 +- .../gregtech/common/tools/GT_Tool_Drill_HV.java | 14 +- .../gregtech/common/tools/GT_Tool_Drill_LV.java | 36 +- .../gregtech/common/tools/GT_Tool_Drill_MV.java | 9 +- .../java/gregtech/common/tools/GT_Tool_File.java | 28 +- .../gregtech/common/tools/GT_Tool_HardHammer.java | 77 +- .../java/gregtech/common/tools/GT_Tool_Hoe.java | 33 +- .../gregtech/common/tools/GT_Tool_JackHammer.java | 52 +- .../java/gregtech/common/tools/GT_Tool_Knife.java | 23 +- .../java/gregtech/common/tools/GT_Tool_Mortar.java | 18 +- .../gregtech/common/tools/GT_Tool_Pickaxe.java | 34 +- .../java/gregtech/common/tools/GT_Tool_Plow.java | 64 +- .../gregtech/common/tools/GT_Tool_Plunger.java | 30 +- .../gregtech/common/tools/GT_Tool_RollingPin.java | 20 +- .../java/gregtech/common/tools/GT_Tool_Saw.java | 57 +- .../java/gregtech/common/tools/GT_Tool_Scoop.java | 29 +- .../gregtech/common/tools/GT_Tool_Screwdriver.java | 36 +- .../common/tools/GT_Tool_Screwdriver_LV.java | 12 +- .../java/gregtech/common/tools/GT_Tool_Sense.java | 62 +- .../java/gregtech/common/tools/GT_Tool_Shovel.java | 36 +- .../gregtech/common/tools/GT_Tool_SoftHammer.java | 35 +- .../common/tools/GT_Tool_Soldering_Iron.java | 36 +- .../java/gregtech/common/tools/GT_Tool_Sword.java | 18 +- .../gregtech/common/tools/GT_Tool_Turbine.java | 18 +- .../common/tools/GT_Tool_Turbine_Huge.java | 1 + .../common/tools/GT_Tool_Turbine_Large.java | 1 + .../common/tools/GT_Tool_Turbine_Normal.java | 1 + .../common/tools/GT_Tool_Turbine_Small.java | 1 + .../common/tools/GT_Tool_UniversalSpade.java | 38 +- .../gregtech/common/tools/GT_Tool_WireCutter.java | 25 +- .../java/gregtech/common/tools/GT_Tool_Wrench.java | 33 +- .../gregtech/common/tools/GT_Tool_Wrench_HV.java | 12 +- .../gregtech/common/tools/GT_Tool_Wrench_LV.java | 20 +- .../gregtech/common/tools/GT_Tool_Wrench_MV.java | 12 +- .../tools/pocket/GT_Tool_Pocket_BranchCutter.java | 4 +- .../common/tools/pocket/GT_Tool_Pocket_File.java | 4 +- .../common/tools/pocket/GT_Tool_Pocket_Knife.java | 4 +- .../tools/pocket/GT_Tool_Pocket_Multitool.java | 6 +- .../common/tools/pocket/GT_Tool_Pocket_Saw.java | 4 +- .../tools/pocket/GT_Tool_Pocket_Screwdriver.java | 4 +- .../tools/pocket/GT_Tool_Pocket_WireCutter.java | 4 +- .../crossmod/GregtechWailaDataProvider.java | 28 +- src/main/java/gregtech/crossmod/Waila.java | 5 +- src/main/java/gregtech/loaders/ExtraIcons.java | 12 +- .../loaders/load/GT_CoverBehaviorLoader.java | 1 + .../java/gregtech/loaders/load/GT_FuelLoader.java | 68 +- .../gregtech/loaders/load/GT_ItemIterator.java | 351 +- .../gregtech/loaders/load/GT_SonictronLoader.java | 12 +- .../materialprocessing/ProcessingConfig.java | 37 +- .../materialprocessing/ProcessingModSupport.java | 1 + .../gregtech/loaders/misc/GT_Achievements.java | 275 +- .../gregtech/loaders/misc/GT_BeeDefinition.java | 5213 +++---- src/main/java/gregtech/loaders/misc/GT_Bees.java | 32 +- .../gregtech/loaders/misc/GT_BranchDefinition.java | 6 +- .../java/gregtech/loaders/misc/GT_CoverLoader.java | 10 +- .../loaders/oreprocessing/ProcessingAll.java | 12 +- .../loaders/oreprocessing/ProcessingArrows.java | 72 +- .../loaders/oreprocessing/ProcessingBeans.java | 14 +- .../loaders/oreprocessing/ProcessingBlock.java | 57 +- .../loaders/oreprocessing/ProcessingBolt.java | 18 +- .../loaders/oreprocessing/ProcessingCell.java | 52 +- .../loaders/oreprocessing/ProcessingCircuit.java | 33 +- .../oreprocessing/ProcessingCompressed.java | 12 +- .../loaders/oreprocessing/ProcessingCrafting.java | 10 +- .../loaders/oreprocessing/ProcessingCrate.java | 47 +- .../loaders/oreprocessing/ProcessingCrop.java | 70 +- .../oreprocessing/ProcessingCrushedOre.java | 38 +- .../oreprocessing/ProcessingCrystallized.java | 8 +- .../loaders/oreprocessing/ProcessingDirty.java | 110 +- .../loaders/oreprocessing/ProcessingDust.java | 145 +- .../loaders/oreprocessing/ProcessingDye.java | 15 +- .../loaders/oreprocessing/ProcessingFineWire.java | 18 +- .../loaders/oreprocessing/ProcessingFoil.java | 12 +- .../loaders/oreprocessing/ProcessingFood.java | 18 +- .../loaders/oreprocessing/ProcessingGear.java | 64 +- .../loaders/oreprocessing/ProcessingGem.java | 152 +- .../loaders/oreprocessing/ProcessingIngot.java | 98 +- .../loaders/oreprocessing/ProcessingItem.java | 11 +- .../loaders/oreprocessing/ProcessingLens.java | 12 +- .../loaders/oreprocessing/ProcessingLog.java | 63 +- .../loaders/oreprocessing/ProcessingNugget.java | 17 +- .../loaders/oreprocessing/ProcessingOre.java | 111 +- .../loaders/oreprocessing/ProcessingOrePoor.java | 15 +- .../oreprocessing/ProcessingOreSmelting.java | 43 +- .../loaders/oreprocessing/ProcessingPipe.java | 102 +- .../loaders/oreprocessing/ProcessingPlank.java | 16 +- .../loaders/oreprocessing/ProcessingPlate.java | 217 +- .../loaders/oreprocessing/ProcessingPure.java | 8 +- .../loaders/oreprocessing/ProcessingRecycling.java | 11 +- .../loaders/oreprocessing/ProcessingRotor.java | 36 +- .../loaders/oreprocessing/ProcessingRound.java | 16 +- .../loaders/oreprocessing/ProcessingSand.java | 10 +- .../loaders/oreprocessing/ProcessingSaplings.java | 12 +- .../loaders/oreprocessing/ProcessingScrew.java | 10 +- .../loaders/oreprocessing/ProcessingShaping.java | 238 +- .../loaders/oreprocessing/ProcessingSlab.java | 8 +- .../loaders/oreprocessing/ProcessingStick.java | 17 +- .../loaders/oreprocessing/ProcessingStickLong.java | 16 +- .../loaders/oreprocessing/ProcessingStone.java | 23 +- .../oreprocessing/ProcessingStoneCobble.java | 12 +- .../oreprocessing/ProcessingStoneVarious.java | 14 +- .../loaders/oreprocessing/ProcessingToolHead.java | 2128 +-- .../loaders/oreprocessing/ProcessingToolOther.java | 228 +- .../oreprocessing/ProcessingTransforming.java | 35 +- .../loaders/oreprocessing/ProcessingWax.java | 8 +- .../loaders/oreprocessing/ProcessingWire.java | 182 +- .../loaders/postload/GT_BlockResistanceLoader.java | 7 +- .../loaders/postload/GT_BookAndLootLoader.java | 327 +- .../loaders/postload/GT_CraftingRecipeLoader.java | 3925 ++--- .../gregtech/loaders/postload/GT_CropLoader.java | 232 +- .../postload/GT_ExtremeDieselFuelLoader.java | 1 + .../loaders/postload/GT_FakeRecipeLoader.java | 1 + .../postload/GT_ItemMaxStacksizeLoader.java | 8 +- .../loaders/postload/GT_MinableRegistrator.java | 4 +- .../postload/GT_PCBFactoryMaterialLoader.java | 1 + .../gregtech/loaders/postload/GT_PostLoad.java | 324 +- .../postload/GT_ProcessingArrayRecipeLoader.java | 35 +- .../postload/GT_RecyclerBlacklistLoader.java | 105 +- .../loaders/postload/GT_ScrapboxDropLoader.java | 8 +- .../loaders/postload/GT_UUMRecipeLoader.java | 1 + .../loaders/postload/GT_Worldgenloader.java | 894 +- .../gregtech/loaders/postload/PartP2PGTPower.java | 17 +- .../postload/chains/GT_BauxiteRefineChain.java | 59 +- .../loaders/postload/chains/GT_NaniteChain.java | 178 +- .../postload/chains/GT_PCBFactoryRecipes.java | 571 +- .../postload/recipes/AlloySmelterRecipes.java | 161 +- .../postload/recipes/ArcFurnaceRecipes.java | 252 +- .../loaders/postload/recipes/AssemblerRecipes.java | 2776 ++-- .../postload/recipes/AssemblyLineRecipes.java | 940 +- .../loaders/postload/recipes/AutoclaveRecipes.java | 14 +- .../loaders/postload/recipes/BenderRecipes.java | 11 +- .../postload/recipes/BlastFurnaceRecipes.java | 44 +- .../loaders/postload/recipes/BreweryRecipes.java | 74 +- .../loaders/postload/recipes/CannerRecipes.java | 1 + .../postload/recipes/CentrifugeRecipes.java | 58 +- .../postload/recipes/ChemicalBathRecipes.java | 22 +- .../loaders/postload/recipes/ChemicalRecipes.java | 1487 +- .../postload/recipes/CircuitAssemblerRecipes.java | 298 +- .../postload/recipes/CompressorRecipes.java | 63 +- .../postload/recipes/CropProcessingRecipes.java | 46 +- .../loaders/postload/recipes/CuttingRecipes.java | 171 +- .../postload/recipes/DistilleryRecipes.java | 776 +- .../postload/recipes/ElectrolyzerRecipes.java | 12 +- .../recipes/ElectromagneticSeparatorRecipes.java | 3 +- .../loaders/postload/recipes/ExtractorRecipes.java | 95 +- .../loaders/postload/recipes/ExtruderRecipes.java | 7 +- .../loaders/postload/recipes/FermenterRecipes.java | 204 +- .../postload/recipes/FluidCannerRecipes.java | 1 + .../postload/recipes/FluidExtractorRecipes.java | 129 +- .../postload/recipes/FluidHeaterRecipes.java | 7 +- .../postload/recipes/FluidSolidifierRecipes.java | 46 +- .../postload/recipes/ForgeHammerRecipes.java | 47 +- .../postload/recipes/FormingPressRecipes.java | 8 +- .../loaders/postload/recipes/FuelRecipes.java | 6 +- .../postload/recipes/FusionReactorRecipes.java | 5 +- .../recipes/ImplosionCompressorRecipes.java | 1 + .../postload/recipes/LaserEngraverRecipes.java | 38 +- .../loaders/postload/recipes/LatheRecipes.java | 8 +- .../postload/recipes/MatterAmplifierRecipes.java | 1 + .../loaders/postload/recipes/MixerRecipes.java | 89 +- .../loaders/postload/recipes/NEIHiding.java | 4 +- .../postload/recipes/OreDictUnification.java | 1 + .../loaders/postload/recipes/PackagerRecipes.java | 7 +- .../postload/recipes/PlasmaForgeRecipes.java | 36 +- .../loaders/postload/recipes/PrinterRecipes.java | 6 +- .../loaders/postload/recipes/Pulverizer.java | 322 +- .../loaders/postload/recipes/PyrolyseRecipes.java | 28 +- .../loaders/postload/recipes/RecipeRemover.java | 80 +- .../loaders/postload/recipes/SifterRecipes.java | 34 +- .../loaders/postload/recipes/SlicerRecipes.java | 1 + .../loaders/postload/recipes/SmelterRecipes.java | 17 +- .../postload/recipes/ThaumcraftRecipes.java | 820 +- .../postload/recipes/ThermalCentrifugeRecipes.java | 5 +- .../postload/recipes/VacuumFreezerRecipes.java | 84 +- .../loaders/postload/recipes/WiremillRecipes.java | 10 +- .../preload/GT_Loader_CircuitBehaviors.java | 1 + .../loaders/preload/GT_Loader_ItemData.java | 308 +- .../preload/GT_Loader_Item_Block_And_Fluid.java | 2368 ++- .../preload/GT_Loader_MetaTileEntities.java | 15612 +++++++------------ .../preload/GT_Loader_MultiTileEntities.java | 51 +- .../loaders/preload/GT_Loader_OreDictionary.java | 279 +- .../loaders/preload/GT_Loader_OreProcessing.java | 1 + .../java/gregtech/loaders/preload/GT_PreLoad.java | 773 +- .../gregtech/nei/FusionSpecialValueFormatter.java | 3 +- .../java/gregtech/nei/GT_NEI_DefaultHandler.java | 289 +- .../nei/HeatingCoilSpecialValueFormatter.java | 3 +- src/main/java/gregtech/nei/IMCForNEI.java | 4 +- .../gregtech/nei/INEISpecialInfoFormatter.java | 6 +- .../gregtech/nei/NEIHandlerAbsoluteTooltip.java | 4 +- src/main/java/gregtech/nei/NEIRecipeInfo.java | 13 +- src/main/java/gregtech/nei/NEI_GT_Config.java | 27 +- .../java/gregtech/nei/NEI_TransferRectHost.java | 1 + src/main/java/gregtech/nei/RecipeMapHandler.java | 13 +- .../java/speiger/src/crops/api/ICropCardInfo.java | 6 +- .../java/gregtech/common/items/CombTypeTest.java | 2 + .../IGlobalWirelessEnergy_UnitTest.java | 4 +- .../overclock/GT_OverclockCalculator_UnitTest.java | 227 +- 911 files changed, 57244 insertions(+), 75022 deletions(-) (limited to 'src') diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index e38f4f0d02..14ff8b2c2d 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -3,8 +3,34 @@ package gregtech; import static gregtech.api.GregTech_API.registerCircuitProgrammer; import static gregtech.api.enums.GT_Values.MOD_ID_FR; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Locale; +import java.util.Map; +import java.util.function.Predicate; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.world.World; +import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.oredict.OreDictionary; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import appeng.api.AEApi; + import com.google.common.base.Stopwatch; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -71,27 +97,6 @@ import gregtech.loaders.preload.*; import gregtech.nei.IMCForNEI; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeOutput; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Locale; -import java.util.Map; -import java.util.function.Predicate; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraft.world.World; -import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.oredict.OreDictionary; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; @Mod( modid = "gregtech", @@ -162,8 +167,7 @@ public class GT_Mod implements IGT_Mod { public static final Logger GT_FML_LOGGER = LogManager.getLogger("GregTech GTNH"); static { - if ((509 != GregTech_API.VERSION) - || (509 != GT_ModHandler.VERSION) + if ((509 != GregTech_API.VERSION) || (509 != GT_ModHandler.VERSION) || (509 != GT_OreDictUnificator.VERSION) || (509 != GT_Recipe.VERSION) || (509 != GT_Utility.VERSION) @@ -189,12 +193,12 @@ public class GT_Mod implements IGT_Mod { GregTech_API.registerTileEntityConstructor(i, i2 -> new BaseMetaPipeEntity()); } - //noinspection deprecation// Need run-time initialization + // noinspection deprecation// Need run-time initialization GregTech_API.sRecipeAdder = GT_Values.RA; - //noinspection ResultOfMethodCallIgnored// Suspicious likely pointless + // noinspection ResultOfMethodCallIgnored// Suspicious likely pointless Textures.BlockIcons.VOID.name(); - //noinspection ResultOfMethodCallIgnored// Suspicious likely pointless + // noinspection ResultOfMethodCallIgnored// Suspicious likely pointless Textures.ItemIcons.VOID.name(); } @@ -246,7 +250,13 @@ public class GT_Mod implements IGT_Mod { EntityRegistry.registerModEntity(GT_Entity_Arrow.class, "GT_Entity_Arrow", 1, GT_Values.GT, 160, 1, true); EntityRegistry.registerModEntity( - GT_Entity_Arrow_Potion.class, "GT_Entity_Arrow_Potion", 2, GT_Values.GT, 160, 1, true); + GT_Entity_Arrow_Potion.class, + "GT_Entity_Arrow_Potion", + 2, + GT_Values.GT, + 160, + 1, + true); GT_PreLoad.runMineTweakerCompat(); @@ -293,7 +303,7 @@ public class GT_Mod implements IGT_Mod { } if (Loader.isModLoaded(MOD_ID_FR)) - //noinspection InstantiationOfUtilityClass//TODO: Refactor GT_Bees with proper state handling + // noinspection InstantiationOfUtilityClass//TODO: Refactor GT_Bees with proper state handling new GT_Bees(); // Disable Low Grav regardless of config if Cleanroom is disabled. @@ -303,17 +313,16 @@ public class GT_Mod implements IGT_Mod { gregtechproxy.onLoad(); - registerCircuitProgrammer( - new Predicate() { - private final int screwdriverOreId = OreDictionary.getOreID("craftingToolScrewdriver"); + registerCircuitProgrammer(new Predicate() { - @Override - public boolean test(ItemStack stack) { - for (int i : OreDictionary.getOreIDs(stack)) if (i == screwdriverOreId) return true; - return false; - } - }, - true); + private final int screwdriverOreId = OreDictionary.getOreID("craftingToolScrewdriver"); + + @Override + public boolean test(ItemStack stack) { + for (int i : OreDictionary.getOreIDs(stack)) if (i == screwdriverOreId) return true; + return false; + } + }, true); if (gregtechproxy.mSortToTheEnd) { new GT_ItemIterator().run(); @@ -412,7 +421,7 @@ public class GT_Mod implements IGT_Mod { GT_ModHandler.addCraftingRecipe( new ItemStack(Blocks.wooden_slab, 6, 0), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"WWW", 'W', new ItemStack(Blocks.planks, 1, 0)}); + new Object[] { "WWW", 'W', new ItemStack(Blocks.planks, 1, 0) }); // Save a copy of these list before activateOreDictHandler(), then loop over them. Map aMaceratorRecipeList = GT_ModHandler.getMaceratorRecipeList(); @@ -436,8 +445,8 @@ public class GT_Mod implements IGT_Mod { aThermalCentrifugeRecipeList); if (GT_Values.D1) { - GT_ModHandler.sSingleNonBlockDamagableRecipeList.forEach(iRecipe -> - GT_Log.out.println("=> " + iRecipe.getRecipeOutput().getDisplayName())); + GT_ModHandler.sSingleNonBlockDamagableRecipeList + .forEach(iRecipe -> GT_Log.out.println("=> " + iRecipe.getRecipeOutput().getDisplayName())); } new GT_CraftingRecipeLoader().run(); if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "ic2forgehammer", true)) { @@ -446,10 +455,9 @@ public class GT_Mod implements IGT_Mod { GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("machine", 1L)); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("machine", 1L), - GT_ModHandler.RecipeBits.BUFFERED - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE |