From 69ce418e29e22391f60cdd55815727762a78c33a Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Fri, 24 May 2024 19:04:17 +0100 Subject: Apply updated GT5u spotless configs --- src/main/java/gtPlusPlus/GTplusplus.java | 134 +- .../java/gtPlusPlus/api/objects/data/AutoMap.java | 8 +- .../api/objects/data/WeightedCollection.java | 3 +- .../api/objects/minecraft/BTF_FluidTank.java | 16 +- .../api/objects/minecraft/BTF_Inventory.java | 19 +- .../gtPlusPlus/api/objects/minecraft/BlockPos.java | 4 +- .../gtPlusPlus/api/objects/minecraft/FluidGT6.java | 2 +- .../api/objects/minecraft/ShapedRecipe.java | 46 +- .../api/recipe/ChemicalPlantFrontend.java | 4 +- .../api/recipe/GTPPRecipeCategories.java | 10 +- .../java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java | 276 +- .../gtPlusPlus/api/recipe/MillingFrontend.java | 4 +- .../java/gtPlusPlus/api/recipe/TGSFrontend.java | 29 +- .../api/recipe/ThermalBoilerFrontend.java | 13 +- .../gtPlusPlus/core/block/base/BasicBlock.java | 5 +- .../core/block/base/BasicTileBlockWithTooltip.java | 27 +- .../gtPlusPlus/core/block/base/BlockBaseFluid.java | 33 +- .../core/block/base/BlockBaseModular.java | 74 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 42 +- .../block/general/BlockCompressedObsidian.java | 2 +- .../core/block/general/BlockSuperLight.java | 12 +- .../core/block/general/FluidTankInfinite.java | 26 +- .../gtPlusPlus/core/block/general/HellFire.java | 156 +- .../gtPlusPlus/core/block/general/LightGlass.java | 2 +- .../core/block/general/MiningExplosives.java | 57 +- .../block/general/antigrief/BlockWitherProof.java | 20 +- .../block/general/fluids/BlockFluidSludge.java | 10 +- .../core/block/machine/CircuitProgrammer.java | 18 +- .../core/block/machine/DecayablesChest.java | 10 +- .../gtPlusPlus/core/block/machine/FishTrap.java | 12 +- .../core/block/machine/Machine_PestKiller.java | 12 +- .../core/block/machine/Machine_PooCollector.java | 14 +- .../core/block/machine/Machine_ProjectTable.java | 8 +- .../core/block/machine/Machine_SuperJukebox.java | 108 +- .../core/block/machine/VolumetricFlaskSetter.java | 20 +- .../gtPlusPlus/core/client/CustomTextureSet.java | 4 +- .../core/client/model/ModelSickBlaze.java | 4 +- .../core/client/model/ModelStaballoyConstruct.java | 30 +- .../client/renderer/CustomItemBlockRenderer.java | 4 +- .../client/renderer/CustomOreBlockRenderer.java | 1149 +++--- .../core/client/renderer/RenderDecayChest.java | 18 +- .../renderer/RenderMiningExplosivesPrimed.java | 16 +- .../core/client/renderer/RenderSickBlaze.java | 10 +- .../client/renderer/RenderStaballoyConstruct.java | 56 +- .../core/client/renderer/RenderToxinball.java | 4 +- .../renderer/particle/EntityDropParticleFX.java | 32 +- .../commands/CommandEnableDebugWhileRunning.java | 229 +- .../java/gtPlusPlus/core/commands/CommandMath.java | 13 +- .../java/gtPlusPlus/core/common/CommonProxy.java | 27 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 40 +- .../core/common/compat/COMPAT_Thaumcraft.java | 17 +- .../core/common/compat/COMPAT_Witchery.java | 6 +- .../java/gtPlusPlus/core/config/ConfigHandler.java | 849 ++--- .../container/Container_CircuitProgrammer.java | 4 +- .../core/container/Container_DecayablesChest.java | 2 +- .../core/container/Container_FishTrap.java | 2 +- .../core/container/Container_PestKiller.java | 5 +- .../core/container/Container_ProjectTable.java | 11 +- .../core/container/Container_SuperJukebox.java | 6 +- .../container/Container_VolumetricFlaskSetter.java | 2 +- .../core/entity/EntityPrimedMiningExplosive.java | 422 +-- .../core/entity/InternalEntityRegistry.java | 70 +- .../core/entity/monster/EntitySickBlaze.java | 42 +- .../entity/monster/EntityStaballoyConstruct.java | 278 +- .../entity/projectile/EntityLightningAttack.java | 27 +- .../core/entity/projectile/EntityToxinball.java | 46 +- .../entity/projectile/EntityToxinballSmall.java | 2 +- .../core/fluids/FluidRegistryHandler.java | 6 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 4 +- .../core/gui/machine/GUI_CircuitProgrammer.java | 4 +- .../core/gui/machine/GUI_DecayablesChest.java | 4 +- .../gtPlusPlus/core/gui/machine/GUI_FishTrap.java | 4 +- .../core/gui/machine/GUI_PestKiller.java | 34 +- .../core/gui/machine/GUI_ProjectTable.java | 4 +- .../core/gui/machine/GUI_SuperJukebox.java | 4 +- .../gui/machine/GUI_VolumetricFlaskSetter.java | 23 +- .../gtPlusPlus/core/gui/widget/GuiValueField.java | 32 +- .../core/handler/AchievementHandler.java | 304 +- .../java/gtPlusPlus/core/handler/BookHandler.java | 749 ++-- .../core/handler/BurnableFuelHandler.java | 4 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 12 +- .../java/gtPlusPlus/core/handler/GuiHandler.java | 38 +- .../gtPlusPlus/core/handler/PacketHandler.java | 6 +- .../core/handler/Recipes/DecayableRecipe.java | 2 +- .../core/handler/events/CustomMovementHandler.java | 17 +- .../handler/events/EnderDragonDeathHandler.java | 8 +- .../core/handler/events/EntityDeathHandler.java | 23 +- .../handler/events/PlayerSleepEventHandler.java | 10 +- .../core/handler/events/SneakManager.java | 4 +- .../workbench/Workbench_CraftingHandler.java | 15 +- src/main/java/gtPlusPlus/core/item/ModItems.java | 379 +- .../core/item/base/BaseItemBurnable.java | 2 +- .../core/item/base/BaseItemColourable.java | 14 +- .../core/item/base/BaseItemComponent.java | 120 +- .../core/item/base/BaseItemDamageable.java | 18 +- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 6 +- .../core/item/base/BaseItemTickable.java | 26 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 18 +- .../java/gtPlusPlus/core/item/base/CoreItem.java | 106 +- .../core/item/base/cell/BaseItemCell.java | 6 +- .../core/item/base/cell/BaseItemPlasmaCell.java | 2 +- .../core/item/base/dusts/BaseItemDust.java | 2 +- .../core/item/base/dusts/BaseItemDustUnique.java | 38 +- .../core/item/base/ingots/BaseItemIngotHot.java | 15 +- .../core/item/base/ingots/BaseItemIngot_OLD.java | 21 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 15 +- .../core/item/base/itemblock/ItemBlockOre.java | 31 +- .../core/item/base/misc/BaseItemMisc.java | 13 +- .../core/item/base/misc/BaseItemParticle.java | 20 +- .../core/item/base/ore/BaseOreComponent.java | 35 +- .../core/item/base/plates/BaseItemPlate.java | 12 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 9 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 10 +- .../core/item/bauble/BatteryPackBaseBauble.java | 62 +- .../core/item/bauble/ElectricBaseBauble.java | 59 +- .../core/item/bauble/FireProtectionBauble.java | 4 +- .../core/item/chemistry/AgriculturalChem.java | 251 +- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 291 +- .../core/item/chemistry/GenericChem.java | 824 ++--- .../core/item/chemistry/IonParticles.java | 24 +- .../core/item/chemistry/MilledOreProcessing.java | 700 ++-- .../core/item/chemistry/NuclearChem.java | 77 +- .../core/item/chemistry/RocketFuels.java | 525 +-- .../core/item/chemistry/StandardBaseParticles.java | 47 +- .../chemistry/general/ItemGenericChemBase.java | 32 +- .../item/circuit/GTPP_IntegratedCircuit_Item.java | 56 +- .../core/item/crafting/ItemDummyResearch.java | 12 +- .../core/item/food/BaseItemMetaFood.java | 211 +- .../gtPlusPlus/core/item/general/BufferCore.java | 18 +- .../core/item/general/ItemBlueprint.java | 46 +- .../core/item/general/ItemCloakingDevice.java | 30 +- .../core/item/general/ItemGenericToken.java | 44 +- .../core/item/general/ItemHalfCompleteCasings.java | 2 +- .../core/item/general/ItemHealingDevice.java | 124 +- .../core/item/general/ItemLavaFilter.java | 18 +- .../core/item/general/ItemMagicFeather.java | 35 +- .../core/item/general/books/ItemBaseBook.java | 19 +- .../item/general/chassis/ItemDehydratorCoil.java | 2 +- .../general/chassis/ItemDehydratorCoilWire.java | 2 +- .../item/general/spawn/ItemCustomSpawnEgg.java | 39 +- .../core/item/materials/DustDecayable.java | 2 +- .../core/item/tool/misc/GregtechPump.java | 212 +- .../core/item/wearable/armour/ArmourLoader.java | 2 +- .../wearable/armour/tinfoil/ArmourTinFoilHat.java | 16 +- .../core/item/wearable/base/BaseItemWearable.java | 4 +- .../item/wearable/hazmat/ItemArmorHazmatEx.java | 8 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 13 +- src/main/java/gtPlusPlus/core/material/ALLOY.java | 1386 ++++--- .../java/gtPlusPlus/core/material/ELEMENT.java | 930 ++--- .../gtPlusPlus/core/material/MISC_MATERIALS.java | 955 +++-- .../java/gtPlusPlus/core/material/Material.java | 647 ++-- .../core/material/MaterialGenerator.java | 47 +- .../gtPlusPlus/core/material/MaterialStack.java | 5 +- .../java/gtPlusPlus/core/material/NONMATERIAL.java | 4 +- src/main/java/gtPlusPlus/core/material/ORES.java | 1238 +++---- .../java/gtPlusPlus/core/material/Particle.java | 8 +- .../core/material/nuclear/FLUORIDES.java | 351 +- .../gtPlusPlus/core/material/nuclear/NUCLIDE.java | 496 ++- .../network/packet/Packet_VolumetricFlaskGui.java | 2 +- .../network/packet/Packet_VolumetricFlaskGui2.java | 2 +- .../java/gtPlusPlus/core/proxy/ClientProxy.java | 10 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 2221 ++++++------ .../gtPlusPlus/core/recipe/RECIPES_General.java | 460 +-- .../core/recipe/RECIPES_LaserEngraver.java | 106 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 3792 ++++++++++---------- .../core/recipe/RECIPES_RareEarthProcessing.java | 111 +- .../core/recipe/RECIPES_SeleniumProcessing.java | 163 +- .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 60 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 24 +- .../java/gtPlusPlus/core/recipe/common/CI.java | 133 +- .../java/gtPlusPlus/core/slots/SlotCrafting.java | 20 +- .../core/slots/SlotCraftingNoCollect.java | 7 +- .../java/gtPlusPlus/core/slots/SlotDataStick.java | 2 +- .../core/slots/SlotIntegratedCircuit.java | 22 +- .../core/tileentities/base/TileEntityBase.java | 226 +- .../general/TileEntityCircuitProgrammer.java | 40 +- .../general/TileEntityDecayablesChest.java | 74 +- .../tileentities/general/TileEntityFishTrap.java | 44 +- .../general/TileEntityInfiniteFluid.java | 16 +- .../general/TileEntityVolumetricFlaskSetter.java | 59 +- .../machines/TileEntityAdvPooCollector.java | 13 +- .../machines/TileEntityBaseFluidCollector.java | 18 +- .../machines/TileEntityPestKiller.java | 90 +- .../machines/TileEntityProjectTable.java | 21 +- .../gtPlusPlus/core/util/MovingAverageLong.java | 12 +- src/main/java/gtPlusPlus/core/util/Utils.java | 112 +- src/main/java/gtPlusPlus/core/util/data/AES.java | 5 +- .../gtPlusPlus/core/util/data/LocaleUtils.java | 7 +- .../gtPlusPlus/core/util/data/StringUtils.java | 39 +- .../java/gtPlusPlus/core/util/math/MathUtils.java | 2 +- .../core/util/minecraft/EntityUtils.java | 89 +- .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 363 +- .../core/util/minecraft/InventoryUtils.java | 18 +- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 243 +- .../core/util/minecraft/MaterialUtils.java | 94 +- .../core/util/minecraft/MiningUtils.java | 31 +- .../core/util/minecraft/PlayerUtils.java | 32 +- .../core/util/minecraft/RecipeUtils.java | 127 +- .../util/minecraft/gregtech/PollutionUtils.java | 4 +- .../core/util/recipe/GT_RecipeUtils.java | 31 +- .../core/util/recipe/RecipeHashStrat.java | 12 +- .../core/util/reflect/AddGregtechRecipe.java | 27 +- .../core/util/reflect/ReflectionUtils.java | 67 +- .../gtPlusPlus/core/util/sys/KeyboardUtils.java | 2 +- .../core/world/explosions/ExplosionHandler.java | 4 +- .../core/world/explosions/MiningExplosion.java | 380 +- .../everglades/GTplusplus_Everglades.java | 16 +- .../everglades/biome/BiomeGenerator_Custom.java | 40 +- .../block/BlockDarkWorldPollutedDirt.java | 2 +- .../everglades/block/BlockEvergladesPortal.java | 46 +- .../everglades/block/DarkWorldContentLoader.java | 11 +- .../everglades/chunk/ChunkProviderModded.java | 172 +- .../everglades/gen/WorldGenMinable_Custom.java | 11 +- .../gtPlusPlus/everglades/gen/gt/WorldGen_GT.java | 10 +- .../everglades/gen/gt/WorldGen_GT_Base.java | 353 +- .../everglades/gen/gt/WorldGen_GT_Ore_Layer.java | 425 ++- .../everglades/gen/gt/WorldGen_Ores.java | 380 +- .../item/ItemEvergladesPortalTrigger.java | 25 +- .../everglades/world/TeleporterDimensionMod.java | 48 +- .../everglades/world/WorldChunkManagerCustom.java | 9 +- .../gtPlusPlus/nei/DecayableRecipeHandler.java | 4 +- .../java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java | 234 +- src/main/java/gtPlusPlus/nei/NEI_GTPP_Config.java | 41 +- .../gtPlusPlus/nei/handlers/NeiTextureHandler.java | 16 +- .../gtPlusPlus/plugin/agrichem/BioRecipes.java | 1175 +++--- .../plugin/agrichem/block/AgrichemFluids.java | 28 +- .../agrichem/item/algae/ItemAgrichemBase.java | 9 +- .../plugin/agrichem/item/algae/ItemAlgaeBase.java | 31 +- .../plugin/agrichem/logic/AlgaeGeneticData.java | 4 +- .../plugin/fixes/vanilla/Core_VanillaFixes.java | 12 +- .../plugin/fixes/vanilla/VanillaBedHeightFix.java | 28 +- .../plugin/fixes/vanilla/music/MusicTocker.java | 28 +- .../gtPlusPlus/preloader/Preloader_GT_OreDict.java | 52 +- .../java/gtPlusPlus/preloader/asm/AsmConfig.java | 35 +- .../preloader/asm/Preloader_DummyContainer.java | 22 +- ...ClassTransformer_COFH_OreDictionaryArbiter.java | 37 +- .../ClassTransformer_IC2_GetHarvestTool.java | 88 +- .../ClassTransformer_LWJGL_Keyboard.java | 82 +- .../ClassTransformer_TC_ItemWispEssence.java | 106 +- .../transformers/Preloader_ClassTransformer.java | 30 +- .../Preloader_Transformer_Handler.java | 19 +- .../preloader/keyboard/BetterKeyboard.java | 44 +- .../gtPlusPlus/recipes/CokeAndPyrolyseOven.java | 42 +- .../java/gtPlusPlus/recipes/RecipeRemovals.java | 16 +- .../xmod/bartcrops/abstracts/BaseCrop.java | 2 +- .../gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java | 26 +- .../xmod/bop/blocks/BOP_Block_Registrator.java | 116 +- .../xmod/bop/blocks/base/LeavesBase.java | 4 +- .../gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 8 +- .../xmod/bop/blocks/base/SaplingBase.java | 4 +- .../xmod/bop/blocks/pine/LeavesPineTree.java | 10 +- .../blocks/rainforest/SaplingRainforestTree.java | 14 +- .../bop/world/features/trees/WorldGenPineTree.java | 7 +- .../features/trees/WorldGenRainForestTree_Ex.java | 172 +- .../xmod/forestry/bees/custom/CustomCombs.java | 63 +- .../forestry/bees/custom/GTPP_Bee_Definition.java | 77 +- .../xmod/forestry/bees/custom/GTPP_Bees.java | 12 +- .../bees/custom/GTPP_Branch_Definition.java | 4 +- .../xmod/forestry/bees/custom/ItemCustomComb.java | 9 +- .../xmod/forestry/bees/handler/GTPP_CombType.java | 7 +- .../xmod/forestry/bees/handler/GTPP_DropType.java | 7 +- .../forestry/bees/handler/GTPP_PollenType.java | 7 +- .../forestry/bees/handler/GTPP_PropolisType.java | 7 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 74 +- .../xmod/forestry/bees/items/MB_FrameType.java | 6 +- .../xmod/forestry/bees/items/output/GTPP_Comb.java | 45 +- .../xmod/forestry/bees/items/output/GTPP_Drop.java | 27 +- .../forestry/bees/items/output/GTPP_Pollen.java | 9 +- .../forestry/bees/items/output/GTPP_Propolis.java | 25 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 144 +- .../bees/registry/GTPP_AlleleBeeSpecies.java | 21 +- .../forestry/bees/registry/GTPP_BeeDefinition.java | 136 +- .../forestry/bees/registry/GTPP_Bee_Mutation.java | 9 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 4 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 795 ++-- .../xmod/gregtech/api/gui/GTPP_UITextures.java | 132 +- .../api/gui/widget/ElectricSlotWidget.java | 6 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 102 +- .../internal/Interface_ItemBehaviour.java | 8 +- .../internal/Interface_OreRecipeRegistrator.java | 4 +- .../interfaces/internal/Interface_ToolStats.java | 6 +- .../gregtech/api/items/Gregtech_Generic_Item.java | 55 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 44 +- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 169 +- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 112 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 394 +- .../GT_MetaTileEntity_ChiselBus.java | 23 +- .../GT_MetaTileEntity_Hatch_AirIntake.java | 57 +- .../GT_MetaTileEntity_Hatch_AirIntake_Extreme.java | 12 +- .../GT_MetaTileEntity_Hatch_DynamoBuffer.java | 8 +- ...etaTileEntity_Hatch_ElementalDataOrbHolder.java | 45 +- .../GT_MetaTileEntity_Hatch_FluidGenerator.java | 29 +- .../GT_MetaTileEntity_Hatch_InputBattery.java | 52 +- .../GT_MetaTileEntity_Hatch_Muffler_Adv.java | 82 +- .../GT_MetaTileEntity_Hatch_Naquadah.java | 38 +- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 59 +- .../GT_MetaTileEntity_Hatch_Reservoir.java | 4 +- .../GT_MetaTileEntity_Hatch_Solidifier.java | 26 +- .../GT_MetaTileEntity_Hatch_Steam_BusInput.java | 112 +- .../GT_MetaTileEntity_Hatch_Steam_BusOutput.java | 84 +- .../GT_MetaTileEntity_Hatch_Turbine.java | 89 +- .../GT_MetaTileEntity_Hatch_TurbineProvider.java | 30 +- .../GT_MetaTileEntity_SuperBus_Input.java | 10 +- .../GT_MetaTileEntity_SuperBus_Output.java | 28 +- .../GregtechMetaPipeEntityFluid.java | 76 +- .../GregtechMetaPipeEntity_Cable.java | 141 +- .../GregtechMetaTreeFarmerStructural.java | 14 +- .../GT_MetaTileEntity_Hatch_CustomFluidBase.java | 49 +- .../base/GregtechMetaTileEntity.java | 4 +- .../base/GregtechMetaTransformerHiAmp.java | 32 +- .../base/GregtechMeta_MultiBlockBase.java | 902 ++--- .../base/GregtechMeta_SteamMultiBase.java | 80 +- .../base/generators/GregtechMetaBoilerBase.java | 109 +- .../generators/GregtechMetaSolarGenerator.java | 52 +- .../GregtechRocketFuelGeneratorBase.java | 69 +- .../base/machines/GregtechMetaTreeFarmerBase.java | 21 +- .../GT_MetaTileEntity_Hatch_NbtConsumable.java | 101 +- .../gregtech/api/objects/GregtechItemData.java | 12 +- .../api/objects/GregtechMaterialStack.java | 10 +- .../xmod/gregtech/api/util/GTPP_Config.java | 38 +- .../xmod/gregtech/common/Meta_GT_Proxy.java | 29 +- .../common/blocks/GregtechMetaCasingBlocks.java | 10 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 4 +- .../common/blocks/GregtechMetaCasingBlocks3.java | 38 +- .../common/blocks/GregtechMetaCasingBlocks4.java | 2 +- .../common/blocks/GregtechMetaCasingBlocks5.java | 6 +- .../common/blocks/GregtechMetaCasingBlocks6.java | 26 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 8 +- .../GregtechMetaCasingBlocksPipeGearbox.java | 2 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 14 +- .../blocks/GregtechMetaSpecialMachineCasings.java | 6 +- .../blocks/GregtechMetaSpecialMultiCasings.java | 20 +- .../blocks/GregtechMetaSpecialMultiCasings2.java | 2 +- .../common/blocks/fluid/GregtechFluidHandler.java | 164 +- .../blocks/textures/CasingTextureHandler.java | 2 +- .../textures/TexturesCentrifugeMultiblock.java | 24 +- .../blocks/textures/TexturesGrinderMultiblock.java | 17 +- .../common/blocks/textures/TexturesGtBlock.java | 154 +- .../turbine/LargeTurbineTextureHandler.java | 215 +- .../common/covers/GTPP_Cover_Overflow.java | 49 +- .../common/covers/GTPP_Cover_ToggleVisual.java | 22 +- .../gregtech/common/helpers/ChargingHelper.java | 59 +- .../common/helpers/tesseract/TesseractHelper.java | 46 +- .../gregtech/common/items/MetaCustomCoverItem.java | 20 +- .../common/items/MetaGeneratedGregtechItems.java | 341 +- .../common/items/MetaGeneratedGregtechTools.java | 38 +- .../items/behaviours/Behaviour_Choocher.java | 25 +- .../behaviours/Behaviour_Electric_Lighter.java | 59 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 41 +- .../common/items/covers/MetaItemCoverCasings.java | 15 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 119 +- .../gregtech/common/render/GTPP_FlaskRenderer.java | 22 +- .../common/render/GTPP_Render_MachineBlock.java | 1096 +++--- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 221 +- .../GT_MetaTileEntity_TesseractGenerator.java | 350 +- .../GT_MetaTileEntity_TesseractTerminal.java | 250 +- .../generators/GT_MetaTileEntity_Boiler_Base.java | 52 +- .../generators/GT_MetaTileEntity_Boiler_HV.java | 6 +- .../generators/GT_MetaTileEntity_Boiler_LV.java | 6 +- .../generators/GT_MetaTileEntity_Boiler_MV.java | 6 +- .../GT_MetaTileEntity_SemiFluidGenerator.java | 45 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 63 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 41 +- .../generators/GregtechMetaTileEntity_RTG.java | 98 +- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 20 +- .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 2 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 214 +- .../GregtechMetaAtmosphericReconditioner.java | 292 +- .../basic/GregtechMetaPollutionCreator.java | 70 +- .../basic/GregtechMetaPollutionDetector.java | 83 +- .../basic/GregtechMetaTileEntity_AutoChisel.java | 56 +- .../basic/GregtechMetaWirelessCharger.java | 142 +- .../machines/multi/misc/GMTE_AmazonPackager.java | 62 +- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 86 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 170 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 61 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 86 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 93 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 60 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 81 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 59 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 60 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 89 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 77 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 264 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 61 +- ...aTileEntity_IndustrialMolecularTransformer.java | 91 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 108 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 57 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 72 +- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 69 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 92 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 93 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 62 +- .../processing/GregtechMetaTileEntity_IsaMill.java | 99 +- ...hMetaTileEntity_NuclearSaltProcessingPlant.java | 137 +- .../GregtechMetaTileEntity_SpargeTower.java | 226 +- ...egtechMetaTileEntity_Adv_DistillationTower.java | 202 +- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 117 +- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 61 +- .../GregtechMetaTileEntity_Adv_Fusion_MK5.java | 61 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 243 +- .../GregtechMetaTileEntity_Adv_Implosion.java | 55 +- .../GregtechMetaTileEntity_SteamCompressor.java | 57 +- .../GregtechMetaTileEntity_SteamMacerator.java | 59 +- .../multi/production/GT4Entity_AutoCrafter.java | 55 +- .../multi/production/GT4Entity_ThermalBoiler.java | 70 +- .../GregtechMTE_ElementalDuplicator.java | 159 +- .../production/GregtechMTE_FrothFlotationCell.java | 72 +- .../production/GregtechMTE_NuclearReactor.java | 207 +- .../production/GregtechMetaTileEntityTreeFarm.java | 206 +- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 69 +- .../GregtechMetaTileEntity_Cyclotron.java | 114 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 124 +- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 145 +- .../GregtechMetaTileEntity_LargeRocketEngine.java | 135 +- ...techMetaTileEntity_LargeSemifluidGenerator.java | 77 +- .../GregtechMetaTileEntity_MassFabricator.java | 91 +- ...techMetaTileEntity_QuantumForceTransformer.java | 466 +-- .../GregtechMetaTileEntity_Refinery.java | 97 +- .../GregtechMetaTileEntity_SolarTower.java | 435 ++- .../algae/GregtechMTE_AlgaePondBase.java | 98 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 228 +- ...egTechMetaTileEntity_MegaAlloyBlastSmelter.java | 343 +- .../turbines/GT_MTE_LargeTurbine_Gas.java | 7 +- .../turbines/GT_MTE_LargeTurbine_Plasma.java | 36 +- .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 23 +- .../turbines/GT_MTE_LargeTurbine_Steam.java | 19 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 333 +- ...chMetaTileEntity_PowerSubStationController.java | 453 +-- .../tileentities/misc/TileEntitySolarHeater.java | 52 +- .../storage/GT_MetaTileEntity_TieredChest.java | 98 +- .../storage/GT_MetaTileEntity_TieredTank.java | 58 +- .../storage/GregtechMetaEnergyBuffer.java | 87 +- .../GT_MetaTileEntity_InfiniteItemHolder.java | 21 +- .../common/tools/TOOL_Gregtech_AngleGrinder.java | 23 +- .../common/tools/TOOL_Gregtech_ElectricSnips.java | 12 +- .../gregtech/loaders/ProcessingAngleGrinder.java | 64 +- .../gregtech/loaders/ProcessingElectricSnips.java | 70 +- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 34 +- .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 56 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 147 +- .../loaders/RecipeGen_BlastSmelterGT_GTNH.java | 69 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 169 +- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 92 +- .../gregtech/loaders/RecipeGen_FluidCanning.java | 79 +- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 156 +- .../xmod/gregtech/loaders/RecipeGen_Fluorite.java | 260 +- .../loaders/RecipeGen_MaterialProcessing.java | 206 +- .../gregtech/loaders/RecipeGen_MetalRecipe.java | 94 +- .../RecipeGen_MultisUsingFluidInsteadOfCells.java | 32 +- .../xmod/gregtech/loaders/RecipeGen_Ore.java | 560 +-- .../xmod/gregtech/loaders/RecipeGen_Plasma.java | 12 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 221 +- .../xmod/gregtech/loaders/RecipeGen_Recycling.java | 107 +- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 180 +- .../loaders/recipe/RecipeLoader_AlgaeFarm.java | 26 +- .../loaders/recipe/RecipeLoader_ChemicalSkips.java | 950 +++-- .../gregtech/loaders/recipe/RecipeLoader_GTNH.java | 46 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 491 ++- .../gregtech/loaders/recipe/RecipeLoader_LFTR.java | 119 +- .../recipe/RecipeLoader_MolecularTransformer.java | 64 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 832 +++-- .../recipe/RecipeLoader_NuclearFuelProcessing.java | 337 +- .../loaders/recipe/RecipeLoader_TreeFarm.java | 717 ++-- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 1020 +++--- .../registration/gregtech/Gregtech4Content.java | 72 +- .../gregtech/GregtechAdvancedBoilers.java | 109 +- .../gregtech/GregtechAlgaeContent.java | 10 +- .../gregtech/GregtechAmazonWarehouse.java | 4 +- .../gregtech/GregtechBufferDynamos.java | 180 +- .../registration/gregtech/GregtechConduits.java | 1458 ++++---- .../gregtech/GregtechCustomHatches.java | 297 +- .../registration/gregtech/GregtechCyclotron.java | 4 +- .../registration/gregtech/GregtechDehydrator.java | 253 +- .../gregtech/GregtechEnergyBuffer.java | 174 +- .../GregtechFactoryGradeReplacementMultis.java | 32 +- .../GregtechGeothermalThermalGenerator.java | 82 +- .../gregtech/GregtechHiAmpTransformer.java | 224 +- .../gregtech/GregtechIndustrialAlloySmelter.java | 8 +- .../gregtech/GregtechIndustrialArcFurnace.java | 8 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 16 +- .../gregtech/GregtechIndustrialCentrifuge.java | 8 +- .../gregtech/GregtechIndustrialChisel.java | 18 +- .../gregtech/GregtechIndustrialCokeOven.java | 8 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 8 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 8 +- .../GregtechIndustrialElementDuplicator.java | 14 +- .../gregtech/GregtechIndustrialExtruder.java | 8 +- .../gregtech/GregtechIndustrialFishPond.java | 8 +- .../gregtech/GregtechIndustrialFluidHeater.java | 8 +- .../gregtech/GregtechIndustrialForgeHammer.java | 8 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 8 +- .../gregtech/GregtechIndustrialMacerator.java | 8 +- .../gregtech/GregtechIndustrialMassFabricator.java | 130 +- .../gregtech/GregtechIndustrialMixer.java | 8 +- .../gregtech/GregtechIndustrialMultiMachine.java | 8 +- .../gregtech/GregtechIndustrialPlatePress.java | 8 +- .../gregtech/GregtechIndustrialRockBreaker.java | 8 +- .../gregtech/GregtechIndustrialSifter.java | 8 +- .../GregtechIndustrialThermalCentrifuge.java | 8 +- .../gregtech/GregtechIndustrialTreeFarm.java | 4 +- .../gregtech/GregtechIndustrialWashPlant.java | 8 +- .../gregtech/GregtechIndustrialWiremill.java | 8 +- .../registration/gregtech/GregtechIsaMill.java | 12 +- .../registration/gregtech/GregtechLFTR.java | 119 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 30 +- .../gregtech/GregtechMolecularTransformer.java | 8 +- .../GregtechNuclearSaltProcessingPlant.java | 8 +- .../gregtech/GregtechPollutionDevices.java | 112 +- .../gregtech/GregtechPowerSubStation.java | 54 +- .../gregtech/GregtechQuantumForceTransformer.java | 8 +- .../registration/gregtech/GregtechRTG.java | 10 +- .../gregtech/GregtechRocketFuelGenerator.java | 112 +- .../gregtech/GregtechSemiFluidgenerators.java | 58 +- .../gregtech/GregtechSimpleWasher.java | 146 +- .../registration/gregtech/GregtechSolarTower.java | 38 +- .../registration/gregtech/GregtechSteamMultis.java | 21 +- .../registration/gregtech/GregtechSuperChests.java | 20 +- .../gregtech/GregtechThaumcraftDevices.java | 14 +- .../gregtech/GregtechThreadedBuffers.java | 4 +- .../gregtech/GregtechTieredFluidTanks.java | 14 +- .../gregtech/GregtechTreeFarmerTE.java | 4 +- .../gregtech/GregtechWirelessChargers.java | 130 +- .../gtPlusPlus/xmod/ic2/CustomInternalName.java | 6 +- .../xmod/ic2/item/CustomKineticRotor.java | 30 +- .../java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 60 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 396 +- .../xmod/pamsharvest/fishtrap/FishTrapHandler.java | 68 +- .../xmod/railcraft/HANDLER_Railcraft.java | 240 +- .../xmod/railcraft/utils/RailcraftUtils.java | 10 +- .../thaumcraft/commands/CommandDumpAspects.java | 10 +- .../thaumcraft/objects/ThreadAspectScanner.java | 25 +- .../block/TF_Block_Fluid_Cryotheum.java | 28 +- .../block/TF_Block_Fluid_Ender.java | 6 +- .../block/TF_Block_Fluid_Pyrotheum.java | 57 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 21 +- .../xmod/thermalfoundation/item/TF_Items.java | 10 +- .../recipe/TF_Gregtech_Recipes.java | 79 +- .../xmod/tinkers/material/BaseTinkersMaterial.java | 13 +- .../xmod/tinkers/util/TinkersDryingRecipe.java | 42 +- .../gtPlusPlus/xmod/tinkers/util/TinkersUtils.java | 114 +- 542 files changed, 31247 insertions(+), 29055 deletions(-) (limited to 'src/main/java/gtPlusPlus') diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index 73b9cc9aea..b024e0e88a 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -53,28 +53,28 @@ import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MultisUsingFluidInsteadOfCells import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; @Mod( - modid = Names.G_T_PLUS_PLUS, - name = CORE.name, - version = CORE.VERSION, - dependencies = "required-after:Forge;" + " after:TConstruct;" - + " after:dreamcraft;" - + " after:IC2;" - + " required-after:gregtech;" - + " after:Forestry;" - + " after:MagicBees;" - + " after:CoFHCore;" - + " after:Railcraft;" - + " after:CompactWindmills;" - + " after:ForbiddenMagic;" - + " after:ExtraUtilities;" - + " after:Thaumcraft;" - + " after:EnderIO;" - + " after:tectech;" - + " after:OpenBlocks;" - + " after:IC2NuclearControl;" - + " after:TGregworks;" - + " after:StevesCarts;" - + " required-after:gtnhlib@[0.0.10,);") + modid = Names.G_T_PLUS_PLUS, + name = CORE.name, + version = CORE.VERSION, + dependencies = "required-after:Forge;" + " after:TConstruct;" + + " after:dreamcraft;" + + " after:IC2;" + + " required-after:gregtech;" + + " after:Forestry;" + + " after:MagicBees;" + + " after:CoFHCore;" + + " after:Railcraft;" + + " after:CompactWindmills;" + + " after:ForbiddenMagic;" + + " after:ExtraUtilities;" + + " after:Thaumcraft;" + + " after:EnderIO;" + + " after:tectech;" + + " after:OpenBlocks;" + + " after:IC2NuclearControl;" + + " after:TGregworks;" + + " after:StevesCarts;" + + " required-after:gtnhlib@[0.0.10,);") public class GTplusplus implements ActionListener { public enum INIT_PHASE { @@ -123,12 +123,17 @@ public class GTplusplus implements ActionListener { public static void loadTextures() { Logger.INFO("Loading some textures on the client."); // Tools - Logger.WARNING("Processing texture: " + TexturesGtTools.ANGLE_GRINDER.getTextureFile().getResourcePath()); - Logger.WARNING("Processing texture: " + TexturesGtTools.ELECTRIC_SNIPS.getTextureFile().getResourcePath()); + Logger.WARNING( + "Processing texture: " + TexturesGtTools.ANGLE_GRINDER.getTextureFile() + .getResourcePath()); + Logger.WARNING( + "Processing texture: " + TexturesGtTools.ELECTRIC_SNIPS.getTextureFile() + .getResourcePath()); // Blocks Logger.WARNING( - "Processing texture: " + TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath()); + "Processing texture: " + TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile() + .getResourcePath()); } public GTplusplus() { @@ -188,10 +193,10 @@ public class GTplusplus implements ActionListener { Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); Logger.INFO( - "| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess - + " | Failed: " - + RegistrationHandler.recipesFailed - + " |"); + "| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + + " | Failed: " + + RegistrationHandler.recipesFailed + + " |"); Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); Logger.INFO("Finally, we are finished. Have some cripsy bacon as a reward."); @@ -255,23 +260,22 @@ public class GTplusplus implements ActionListener { SemiFluidFuelHandler.generateFuels(); mInvalidCount[0] = RecipeGen_MultisUsingFluidInsteadOfCells - .generateRecipesNotUsingCells(RecipeMaps.centrifugeRecipes, GTPPRecipeMaps.centrifugeNonCellRecipes); - mInvalidCount[1] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( - RecipeMaps.electrolyzerRecipes, - GTPPRecipeMaps.electrolyzerNonCellRecipes); + .generateRecipesNotUsingCells(RecipeMaps.centrifugeRecipes, GTPPRecipeMaps.centrifugeNonCellRecipes); + mInvalidCount[1] = RecipeGen_MultisUsingFluidInsteadOfCells + .generateRecipesNotUsingCells(RecipeMaps.electrolyzerRecipes, GTPPRecipeMaps.electrolyzerNonCellRecipes); mInvalidCount[2] = RecipeGen_MultisUsingFluidInsteadOfCells - .generateRecipesNotUsingCells(RecipeMaps.vacuumFreezerRecipes, GTPPRecipeMaps.advancedFreezerRecipes); + .generateRecipesNotUsingCells(RecipeMaps.vacuumFreezerRecipes, GTPPRecipeMaps.advancedFreezerRecipes); mInvalidCount[3] = RecipeGen_MultisUsingFluidInsteadOfCells - .generateRecipesNotUsingCells(RecipeMaps.mixerRecipes, GTPPRecipeMaps.mixerNonCellRecipes); + .generateRecipesNotUsingCells(RecipeMaps.mixerRecipes, GTPPRecipeMaps.mixerNonCellRecipes); mInvalidCount[4] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( - GTPPRecipeMaps.chemicalDehydratorRecipes, - GTPPRecipeMaps.chemicalDehydratorNonCellRecipes); + GTPPRecipeMaps.chemicalDehydratorRecipes, + GTPPRecipeMaps.chemicalDehydratorNonCellRecipes); mInvalidCount[5] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( - GTPPRecipeMaps.coldTrapRecipes, - GTPPRecipeMaps.nuclearSaltProcessingPlantRecipes); + GTPPRecipeMaps.coldTrapRecipes, + GTPPRecipeMaps.nuclearSaltProcessingPlantRecipes); mInvalidCount[6] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( - GTPPRecipeMaps.reactorProcessingUnitRecipes, - GTPPRecipeMaps.nuclearSaltProcessingPlantRecipes); + GTPPRecipeMaps.reactorProcessingUnitRecipes, + GTPPRecipeMaps.nuclearSaltProcessingPlantRecipes); } private static void setupMaterialBlacklist() { @@ -304,56 +308,54 @@ public class GTplusplus implements ActionListener { sMissingItemMappings.put("miscutils:Ammonium", GameRegistry.findItem(GTPlusPlus.ID, "itemCellAmmonium")); sMissingItemMappings.put("miscutils:Hydroxide", GameRegistry.findItem(GTPlusPlus.ID, "itemCellHydroxide")); sMissingItemMappings.put( - "miscutils:BerylliumHydroxide", - GameRegistry.findItem(GTPlusPlus.ID, "itemCellmiscutils:BerylliumHydroxide")); + "miscutils:BerylliumHydroxide", + GameRegistry.findItem(GTPlusPlus.ID, "itemCellmiscutils:BerylliumHydroxide")); sMissingItemMappings.put("miscutils:Bromine", GameRegistry.findItem(GTPlusPlus.ID, "itemCellBromine")); sMissingItemMappings.put("miscutils:Krypton", GameRegistry.findItem(GTPlusPlus.ID, "itemCellKrypton")); sMissingItemMappings.put( - "miscutils:itemCellZirconiumTetrafluoride", - GameRegistry.findItem(GTPlusPlus.ID, "ZirconiumTetrafluoride")); + "miscutils:itemCellZirconiumTetrafluoride", + GameRegistry.findItem(GTPlusPlus.ID, "ZirconiumTetrafluoride")); sMissingItemMappings - .put("miscutils:Li2BeF4", GameRegistry.findItem(GTPlusPlus.ID, "itemCellLithiumTetrafluoroberyllate")); + .put("miscutils:Li2BeF4", GameRegistry.findItem(GTPlusPlus.ID, "itemCellLithiumTetrafluoroberyllate")); // Cryolite sMissingBlockMappings.put("miscutils:oreCryolite", GameRegistry.findBlock(GTPlusPlus.ID, "oreCryoliteF")); sMissingItemMappings - .put("miscutils:itemDustTinyCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustTinyCryoliteF")); + .put("miscutils:itemDustTinyCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustTinyCryoliteF")); sMissingItemMappings - .put("miscutils:itemDustSmallCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustSmallCryoliteF")); + .put("miscutils:itemDustSmallCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustSmallCryoliteF")); sMissingItemMappings - .put("miscutils:itemDustCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustCryoliteF")); + .put("miscutils:itemDustCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustCryoliteF")); sMissingItemMappings - .put("miscutils:dustPureCryolite", GameRegistry.findItem(GTPlusPlus.ID, "dustPureCryoliteF")); + .put("miscutils:dustPureCryolite", GameRegistry.findItem(GTPlusPlus.ID, "dustPureCryoliteF")); sMissingItemMappings - .put("miscutils:dustImpureCryolite", GameRegistry.findItem(GTPlusPlus.ID, "dustImpureCryoliteF")); + .put("miscutils:dustImpureCryolite", GameRegistry.findItem(GTPlusPlus.ID, "dustImpureCryoliteF")); sMissingItemMappings.put("miscutils:crushedCryolite", GameRegistry.findItem(GTPlusPlus.ID, "crushedCryoliteF")); + sMissingItemMappings + .put("miscutils:crushedPurifiedCryolite", GameRegistry.findItem(GTPlusPlus.ID, "crushedPurifiedCryoliteF")); sMissingItemMappings.put( - "miscutils:crushedPurifiedCryolite", - GameRegistry.findItem(GTPlusPlus.ID, "crushedPurifiedCryoliteF")); - sMissingItemMappings.put( - "miscutils:crushedCentrifugedCryolite", - GameRegistry.findItem(GTPlusPlus.ID, "crushedCentrifugedCryoliteF")); + "miscutils:crushedCentrifugedCryolite", + GameRegistry.findItem(GTPlusPlus.ID, "crushedCentrifugedCryoliteF")); sMissingItemMappings.put("miscutils:oreCryolite", GameRegistry.findItem(GTPlusPlus.ID, "oreCryoliteF")); // Fluorite sMissingBlockMappings.put("miscutils:oreFluorite", GameRegistry.findBlock(GTPlusPlus.ID, "oreFluoriteF")); sMissingItemMappings - .put("miscutils:itemDustTinyFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustTinyFluoriteF")); + .put("miscutils:itemDustTinyFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustTinyFluoriteF")); sMissingItemMappings - .put("miscutils:itemDustSmallFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustSmallFluoriteF")); + .put("miscutils:itemDustSmallFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustSmallFluoriteF")); sMissingItemMappings - .put("miscutils:itemDustFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustFluoriteF")); + .put("miscutils:itemDustFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustFluoriteF")); sMissingItemMappings - .put("miscutils:dustPureFluorite", GameRegistry.findItem(GTPlusPlus.ID, "dustPureFluoriteF")); + .put("miscutils:dustPureFluorite", GameRegistry.findItem(GTPlusPlus.ID, "dustPureFluoriteF")); sMissingItemMappings - .put("miscutils:dustImpureFluorite", GameRegistry.findItem(GTPlusPlus.ID, "dustImpureFluoriteF")); + .put("miscutils:dustImpureFluorite", GameRegistry.findItem(GTPlusPlus.ID, "dustImpureFluoriteF")); sMissingItemMappings.put("miscutils:crushedFluorite", GameRegistry.findItem(GTPlusPlus.ID, "crushedFluoriteF")); + sMissingItemMappings + .put("miscutils:crushedPurifiedFluorite", GameRegistry.findItem(GTPlusPlus.ID, "crushedPurifiedFluoriteF")); sMissingItemMappings.put( - "miscutils:crushedPurifiedFluorite", - GameRegistry.findItem(GTPlusPlus.ID, "crushedPurifiedFluoriteF")); - sMissingItemMappings.put( - "miscutils:crushedCentrifugedFluorite", - GameRegistry.findItem(GTPlusPlus.ID, "crushedCentrifugedFluoriteF")); + "miscutils:crushedCentrifugedFluorite", + GameRegistry.findItem(GTPlusPlus.ID, "crushedCentrifugedFluoriteF")); sMissingItemMappings.put("miscutils:oreFluorite", GameRegistry.findItem(GTPlusPlus.ID, "oreFluoriteF")); } diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java index aedd6c6073..a3551326c2 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java @@ -107,7 +107,8 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect public synchronized boolean setValue(V object) { int mOriginalID = this.mInternalID; put(object); - if (this.mInternalMap.get(mOriginalID).equals(object) || mOriginalID > this.mInternalID) { + if (this.mInternalMap.get(mOriginalID) + .equals(object) || mOriginalID > this.mInternalID) { return true; } else { return false; @@ -173,7 +174,10 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect @Override @SuppressWarnings("unchecked") public V[] toArray() { - V[] toR = (V[]) java.lang.reflect.Array.newInstance(mInternalMap.get(0).getClass(), mInternalMap.size()); + V[] toR = (V[]) java.lang.reflect.Array.newInstance( + mInternalMap.get(0) + .getClass(), + mInternalMap.size()); for (int i = 0; i < mInternalMap.size(); i++) { toR[i] = mInternalMap.get(i); } diff --git a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java index ae1f28f0c9..5d99097169 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java +++ b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java @@ -31,7 +31,8 @@ public class WeightedCollection implements Map { private E next() { int value = random.nextInt(total) + 1; // Can also use floating-point weights - return map.ceilingEntry(value).getValue(); + return map.ceilingEntry(value) + .getValue(); } @Override diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java index bf98c7d633..13f12503f0 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java @@ -84,12 +84,13 @@ public class BTF_FluidTank extends FluidTank { @Override public int fill(FluidStack aFluid, boolean doFill) { - if (aFluid != null && aFluid.getFluid().getID() > 0 - && aFluid.amount > 0 - && this.canTankBeFilled() - && this.isFluidInputAllowed(aFluid)) { - if (this.getFillableStack() != null && this.getFillableStack().getFluid().getID() > 0) { - if (!this.getFillableStack().isFluidEqual(aFluid)) { + if (aFluid != null && aFluid.getFluid() + .getID() > 0 && aFluid.amount > 0 && this.canTankBeFilled() && this.isFluidInputAllowed(aFluid)) { + if (this.getFillableStack() != null && this.getFillableStack() + .getFluid() + .getID() > 0) { + if (!this.getFillableStack() + .isFluidEqual(aFluid)) { return 0; } else { int space = this.getCapacity() - this.getFillableStack().amount; @@ -144,7 +145,8 @@ public class BTF_FluidTank extends FluidTank { arg9999.amount -= used; } - FluidStack drained = this.getDrainableStack().copy(); + FluidStack drained = this.getDrainableStack() + .copy(); drained.amount = used; if (this.getDrainableStack().amount <= 0 && this.isFluidChangingAllowed()) { this.setDrainableStack((FluidStack) null); diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java index 7718f68176..fc71869d9e 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java @@ -97,7 +97,7 @@ public class BTF_Inventory implements ISidedInventory { for (int rArray = 0; rArray < this.getSizeInventory(); ++rArray) { if (this.isValidSlot(rArray) - && (tSkip || coverInfo.letsItemsOut(rArray) || coverInfo.letsItemsIn(rArray))) { + && (tSkip || coverInfo.letsItemsOut(rArray) || coverInfo.letsItemsIn(rArray))) { tList.add(rArray); } } @@ -114,16 +114,16 @@ public class BTF_Inventory implements ISidedInventory { @Override public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { return this.isValidSlot(aIndex) && aStack != null - && aIndex < this.mInventory.length - && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, this.mInventory[aIndex])) - && this.allowPutStack(this.mTile, aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); + && aIndex < this.mInventory.length + && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, this.mInventory[aIndex])) + && this.allowPutStack(this.mTile, aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); } @Override public boolean canExtractItem(int aIndex, ItemStack aStack, int ordinalSide) { return this.isValidSlot(aIndex) && aStack != null - && aIndex < this.mInventory.length - && this.allowPullStack(this.mTile, aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); + && aIndex < this.mInventory.length + && this.allowPullStack(this.mTile, aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); } public boolean allowPullStack(TileEntityBase mTile2, int aIndex, ForgeDirection side, ItemStack aStack) { @@ -131,9 +131,9 @@ public class BTF_Inventory implements ISidedInventory { } public boolean allowPutStack(TileEntityBase aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { + ItemStack aStack) { return (aIndex >= 0 && aIndex < this.getSizeInventory()) - && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(this.mInventory[aIndex], aStack)); + && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(this.mInventory[aIndex], aStack)); } @Override @@ -198,7 +198,8 @@ public class BTF_Inventory implements ISidedInventory { if (mInventory != null && mInventory[s] != null) { ItemStack slot = mInventory[s]; if (slot == null || (slot != null && GT_Utility.areStacksEqual(aInput, slot) - && slot.stackSize != slot.getItem().getItemStackLimit(slot))) { + && slot.stackSize != slot.getItem() + .getItemStackLimit(slot))) { if (slot == null) { slot = aInput.copy(); } else { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java index 686c0e7667..3853f61793 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java @@ -91,8 +91,8 @@ public class BlockPos implements Serializable { return false; } return this.xPos == otherPoint.xPos && this.yPos == otherPoint.yPos - && this.zPos == otherPoint.zPos - && this.dim == otherPoint.dim; + && this.zPos == otherPoint.zPos + && this.dim == otherPoint.dim; } public int distanceFrom(BlockPos target) { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java index a90a52e829..c5c903cd1f 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java @@ -23,7 +23,7 @@ public class FluidGT6 extends Fluid implements Runnable { @Override public int getColor() { return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8) - | Math.max(0, Math.min(255, this.mRGBa[2])); + | Math.max(0, Math.min(255, this.mRGBa[2])); } @Override diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java index db9599e130..f799623dd6 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java @@ -17,7 +17,7 @@ public class ShapedRecipe { ItemStack[] mBlackList = null; public ShapedRecipe(Object aInput1, Object aInput2, Object aInput3, Object aInput4, Object aInput5, Object aInput6, - Object aInput7, Object aInput8, Object aInput9, ItemStack aOutput) { + Object aInput7, Object aInput8, Object aInput9, ItemStack aOutput) { this(new Object[] { aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9 }, aOutput); } @@ -68,10 +68,10 @@ public class ShapedRecipe { if (aInputs.length < 9 || aInputs.length > 9) { Logger.RECIPE( - "[Fix] Recipe for " + aOutput.getDisplayName() - + " has incorrect number of inputs. Size: " - + aInputs.length - + "."); + "[Fix] Recipe for " + aOutput.getDisplayName() + + " has incorrect number of inputs. Size: " + + aInputs.length + + "."); } // Build a Pair for each slot @@ -92,11 +92,12 @@ public class ShapedRecipe { } aRecipePairs.put(new Pair<>(CHARS.charAt(aCharSlot), stack)); Logger.RECIPE( - "Storing '" + CHARS.charAt(aCharSlot) - + "' with an object of type " - + stack.getClass().getSimpleName() - + " and a value of " - + mInfo); + "Storing '" + CHARS.charAt(aCharSlot) + + "' with an object of type " + + stack.getClass() + .getSimpleName() + + " and a value of " + + mInfo); aChar[aMemSlot++] = CHARS.charAt(aCharSlot); aCharSlot++; aLoggingInfo[aInfoSlot++] = mInfo; @@ -130,7 +131,7 @@ public class ShapedRecipe { aGrid[2] = "" + aGridWhole.charAt(6) + aGridWhole.charAt(7) + aGridWhole.charAt(8); } else { Logger.RECIPE( - "[Fix] Grid length for recipe outputting " + aOutput.getDisplayName() + " is not 9."); + "[Fix] Grid length for recipe outputting " + aOutput.getDisplayName() + " is not 9."); } // Rebuild the Map without spaces @@ -155,22 +156,23 @@ public class ShapedRecipe { } aRecipePairs.put(new Pair<>(CHARS.charAt(aCharSlot), stack)); Logger.RECIPE( - "Registering Pair of '" + CHARS.charAt(aCharSlot) - + "' and a " - + stack.getClass().getSimpleName() - + " object. Object has a value of " - + mInfo); + "Registering Pair of '" + CHARS.charAt(aCharSlot) + + "' and a " + + stack.getClass() + .getSimpleName() + + " object. Object has a value of " + + mInfo); aCharSlot++; counter++; } } Logger.RECIPE( - "Counter started at " + KEY_COUNTER - + ", counter is now at " - + counter - + ". Trying to create Varag array with a size of " - + (KEY_COUNTER + (counter - KEY_COUNTER) * 2)); + "Counter started at " + KEY_COUNTER + + ", counter is now at " + + counter + + ". Trying to create Varag array with a size of " + + (KEY_COUNTER + (counter - KEY_COUNTER) * 2)); // Counter started at 3, counter is now at 4. Trying to create Varag array with a size of 2 // Register the shaped grid straight to the varags @@ -214,7 +216,7 @@ public class ShapedRecipe { } else { Logger.RECIPE( - "[Fix] Recipe for " + aOutput.getDisplayName() + " contains a strange number of inputs."); + "[Fix] Recipe for " + aOutput.getDisplayName() + " contains a strange number of inputs."); } // Try set the recipe for this object. diff --git a/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java b/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java index c03ac8e146..beede78173 100644 --- a/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java +++ b/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java @@ -21,7 +21,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class ChemicalPlantFrontend extends RecipeMapFrontend { public ChemicalPlantFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super(uiPropertiesBuilder, neiPropertiesBuilder); } @@ -47,7 +47,7 @@ public class ChemicalPlantFrontend extends RecipeMapFrontend { @Override protected List handleNEIItemInputTooltip(List currentTip, - GT_NEI_DefaultHandler.FixedPositionedStack pStack) { + GT_NEI_DefaultHandler.FixedPositionedStack pStack) { if (ItemUtils.isCatalyst(pStack.item)) { currentTip.add(GRAY + "Does not always get consumed in the process"); currentTip.add(GRAY + "Higher tier pipe casings allow this item to last longer"); diff --git a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeCategories.java b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeCategories.java index 2d1aff7add..310f6f540d 100644 --- a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeCategories.java +++ b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeCategories.java @@ -10,10 +10,8 @@ public class GTPPRecipeCategories { @RecipeCategoryHolder public static final RecipeCategory absNonAlloyRecipes = new RecipeCategory( - "gtpp.recipe.category.abs_non_alloy_recipes", - GTPPRecipeMaps.alloyBlastSmelterRecipes, - builder -> builder.setDisplayImage( - createIcon( - Mods.GTPlusPlus - .getResourcePath("textures", "gui", "picture", "abs_non_alloy_recipes.png")))); + "gtpp.recipe.category.abs_non_alloy_recipes", + GTPPRecipeMaps.alloyBlastSmelterRecipes, + builder -> builder.setDisplayImage( + createIcon(Mods.GTPlusPlus.getResourcePath("textures", "gui", "picture", "abs_non_alloy_recipes.png")))); } diff --git a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java index 1796529c84..d2171d1bdd 100644 --- a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java +++ b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java @@ -26,139 +26,207 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr public class GTPPRecipeMaps { public static final RecipeMap cokeOvenRecipes = RecipeMapBuilder.of("gtpp.recipe.cokeoven") - .maxIO(2, 9, 1, 1).minInputs(1, 0).progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) - .build(); + .maxIO(2, 9, 1, 1) + .minInputs(1, 0) + .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) + .build(); public static final RecipeMap multiblockMassFabricatorRecipes = RecipeMapBuilder - .of("gtpp.recipe.matterfab2").maxIO(2, 0, 1, 1).build(); + .of("gtpp.recipe.matterfab2") + .maxIO(2, 0, 1, 1) + .build(); public static final RecipeMap rocketFuels = RecipeMapBuilder - .of("gtpp.recipe.rocketenginefuel", FuelBackend::new).maxIO(0, 0, 1, 0) - .neiSpecialInfoFormatter( - recipeInfo -> Collections.singletonList( - StatCollector.translateToLocalFormatted( - "GT5U.nei.fuel", - GT_Utility.formatNumbers(recipeInfo.recipe.mSpecialValue * 3000L)))) - .build(); + .of("gtpp.recipe.rocketenginefuel", FuelBackend::new) + .maxIO(0, 0, 1, 0) + .neiSpecialInfoFormatter( + recipeInfo -> Collections.singletonList( + StatCollector.translateToLocalFormatted( + "GT5U.nei.fuel", + GT_Utility.formatNumbers(recipeInfo.recipe.mSpecialValue * 3000L)))) + .build(); public static final RecipeMap quantumForceTransformerRecipes = RecipeMapBuilder