aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-12-12 19:09:46 +0100
committerGitHub <noreply@github.com>2021-12-12 19:09:46 +0100
commit896143b96132f5ac54aa8d8f7386f27487e5e530 (patch)
treed61c1bced93b36545873414562b1dfd80718f496 /src/Java
parent9cbfc7a1bacdbe908632e0fff9ec5ad7f119e563 (diff)
parent35585d4556d85a1a9cda33cdd39b5b257e3e5215 (diff)
downloadGT5-Unofficial-896143b96132f5ac54aa8d8f7386f27487e5e530.tar.gz
GT5-Unofficial-896143b96132f5ac54aa8d8f7386f27487e5e530.tar.bz2
GT5-Unofficial-896143b96132f5ac54aa8d8f7386f27487e5e530.zip
Merge pull request #50 from GTNewHorizons/gtnh-milling
Milling/Nuclear Sciences revamp + Lots of minor fixes
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gregtech/api/util/GTPP_Recipe.java18
-rw-r--r--src/Java/gregtech/api/util/GasSpargingRecipe.java99
-rw-r--r--src/Java/gregtech/api/util/GasSpargingRecipeMap.java48
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java64
-rw-r--r--src/Java/gtPlusPlus/api/objects/Logger.java2
-rw-r--r--src/Java/gtPlusPlus/api/objects/data/AutoMap.java12
-rw-r--r--src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert.java12
-rw-r--r--src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert2.java14
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java8
-rw-r--r--src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java30
-rw-r--r--src/Java/gtPlusPlus/core/common/CommonProxy.java19
-rw-r--r--src/Java/gtPlusPlus/core/config/ConfigHandler.java2
-rw-r--r--src/Java/gtPlusPlus/core/fluids/FluidFactory.java6
-rw-r--r--src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java4
-rw-r--r--src/Java/gtPlusPlus/core/handler/BookHandler.java20
-rw-r--r--src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java6
-rw-r--r--src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java99
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java16
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java1
-rw-r--r--src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java17
-rw-r--r--src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java1
-rw-r--r--src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java11
-rw-r--r--src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java1
-rw-r--r--src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java1
-rw-r--r--src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java37
-rw-r--r--src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java30
-rw-r--r--src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java20
-rw-r--r--src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java45
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java54
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java46
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java64
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java37
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java152
-rw-r--r--src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java3
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java2
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java20
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java40
-rw-r--r--src/Java/gtPlusPlus/core/material/ELEMENT.java8
-rw-r--r--src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java12
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java163
-rw-r--r--src/Java/gtPlusPlus/core/material/MaterialGenerator.java75
-rw-r--r--src/Java/gtPlusPlus/core/material/ORES.java888
-rw-r--r--src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java16
-rw-r--r--src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java247
-rw-r--r--src/Java/gtPlusPlus/core/material/state/MaterialState.java3
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java860
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java356
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java8
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java338
-rw-r--r--src/Java/gtPlusPlus/core/recipe/common/CI.java2
-rw-r--r--src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java4
-rw-r--r--src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java2
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java4
-rw-r--r--src/Java/gtPlusPlus/core/util/data/ArrayUtils.java12
-rw-r--r--src/Java/gtPlusPlus/core/util/math/MathUtils.java16
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java38
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java49
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java7
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java40
-rw-r--r--src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java61
-rw-r--r--src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java12
-rw-r--r--src/Java/gtPlusPlus/everglades/biome/Biome_Everglades.java18
-rw-r--r--src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java666
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java452
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java422
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_LFTR.java118
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java372
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java422
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_MultiNoCell.java58
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_RFPP.java515
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java482
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java554
-rw-r--r--src/Java/gtPlusPlus/nei/NEI_GT_Config.java74
-rw-r--r--src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java27
-rw-r--r--src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java23
-rw-r--r--src/Java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java8
-rw-r--r--src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java20
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java52
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java163
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java7
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java14
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java32
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java9
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java10
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java251
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java18
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java25
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java10
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java35
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java20
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java3