aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.circleci/config.yml80
-rw-r--r--README.md8
-rw-r--r--build.gradle4
-rw-r--r--src/Java/gregtech/api/util/FishPondFakeRecipe.java4
-rw-r--r--src/Java/gregtech/api/util/SemiFluidFuelHandler.java48
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java25
-rw-r--r--src/Java/gtPlusPlus/api/objects/data/AutoMap.java124
-rw-r--r--src/Java/gtPlusPlus/api/objects/data/ReverseAutoMap.java4
-rw-r--r--src/Java/gtPlusPlus/api/objects/data/TypeCounter.java8
-rw-r--r--src/Java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java64
-rw-r--r--src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java5
-rw-r--r--src/Java/gtPlusPlus/api/objects/minecraft/ItemPackage.java58
-rw-r--r--src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java111
-rw-r--r--src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Ore_Layer.java2
-rw-r--r--src/Java/gtPlusPlus/core/block/ModBlocks.java39
-rw-r--r--src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java4
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java180
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java30
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java30
-rw-r--r--src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java28
-rw-r--r--src/Java/gtPlusPlus/core/common/CommonProxy.java17
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java18
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java2
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java2
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java14
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java12
-rw-r--r--src/Java/gtPlusPlus/core/config/ConfigHandler.java4
-rw-r--r--src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java3
-rw-r--r--src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java17
-rw-r--r--src/Java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java115
-rw-r--r--src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java131
-rw-r--r--src/Java/gtPlusPlus/core/fluids/FactoryFluid.java49
-rw-r--r--src/Java/gtPlusPlus/core/fluids/FluidFactory.java213
-rw-r--r--src/Java/gtPlusPlus/core/fluids/FluidPackage.java83
-rw-r--r--src/Java/gtPlusPlus/core/fluids/GenericFluid.java70
-rw-r--r--src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java318
-rw-r--r--src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java2
-rw-r--r--src/Java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java7
-rw-r--r--src/Java/gtPlusPlus/core/handler/AchievementHandler.java417
-rw-r--r--src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java48
-rw-r--r--src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java13
-rw-r--r--src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java24
-rw-r--r--src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java37
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java68
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java26
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java)29
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java48
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java71
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java77
-rw-r--r--src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java7
-rw-r--r--src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java30
-rw-r--r--src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java408
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java285
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java108
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java11
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java44
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/OilChem.java201
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java493
-rw-r--r--src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java111
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemControlCore.java22
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java39
-rw-r--r--src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java5
-rw-r--r--src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java13
-rw-r--r--src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java123
-rw-r--r--src/Java/gtPlusPlus/core/item/init/ItemsFoods.java12
-rw-r--r--src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java100
-rw-r--r--src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java129
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java5
-rw-r--r--src/Java/gtPlusPlus/core/lib/LoadedMods.java6
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java6
-rw-r--r--src/Java/gtPlusPlus/core/material/ELEMENT.java6
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java50
-rw-r--r--src/Java/gtPlusPlus/core/material/ORES.java16
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java459
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_General.java201
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java464
-rw-r--r--src/Java/gtPlusPlus/core/recipe/common/CI.java50
-rw-r--r--src/Java/gtPlusPlus/core/slots/SlotToolBox.java18
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java3
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java21
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java157
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java238
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java144
-rw-r--r--src/Java/gtPlusPlus/core/util/Utils.java25
-rw-r--r--src/Java/gtPlusPlus/core/util/data/StringUtils.java100
-rw-r--r--src/Java/gtPlusPlus/core/util/math/MathUtils.java17
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java78
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/FoodUtils.java2
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java116
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java20
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java22
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java28
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java26
-rw-r--r--src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java32
-rw-r--r--src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java4
-rw-r--r--src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java499
-rw-r--r--src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java2
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java2
-rw-r--r--src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java43
-rw-r--r--src/Java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java21
-rw-r--r--src/Java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java40
-rw-r--r--src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java18
-rw-r--r--src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java62
-rw-r--r--src/Java/gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java61
-rw-r--r--src/Java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java2
-rw-r--r--src/Java/gtPlusPlus/preloader/DevHelper.java2
-rw-r--r--src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java41
-rw-r--r--src/Java/gtPlusPlus/preloader/asm/AsmConfig.java10
-rw-r--r--src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java28
-rw-r--r--src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements.java1896
-rw-r--r--src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements_CrashFix.java218
-rw-r--r--src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BaseMetaTil